ardour/livetrax
13
0
Fork 0
Code

another potential fix for video-export filename/crash

Browse Source
This commit is contained in:
Robin Gareus 2015-03-24 03:28:07 +01:00
parent d44273e8a4
commit 5bbea60546
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/export_video_dialog.cc
View File

@ -113,7 +113,7 @@ ExportVideoDialog::ExportVideoDialog ()
HBox* path_hbox; HBox* path_hbox;
/* check if ffmpeg can be found */ /* check if ffmpeg can be found */
_transcoder = new TranscodeFfmpeg(""); _transcoder = new TranscodeFfmpeg(X_(""));
if (!_transcoder->ffexec_ok()) { if (!_transcoder->ffexec_ok()) {
l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l->set_line_wrap(); l->set_line_wrap();
@ -381,8 +381,8 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
LocaleGuard lg (X_("C")); LocaleGuard lg (X_("C"));
XMLNode* node = _session->extra_xml (X_("Videotimeline")); XMLNode* node = _session->extra_xml (X_("Videotimeline"));
bool filenameset = false;
if (node) { if (node) {
bool filenameset = false;
if (node->property(X_("OriginalVideoFile"))) { if (node->property(X_("OriginalVideoFile"))) {
std::string filename = node->property(X_("OriginalVideoFile"))->value(); std::string filename = node->property(X_("OriginalVideoFile"))->value();
if (Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) { if (Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) {
@ -407,9 +407,9 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
filenameset = true; filenameset = true;
} }
} }
if (!filenameset) { }
invid_path_entry.set_text (X_("")); if (!filenameset) {
} invid_path_entry.set_text (X_(""));
} }
node = _session->extra_xml (X_("Videoexport")); node = _session->extra_xml (X_("Videoexport"));