Merge remote-tracking branch 'remotes/origin/master' into windows+cc

[ardour.git] / gtk2_ardour / video_server_dialog.cc

diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 5ee4c028444ecbc7090a45057fdfd4ef691dc696..bc9e8be4420096af983318b44178ecda399eb3dd 100644 (file)
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -29,6 +29,10 @@
 #include "ardour/template_utils.h"
 #include "ardour/session.h"
 
+#ifdef interface
+#undef interface
+#endif
+
 #include "video_server_dialog.h"
 #include "utils_videotl.h"
 #include "i18n.h"
@@ -37,6 +41,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 VideoServerDialog::VideoServerDialog (Session* s)
        : ArdourDialog (_("Launch Video Server"))
@@ -53,7 +58,6 @@ VideoServerDialog::VideoServerDialog (Session* s)
        set_session (s);
 
        set_name ("VideoServerDialog");
-       set_position (Gtk::WIN_POS_MOUSE);
        set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
@@ -80,7 +84,7 @@ VideoServerDialog::VideoServerDialog (Session* s)
        listenaddr_combo.set_active(0);
 
        std::string icsd_file_path;
-       if (find_file_in_search_path (PBD::SearchPath(Glib::getenv("PATH")), X_("harvid"), icsd_file_path)) {
+       if (find_file_in_search_path (PBD::Searchpath(Glib::getenv("PATH")), X_("harvid"), icsd_file_path)) {
                path_entry.set_text(icsd_file_path);
        }
        else if (Glib::file_test(X_("C:\\Program Files\\harvid\\harvid.exe"), Glib::FILE_TEST_EXISTS)) {
@@ -88,8 +92,10 @@ VideoServerDialog::VideoServerDialog (Session* s)
        }
        else {
                PBD::warning <<
-                       _("The external video server 'harvid' can not be found. The tool is included with the Ardour releases from ardour.org, "
-                         "alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution.") << endmsg;
+                       string_compose(
+                       _("The external video server 'harvid' can not be found. The tool is included with the %1 releases from ardour.org, "
+                         "alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution."), PROGRAM_NAME)
+                       << endmsg;
        }
 
 
@@ -130,7 +136,9 @@ VideoServerDialog::VideoServerDialog (Session* s)
        t->attach (*l, 0, 1, 2, 3, FILL);
        t->attach (cachesize_spinner, 1, 2, 2, 3);
 
-       l = manage (new Label (_("Ardour relies on an external Video Server for the videotimeline.\nThe server configured in Edit -> Prefereces -> Video is not reachable.\nDo you want ardour to launch 'harvid' on this machine?"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+       l = manage (new Label (string_compose(
+                                       _("%1 relies on an external video server for the videotimeline.\nThe server configured in Edit -> Preferences -> Video is not reachable.\nDo you want %1 to launch 'harvid' on this machine?"), PROGRAM_NAME)
+                               , Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
        l->set_max_width_chars(80);
        l->set_line_wrap();
        vbox->pack_start (*l, true, true, 4);