X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Futils_videotl.cc;h=24a27c1425de2573abaadb5b7672a716bd29eadf;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=ed1bfad766eafbeb8c2fe996deb2acdeff583205;hpb=43ae996b3a18ecad15f6fe872c4194d23b2200cf;p=ardour.git

diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index ed1bfad766..24a27c1425 100644
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -29,6 +29,13 @@
 #include "video_image_frame.h"
 #include "utils_videotl.h"
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
+#ifndef ARDOUR_CURL_TIMEOUT
+#define ARDOUR_CURL_TIMEOUT (60)
+#endif
 #include "i18n.h"
 
 using namespace Gtk;
@@ -151,6 +158,13 @@ VideoUtils::video_map_path (std::string server_docroot, std::string filepath)
 {
 	std::string rv = filepath;
 
+	/* strip docroot */
+	if (server_docroot.length() > 0) {
+		if (rv.compare(0, server_docroot.length(), server_docroot) == 0 ) {
+			rv = rv.substr(server_docroot.length());
+		}
+	}
+
 	/* replace all G_DIR_SEPARATOR with '/' */
 	size_t look_here = 0;
 	size_t found_here;
@@ -159,13 +173,6 @@ VideoUtils::video_map_path (std::string server_docroot, std::string filepath)
 		look_here = found_here + 1;
 	}
 
-	/* strip docroot */
-	if (server_docroot.length() > 0) {
-		if (rv.compare(0, server_docroot.length(), server_docroot) == 0 ) {
-			rv = rv.substr(server_docroot.length());
-		}
-	}
-
 	CURL *curl;
 	char *ue;
 	curl = curl_easy_init();
@@ -325,7 +332,7 @@ extern "C" {
 		struct A3MemoryStruct chunk;
 		long int httpstatus;
 		if (status) *status = 0;
-		//usleep(500000); return NULL; // TEST & DEBUG
+		//Glib::usleep(500000); return NULL; // TEST & DEBUG
 		if (strncmp("http://", u, 7)) return NULL;
 
 		chunk.data=NULL;
@@ -337,7 +344,7 @@ extern "C" {
 
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
-		curl_easy_setopt(curl, CURLOPT_USERAGENT, ARDOUR_USER_AGENT);
+		curl_easy_setopt(curl, CURLOPT_USERAGENT, PROGRAM_NAME VERSIONSTRING);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
 		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
 #ifdef CURLERRORDEBUG