From 775a4000072ec4c4cfe446ecb00362119cca2ca2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 22 Jul 2015 12:45:24 +0200 Subject: amend a3c21ae, video-server localhost -> 127.0.0.1 --- gtk2_ardour/add_video_dialog.cc | 5 +++-- gtk2_ardour/ardour_ui.cc | 2 +- gtk2_ardour/utils_videotl.cc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc index 4cb7f7668b..6d6830d26b 100644 --- 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 2f4d19c2a6..b99d5e337f 100644 --- 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 cdc27ae7b9..51cbe1a1dd 100644 --- 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"); } -- cgit v1.2.3