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/editor_videotimeline.cc | |
| parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
| parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) | |
merge with master and fix 2 conflicts
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 4bf8b047cb..83a9745b89 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -109,7 +109,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); @@ -125,7 +125,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(); |