From 91b027a4a0c0e90398b9c6dbb5611b2acc4f2f8e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 3 Sep 2013 09:08:18 -0400 Subject: [PATCH 1/3] bump to 3.4 --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 5ca7bdf6b3..6691f06dee 100644 --- a/wscript +++ b/wscript @@ -8,7 +8,7 @@ import subprocess import sys MAJOR = '3' -MINOR = '3' +MINOR = '4' VERSION = MAJOR + '.' + MINOR APPNAME = 'Ardour' + MAJOR From a6b66f1594813f35f713c70c63e3097120f3934b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 4 Sep 2013 01:36:46 +0200 Subject: [PATCH 2/3] vtl: fix small issue with video source file on export --- gtk2_ardour/export_video_dialog.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 48d09065b7..cd45bb368e 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -165,7 +165,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") @@ -179,6 +179,9 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) filenameset = true; } } + if (!filenameset) { + invid_path_entry.set_text (X_("")); + } } l = manage (new Label (_("Settings:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); From 4a135c82fba6775e71bde1d709a163876381f82a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 4 Sep 2013 01:37:15 +0200 Subject: [PATCH 3/3] squash another compiler warning --- gtk2_ardour/gain_meter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); }