From 43ae996b3a18ecad15f6fe872c4194d23b2200cf Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 3 Aug 2013 16:54:57 +0200 Subject: dedicated namespace for video-utils conflicting symbol prophylaxis --- gtk2_ardour/export_video_dialog.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'gtk2_ardour/export_video_dialog.cc') diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 5ccfa172ea..b8f94ac55c 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -60,6 +60,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) : ArdourDialog (_("Export Video File ")) -- cgit v1.2.3 From c4227ca706405a79faf43a1d667a6f017388f8af Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 9 Aug 2013 19:35:27 +0200 Subject: fix typos --- gtk2_ardour/export_video_dialog.cc | 2 +- gtk2_ardour/transcode_video_dialog.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/export_video_dialog.cc') diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index b8f94ac55c..48d09065b7 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -104,7 +104,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) /* check if ffmpeg can be found */ transcoder = new TranscodeFfmpeg(""); 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 widow 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(); vbox->pack_start (*l, false, false, 8); get_vbox()->pack_start (*vbox, false, false); diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index 3be2450ca7..d4ad8a24ed 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -110,7 +110,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) bool ffok = false; if (!transcoder->ffexec_ok()) { - l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log widow 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 Import 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(); options_box->pack_start (*l, false, true, 4); aspect_checkbox.set_sensitive(false); -- cgit v1.2.3