amend a3c21ae, video-server localhost -> 127.0.0.1

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 4cb7f7668bf81e37a2d3e090ff5a4eca98dd9776..6d6830d26b4e89e0beced8beb4d84e0e078ac836 100644 (file)
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -322,8 +322,9 @@ AddVideoDialog::file_name (bool &local_file)
                std::string video_server_url = video_get_server_url(Config);
 
                /* check if video server is running locally */
-               if (video_get_docroot(Config).size() > 0
-                               && !video_server_url.compare(0, 16, "http://localhost"))
+               if (video_get_docroot(Config).size() > 0 &&
+                       (0 == video_server_url.compare (0, 16, "http://127.0.0.1") || 0 == video_server_url.compare (0, 16, "http://localhost"))
+                  )
                {
                        /* check if the file can be accessed */
                        int plen;

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2f4d19c2a67b303a59f872e2387c1116b2d4f49c..b99d5e337f817b304f737b7987a906a13b1293e0 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3902,7 +3902,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
                        Config->set_video_advanced_setup(false);
                } else {
                        std::ostringstream osstream;
-                       osstream << "http://localhost:" << video_server_dialog->get_listenport() << "/";
+                       osstream << "http://127.0.0.1:" << video_server_dialog->get_listenport() << "/";
                        Config->set_video_server_url(osstream.str());
                        Config->set_video_server_docroot(icsd_docroot);
                        Config->set_video_advanced_setup(true);

diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index cdc27ae7b9a469e3991d8510366bf78a5e6fd916..51cbe1a1dded7b295af7c3c735e8767011e6d0b1 100644 (file)
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -118,7 +118,7 @@ VideoUtils::video_get_server_url (ARDOUR::RCConfiguration* config)
        if (config->get_video_advanced_setup()) {
                return config->get_video_server_url();
        }
-       return X_("http://localhost:1554");
+       return X_("http://127.0.0.1:1554");
 }