diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
| commit | e5888d398350b26ba2cdc634cc9791e90b4fc6b6 (patch) | |
| tree | 54f485ea56d034ecba01938fbc680b12884fc136 /gtk2_ardour/public_editor.h | |
| parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
| parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) | |
merge with master and fix 2 conflicts
Diffstat (limited to 'gtk2_ardour/public_editor.h')
| -rw-r--r-- | gtk2_ardour/public_editor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 3fc2b878b0..a99dcdd253 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -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; |