ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into windows

Browse Source
This commit is contained in:
Paul Davis 2013-09-06 10:56:36 -04:00
commit 8c5cff6091
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/export_video_dialog.cc
View File

@ -167,7 +167,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
filenameset = true; filenameset = true;
} }
} }
else if (!filenameset if (!filenameset
&& node->property(X_("Filename")) && node->property(X_("Filename"))
&& node->property(X_("LocalFile")) && node->property(X_("LocalFile"))
&& node->property(X_("LocalFile"))->value() == X_("1") && node->property(X_("LocalFile"))->value() == X_("1")
@ -181,6 +181,9 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
filenameset = true; filenameset = true;
} }
} }
if (!filenameset) {
invid_path_entry.set_text (X_(""));
}
} }
l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));

2
gtk2_ardour/gain_meter.cc
View File

@ -864,7 +864,7 @@ GainMeterBase::update_meters()
} }
} }
void GainMeterBase::color_handler(bool dpi) void GainMeterBase::color_handler(bool /* dpi */)
{ {
setup_meters(); setup_meters();
} }

2
wscript
View File

@ -8,7 +8,7 @@ import subprocess
import sys import sys
MAJOR = '3' MAJOR = '3'
MINOR = '3' MINOR = '4'
VERSION = MAJOR + '.' + MINOR VERSION = MAJOR + '.' + MINOR
APPNAME = 'Ardour' + MAJOR APPNAME = 'Ardour' + MAJOR