projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f443626
)
fix incorrect accumulation of export video options each time the dialog is used
author
Paul Davis
<paul@linuxaudiosystems.com>
Thu, 29 Nov 2018 22:36:19 +0000
(17:36 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Thu, 29 Nov 2018 22:43:17 +0000
(17:43 -0500)
gtk2_ardour/export_video_dialog.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/export_video_dialog.cc
b/gtk2_ardour/export_video_dialog.cc
index 8d607763c97294a12794d52b6e2b590921c56b88..d5182bcc5fb4431f4b75eee82396e6d083105e67 100644
(file)
--- a/
gtk2_ardour/export_video_dialog.cc
+++ b/
gtk2_ardour/export_video_dialog.cc
@@
-154,7
+154,6
@@
ExportVideoDialog::ExportVideoDialog ()
path_hbox->pack_start (*l, false, false, 2);
vbox->pack_start (*path_hbox, false, false, 2);
path_hbox->pack_start (*l, false, false, 2);
vbox->pack_start (*path_hbox, false, false, 2);
- insnd_combo.append_text (string_compose (_("from session start marker to session end marker"), PROGRAM_NAME));
outfn_path_entry.set_width_chars(38);
l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
outfn_path_entry.set_width_chars(38);
l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@
-335,6
+334,11
@@
ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
// TODO remember setting for export-range.. somehow, (let explicit range override)
sampleoffset_t av_offset = ARDOUR_UI::instance()->video_timeline->get_offset();
// TODO remember setting for export-range.. somehow, (let explicit range override)
sampleoffset_t av_offset = ARDOUR_UI::instance()->video_timeline->get_offset();
+
+ insnd_combo.remove_all ();
+
+ insnd_combo.append_text (_("from session start marker to session end marker"));
+
if (av_offset < 0 ) {
insnd_combo.append_text (_("from 00:00:00:00 to the video end"));
} else {
if (av_offset < 0 ) {
insnd_combo.append_text (_("from 00:00:00:00 to the video end"));
} else {