smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

merge with master and fix 2 conflicts

Browse source
This commit is contained in:
Paul Davis 2013-10-16 22:06:56 -04:00
commit e5888d3983
107 changed files with 7557 additions and 6246 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/public_editor.h
View file

@ -296,7 +296,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
virtual int get_videotl_bar_height () const = 0;
virtual void set_video_timeline_height (const int h) = 0;
virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0;
virtual void export_video () = 0;
virtual void export_video (bool range = false) = 0;
virtual RouteTimeAxisView* get_route_view_by_route_id (const PBD::ID& id) const = 0;