X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Futils_videotl.cc;h=b62ac9433c93813e30dfcc2831090ee93ba02191;hb=eee3837245f570d36e5d4d92409660c8ff777b5b;hp=1496893e82d3ea1db7285aa14e0f83bcb183656a;hpb=6a436fd826d1c9d88b60287696cc0836ccce35aa;p=ardour.git

diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index 1496893e82..b62ac9433c 100644
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -28,16 +28,25 @@
 #include "ardour/session_directory.h"
 #include "video_image_frame.h"
 #include "utils_videotl.h"
+#include "utils.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;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 bool
-confirm_video_outfn (std::string outfn, std::string docroot)
+VideoUtils::confirm_video_outfn (Gtk::Window& parent, std::string outfn, std::string docroot)
 {
 	/* replace docroot's '/' to G_DIR_SEPARATOR for the comparison */
 	size_t look_here = 0;
@@ -59,13 +68,13 @@ confirm_video_outfn (std::string outfn, std::string docroot)
 	}
 
 	if (Glib::file_test(outfn, Glib::FILE_TEST_EXISTS)) {
-		ArdourDialog confirm (_("Confirm Overwrite"), true);
-		Label m (_("A file with the same name already exists.  Do you want to overwrite it?"));
-		confirm.get_vbox()->pack_start (m, true, true);
-		confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-		confirm.add_button (_("Overwrite"), Gtk::RESPONSE_ACCEPT);
-		confirm.show_all ();
-		if (confirm.run() == RESPONSE_CANCEL) { return false; }
+		bool overwrite = ARDOUR_UI_UTILS::overwrite_file_dialog (parent,
+		                                                         _("Confirm Overwrite"),
+		                                                         _("A file with the same name already exists. Do you want to overwrite it?"));
+
+		if (!overwrite) {
+			return false;
+		}
 	}
 
 	std::string dir = Glib::path_get_dirname (outfn);
@@ -77,7 +86,7 @@ confirm_video_outfn (std::string outfn, std::string docroot)
 }
 
 std::string
-video_dest_dir (const std::string sessiondir, const std::string docroot)
+VideoUtils::video_dest_dir (const std::string sessiondir, const std::string docroot)
 {
 	std::string dir = docroot;
 	if (dir.empty() || !dir.compare(0, dir.length(), sessiondir, 0, dir.length())) {
@@ -92,26 +101,30 @@ video_dest_dir (const std::string sessiondir, const std::string docroot)
 }
 
 std::string
-video_get_docroot (ARDOUR::RCConfiguration* config)
+VideoUtils::video_get_docroot (ARDOUR::RCConfiguration* config)
 {
 	if (config->get_video_advanced_setup()) {
 		return config->get_video_server_docroot();
 	}
+#ifndef PLATFORM_WINDOWS
 	return X_("/");
+#else
+	return X_("C:\\");
+#endif
 }
 
 std::string
-video_get_server_url (ARDOUR::RCConfiguration* config)
+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");
 }
 
 
 std::string
-strip_file_extension (const std::string infile)
+VideoUtils::strip_file_extension (const std::string infile)
 {
 	std::string rv;
 	char *ext, *bn = strdup(infile.c_str());
@@ -126,7 +139,7 @@ strip_file_extension (const std::string infile)
 }
 
 std::string
-get_file_extension (const std::string infile)
+VideoUtils::get_file_extension (const std::string infile)
 {
 	std::string rv = "";
 	char *ext, *bn = strdup(infile.c_str());
@@ -140,16 +153,23 @@ get_file_extension (const std::string infile)
 }
 
 std::string
-video_dest_file (const std::string dir, const std::string infile)
+VideoUtils::video_dest_file (const std::string dir, const std::string infile)
 {
-	return dir + "a3_" + strip_file_extension(Glib::path_get_basename(infile)) + ".avi";
+	return Glib::build_filename(dir, strip_file_extension(Glib::path_get_basename(infile)) + ".avi");
 }
 
 std::string
-video_map_path (std::string server_docroot, std::string filepath)
+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;
@@ -158,13 +178,6 @@ 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();
@@ -179,7 +192,7 @@ video_map_path (std::string server_docroot, std::string filepath)
 }
 
 void
-ParseCSV (const std::string &csv, std::vector<std::vector<std::string> > &lines)
+VideoUtils::ParseCSV (const std::string &csv, std::vector<std::vector<std::string> > &lines)
 {
 	bool inQuote(false);
 	bool newLine(false);
@@ -236,7 +249,7 @@ ParseCSV (const std::string &csv, std::vector<std::vector<std::string> > &lines)
 }
 
 bool
-video_query_info (
+VideoUtils::video_query_info (
 		std::string video_server_url,
 		std::string filepath,
 		double &video_file_fps,
@@ -247,54 +260,32 @@ video_query_info (
 {
 	char url[2048];
 
-	snprintf(url, sizeof(url), "%s%sinfo/?file=%s&format=plain"
+	snprintf(url, sizeof(url), "%s%sinfo/?file=%s&format=csv"
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			, filepath.c_str());
-	char *res = curl_http_get(url, NULL);
-	int pid=0;
-#ifndef COMPILER_MINGW
-	if (res) {
-		char *pch, *pst;
-		int version;
-		pch = strtok_r(res, "\n", &pst);
-		while (pch) {
-#if 0 /* DEBUG */
-			printf("VideoFileInfo [%i] -> '%s'\n", pid, pch);
-#endif
-			switch (pid) {
-				case 0:
-				  version = atoi(pch);
-					if (version != 1) break;
-				case 1:
-				  video_file_fps = atof(pch);
-					break;
-				case 2:
-					video_duration = atoll(pch);
-					break;
-				case 3:
-					video_start_offset = atof(pch);
-					break;
-				case 4:
-					video_aspect_ratio = atof(pch);
-					break;
-				default:
-					break;
-			}
-			pch = strtok_r(NULL,"\n", &pst);
-			++pid;
-		}
-	  free(res);
+	char *res = a3_curl_http_get(url, NULL);
+	if (!res) {
+		return false;
 	}
-#endif
-	if (pid!=5) {
+
+	std::vector<std::vector<std::string> > lines;
+	ParseCSV(std::string(res), lines);
+	free(res);
+
+	if (lines.empty() || lines.at(0).empty() || lines.at(0).size() != 6) {
 		return false;
 	}
+	if (atoi(lines.at(0).at(0)) != 1) return false; // version
+	video_start_offset = 0.0;
+	video_aspect_ratio = atof (lines.at(0).at(3));
+	video_file_fps = atof (lines.at(0).at(4));
+	video_duration = atoll(lines.at(0).at(5));
 	return true;
 }
 
 void
-video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
+VideoUtils::video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 {
 
 	int rowstride = img->get_rowstride();
@@ -321,7 +312,7 @@ video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 extern "C" {
 #include <curl/curl.h>
 
-	struct MemoryStruct {
+	struct A3MemoryStruct {
 		char *data;
 		size_t size;
 	};
@@ -329,7 +320,7 @@ extern "C" {
 	static size_t
 	WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) {
 		size_t realsize = size * nmemb;
-		struct MemoryStruct *mem = (struct MemoryStruct *)data;
+		struct A3MemoryStruct *mem = (struct A3MemoryStruct *)data;
 
 		mem->data = (char *)realloc(mem->data, mem->size + realsize + 1);
 		if (mem->data) {
@@ -340,13 +331,13 @@ extern "C" {
 		return realsize;
 	}
 
-	char *curl_http_get (const char *u, int *status) {
+	char *a3_curl_http_get (const char *u, int *status) {
 		CURL *curl;
 		CURLcode res;
-		struct MemoryStruct chunk;
+		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;
@@ -358,7 +349,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
@@ -372,7 +363,7 @@ extern "C" {
 		if (status) *status = httpstatus;
 		if (res) {
 #ifdef CURLERRORDEBUG
-			printf("curl_http_get() failed: %s\n", curlerror);
+			printf("a3_curl_http_get() failed: %s\n", curlerror);
 #endif
 			return NULL;
 		}