diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
| commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
| tree | f8e43560917a0a70c48d32ac171e828472cfd794 /gtk2_ardour/editor_videotimeline.cc | |
| parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
| parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'gtk2_ardour/editor_videotimeline.cc')
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 1da9fb4f19..2526d7c16a 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -111,7 +111,7 @@ Editor::embed_audio_from_video (std::string path, framepos_t n) } void -Editor::export_video () +Editor::export_video (bool range) { if (ARDOUR::Config->get_show_video_export_info()) { ExportVideoInfobox infobox (_session); @@ -127,7 +127,7 @@ Editor::export_video () break; } } - ExportVideoDialog dialog (_session, get_selection().time); + ExportVideoDialog dialog (_session, get_selection().time, range); Gtk::ResponseType r = (Gtk::ResponseType) dialog.run(); (void) r; // keep gcc quiet dialog.hide(); |