For MSVC, 'using namespace whatever' doesn't help us to differentiate between ambiguo...

[ardour.git] / gtk2_ardour / transcode_video_dialog.cc

diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index ad4b46dbda641cd393f96a0e87b30bd9d47b310c..50e4740cc08276cf25ab558d5216144fab5692c8 100644 (file)
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -44,7 +44,7 @@
 #include "opts.h"
 #include "transcode_video_dialog.h"
 #include "utils_videotl.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace std;
@@ -95,7 +95,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
        path_hbox->pack_start (path_label, false, false, 3);
        path_hbox->pack_start (path_entry, true, true, 3);
        path_hbox->pack_start (browse_button, false, false, 3);
-       browse_button.set_name ("PaddedButton");
 
        path_entry.set_width_chars(38);
        height_spinner.set_sensitive(false);
@@ -111,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 window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+               l = manage (new Label (_("ffmpeg installation was not found. Video Import is not possible. 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);
@@ -181,10 +180,8 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
        l->set_use_markup ();
        options_box->pack_start (*l, false, true, 4);
 
-       video_combo.set_name ("PaddedButton");
-
        if (ffok) {
-               video_combo.append_text(_("Reference From Current Location (Previously Transcoded Files Only)"));
+               video_combo.append_text(_("Reference from Current Location (Previously Transcoded Files Only)"));
                video_combo.append_text(_("Import/Transcode Video to Session"));
                video_combo.set_active(1);
                if (as.size() > 0) {
@@ -226,7 +223,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
        l = manage (new Label (_("Scale Video: Width = "), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
        t->attach (*l, 0, 1, 0, 1);
-       scale_combo.set_name ("PaddedButton");
        t->attach (scale_combo, 1, 2, 0, 1);
        t->attach (aspect_checkbox, 2, 3, 0, 1);
        t->attach (height_spinner, 3, 4, 0, 1);
@@ -253,7 +249,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
        l = manage (new Label (_("Extract Audio:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
        t->attach (*l, 0, 1, 2, 3);
-       audio_combo.set_name ("PaddedButton");
        t->attach (audio_combo, 1, 4, 2, 3);
        t->attach (ltc_detect, 1, 4, 3, 4);
        if (as.size() == 0) {
@@ -404,7 +399,7 @@ TranscodeVideoDialog::launch_transcode ()
                return;
        }
        std::string outfn = path_entry.get_text();
-       if (!confirm_video_outfn(outfn, video_get_docroot(Config))) return;
+       if (!confirm_video_outfn(*this, outfn, video_get_docroot(Config))) return;
        progress_label.set_text (_("Transcoding Video.."));
        dialog_progress_mode();
 #if 1 /* tentative debug mode */