X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_video_dialog.cc;h=5fc53c7de2f1bd0a12f55a8431e79d4f7a76235c;hb=73d1de3b75172115beb6a30edacb4861893d97fd;hp=b40b3ead4ceabbe540f05de5b477ee25aa3618c9;hpb=7d3ef2318338b4dc6f836dbdba34f56627633a6d;p=ardour.git

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index b40b3ead4c..5fc53c7de2 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;
@@ -332,7 +333,7 @@ AddVideoDialog::file_name (bool &local_file)
 			char *ue = curl_easy_unescape(curl, uri.c_str(), uri.length(), &plen);
 #ifdef PLATFORM_WINDOWS
 			char *tmp;
-			while (tmp = strchr(ue, '/')) *tmp = '\\';
+			while ((tmp = strchr(ue, '/'))) *tmp = '\\';
 #endif
 			std::string path = video_get_docroot(Config) + ue;
 			if (!::access(path.c_str(), R_OK)) {
@@ -397,8 +398,7 @@ AddVideoDialog::file_selection_changed ()
 	if (chooser.get_filename().size() > 0) {
 		std::string path = chooser.get_filename();
 		bool ok =
-				check_video_file_extension(path)
-				&&  Glib::file_test(path.c_str(), Glib::FILE_TEST_IS_REGULAR | Glib::FILE_TEST_IS_SYMLINK)
+				Glib::file_test(path.c_str(), Glib::FILE_TEST_IS_REGULAR | Glib::FILE_TEST_IS_SYMLINK)
 				&& !Glib::file_test(path.c_str(), Glib::FILE_TEST_IS_DIR);
 		set_action_ok(ok);
 		if (ok) {
@@ -417,8 +417,7 @@ AddVideoDialog::file_activated ()
 		std::string path = chooser.get_filename();
 		// TODO check docroot -> set import options
 		bool ok =
-				check_video_file_extension(path)
-				&&  Glib::file_test(path.c_str(), Glib::FILE_TEST_IS_REGULAR | Glib::FILE_TEST_IS_SYMLINK)
+				Glib::file_test(path.c_str(), Glib::FILE_TEST_IS_REGULAR | Glib::FILE_TEST_IS_SYMLINK)
 				&& !Glib::file_test(path.c_str(), Glib::FILE_TEST_IS_DIR);
 		if (ok) {
 			Gtk::Dialog::response(RESPONSE_ACCEPT);