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 7948908b87eff5413845edf79f70401bf675752f..bc9e8be4420096af983318b44178ecda399eb3dd 100644 (file)
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -37,10 +37,6 @@
 #include "utils_videotl.h"
 #include "i18n.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 using namespace Gtk;
 using namespace std;
 using namespace PBD;
@@ -88,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)) {
@@ -141,7 +137,7 @@ VideoServerDialog::VideoServerDialog (Session* s)
        t->attach (cachesize_spinner, 1, 2, 2, 3);
 
        l = manage (new Label (string_compose(
-                                       _("%1 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?"), PROGRAM_NAME)
+                                       _("%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();