X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Futils_videotl.cc;h=3933022adc1fa0959800f6610c2d12caa52307a4;hb=ae3c50c495ffadbc62103cc1d3a61af2b48f423e;hp=ed1bfad766eafbeb8c2fe996deb2acdeff583205;hpb=616f2a0370a10dcc7372a95f6bca9f5a45698980;p=ardour.git diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index ed1bfad766..3933022adc 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -21,15 +21,25 @@ #include #include #include -#include #include "pbd/error.h" + #include "ardour/ardour.h" #include "ardour/session_directory.h" -#include "video_image_frame.h" + +#include "ardour_http.h" +#include "utils.h" #include "utils_videotl.h" +#include "video_image_frame.h" + +#ifdef WAF_BUILD +#include "gtk2ardour-version.h" +#endif -#include "i18n.h" +#ifndef ARDOUR_CURL_TIMEOUT +#define ARDOUR_CURL_TIMEOUT (60) +#endif +#include "pbd/i18n.h" using namespace Gtk; using namespace std; @@ -37,8 +47,10 @@ using namespace PBD; using namespace ARDOUR; using namespace VideoUtils; +unsigned int VideoUtils::harvid_version = 0x0; + bool -VideoUtils::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; @@ -60,13 +72,13 @@ VideoUtils::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); @@ -98,7 +110,15 @@ 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 + if (harvid_version >= 0x000802) { // 0.8.2 + return X_(""); + } else { + return X_("C:\\"); + } +#endif } std::string @@ -107,7 +127,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"); } @@ -143,7 +163,7 @@ VideoUtils::get_file_extension (const std::string infile) std::string 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 @@ -151,6 +171,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 +186,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(); @@ -246,20 +266,20 @@ VideoUtils::video_query_info ( double &video_aspect_ratio ) { + LocaleGuard lg; char url[2048]; 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 = a3_curl_http_get(url, NULL); - if (!res) { + std::string res = ArdourCurl::http_get (url); + if (res.empty ()) { return false; } std::vector > lines; - ParseCSV(std::string(res), lines); - free(res); + ParseCSV(res, lines); if (lines.empty() || lines.at(0).empty() || lines.at(0).size() != 6) { return false; @@ -269,6 +289,12 @@ VideoUtils::video_query_info ( 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)); + + if (video_aspect_ratio < 0.01 || video_file_fps < 0.01) { + /* catch errors early, aspect == 0 or fps == 0 will + * wreak havoc down the road */ + return false; + } return true; } @@ -296,70 +322,3 @@ VideoUtils::video_draw_cross (Glib::RefPtr img) } } - -extern "C" { -#include - - struct A3MemoryStruct { - char *data; - size_t size; - }; - - static size_t - WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) { - size_t realsize = size * nmemb; - struct A3MemoryStruct *mem = (struct A3MemoryStruct *)data; - - mem->data = (char *)realloc(mem->data, mem->size + realsize + 1); - if (mem->data) { - memcpy(&(mem->data[mem->size]), ptr, realsize); - mem->size += realsize; - mem->data[mem->size] = 0; - } - return realsize; - } - - char *a3_curl_http_get (const char *u, int *status) { - CURL *curl; - CURLcode res; - struct A3MemoryStruct chunk; - long int httpstatus; - if (status) *status = 0; - //usleep(500000); return NULL; // TEST & DEBUG - if (strncmp("http://", u, 7)) return NULL; - - chunk.data=NULL; - chunk.size=0; - - curl = curl_easy_init(); - if(!curl) return NULL; - curl_easy_setopt(curl, CURLOPT_URL, u); - - 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_TIMEOUT, ARDOUR_CURL_TIMEOUT); - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); -#ifdef CURLERRORDEBUG - char curlerror[CURL_ERROR_SIZE] = ""; - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerror); -#endif - - res = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpstatus); - curl_easy_cleanup(curl); - if (status) *status = httpstatus; - if (res) { -#ifdef CURLERRORDEBUG - printf("a3_curl_http_get() failed: %s\n", curlerror); -#endif - return NULL; - } - if (httpstatus != 200) { - free (chunk.data); - chunk.data = NULL; - } - return (chunk.data); - } - -} /* end extern "C" */