diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-06 10:56:36 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-06 10:56:36 -0400 |
commit | 8c5cff60912c7e0a7256f635641399500d8d00d9 (patch) | |
tree | 369361e504019597e890de385dfb64484e940645 /gtk2_ardour | |
parent | 8216eac044ec392944acd17571a4065cf0365cf2 (diff) | |
parent | 4a135c82fba6775e71bde1d709a163876381f82a (diff) |
Merge branch 'master' into windows
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/export_video_dialog.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/gain_meter.cc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 0234b57901..09283d4c8d 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -167,7 +167,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) filenameset = true; } } - else if (!filenameset + if (!filenameset && node->property(X_("Filename")) && node->property(X_("LocalFile")) && node->property(X_("LocalFile"))->value() == X_("1") @@ -181,6 +181,9 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) filenameset = true; } } + if (!filenameset) { + invid_path_entry.set_text (X_("")); + } } l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 67f9ce9370..c2e4a43858 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -864,7 +864,7 @@ GainMeterBase::update_meters() } } -void GainMeterBase::color_handler(bool dpi) +void GainMeterBase::color_handler(bool /* dpi */) { setup_meters(); } |