From b5845ea45859dd3a823f2aa59fac2aaefcb6e087 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 3 Aug 2013 16:54:57 +0200 Subject: dedicated namespace for video-utils conflicting symbol prophylaxis --- gtk2_ardour/add_video_dialog.cc | 5 +++-- gtk2_ardour/export_video_dialog.cc | 1 + gtk2_ardour/transcode_ffmpeg.cc | 1 + gtk2_ardour/transcode_video_dialog.cc | 1 + gtk2_ardour/utils_videotl.cc | 35 ++++++++++++++++++----------------- gtk2_ardour/utils_videotl.h | 5 ++++- gtk2_ardour/video_image_frame.cc | 3 ++- gtk2_ardour/video_server_dialog.cc | 1 + gtk2_ardour/video_timeline.cc | 7 ++++--- 9 files changed, 35 insertions(+), 24 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc index a005b74467..57938ac3f1 100644 --- a/gtk2_ardour/add_video_dialog.cc +++ b/gtk2_ardour/add_video_dialog.cc @@ -42,6 +42,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; #define PREVIEW_WIDTH (240) #define PREVIEW_HEIGHT (180) @@ -482,7 +483,7 @@ AddVideoDialog::harvid_request(std::string u) harvid_list->clear(); - char *res = curl_http_get(url, &status); + char *res = a3_curl_http_get(url, &status); if (status != 200) { printf("request failed\n"); // XXX harvid_path.set_text(" - request failed -"); @@ -662,7 +663,7 @@ AddVideoDialog::request_preview(std::string u) , (long long) (video_duration * seek_slider.get_value() / 1000.0) , clip_width, clip_height, u.c_str()); - char *data = curl_http_get(url, NULL); + char *data = a3_curl_http_get(url, NULL); if (!data) { printf("image preview request failed %s\n", url); imgbuf->fill(RGBA_TO_UINT(0,0,0,255)); diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 5ccfa172ea..b8f94ac55c 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -60,6 +60,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) : ArdourDialog (_("Export Video File ")) diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index b35f843d15..ea753104db 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -33,6 +33,7 @@ #include "i18n.h" using namespace PBD; +using namespace VideoUtils; TranscodeFfmpeg::TranscodeFfmpeg (std::string f) : infile(f) diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index ee0d755b17..3be2450ca7 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -50,6 +50,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) : ArdourDialog (_("Transcode/Import Video File ")) diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index 2a4ce21bdc..ed1bfad766 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -35,9 +35,10 @@ 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 (std::string outfn, std::string docroot) { /* replace docroot's '/' to G_DIR_SEPARATOR for the comparison */ size_t look_here = 0; @@ -77,7 +78,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,7 +93,7 @@ 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(); @@ -101,7 +102,7 @@ video_get_docroot (ARDOUR::RCConfiguration* config) } 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(); @@ -111,7 +112,7 @@ video_get_server_url (ARDOUR::RCConfiguration* config) 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 +127,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,13 +141,13 @@ 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"; } 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; @@ -179,7 +180,7 @@ video_map_path (std::string server_docroot, std::string filepath) } void -ParseCSV (const std::string &csv, std::vector > &lines) +VideoUtils::ParseCSV (const std::string &csv, std::vector > &lines) { bool inQuote(false); bool newLine(false); @@ -236,7 +237,7 @@ ParseCSV (const std::string &csv, std::vector > &lines) } bool -video_query_info ( +VideoUtils::video_query_info ( std::string video_server_url, std::string filepath, double &video_file_fps, @@ -251,7 +252,7 @@ video_query_info ( , 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); + char *res = a3_curl_http_get(url, NULL); if (!res) { return false; } @@ -272,7 +273,7 @@ video_query_info ( } void -video_draw_cross (Glib::RefPtr img) +VideoUtils::video_draw_cross (Glib::RefPtr img) { int rowstride = img->get_rowstride(); @@ -299,7 +300,7 @@ video_draw_cross (Glib::RefPtr img) extern "C" { #include - struct MemoryStruct { + struct A3MemoryStruct { char *data; size_t size; }; @@ -307,7 +308,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) { @@ -318,10 +319,10 @@ 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 @@ -350,7 +351,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; } diff --git a/gtk2_ardour/utils_videotl.h b/gtk2_ardour/utils_videotl.h index 89daadc40e..7f6f6052af 100644 --- a/gtk2_ardour/utils_videotl.h +++ b/gtk2_ardour/utils_videotl.h @@ -32,6 +32,8 @@ #include "ardour/template_utils.h" #include "ardour_dialog.h" +namespace VideoUtils { + bool confirm_video_outfn (std::string, std::string docroot=""); std::string video_dest_dir (const std::string, const std::string); std::string video_dest_file (const std::string, const std::string); @@ -52,9 +54,10 @@ bool video_query_info ( double &video_start_offset, double &video_aspect_ratio ); +}; extern "C" { - char *curl_http_get (const char *u, int *status); + char *a3_curl_http_get (const char *u, int *status); } #endif /* __gtk_ardour_video_utils_h__ */ diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index dffab96ab5..e5cd197782 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -34,6 +34,7 @@ using namespace std; using namespace ARDOUR; +using namespace VideoUtils; static void freedata_cb (uint8_t *d, void* /*arg*/) { /* later this can be used with libharvid @@ -209,7 +210,7 @@ http_get_thread (void *arg) { int timeout = 1000; // * 5ms -> 5sec char *res = NULL; do { - res=curl_http_get(url, &status); + res=a3_curl_http_get(url, &status); if (status == 503) usleep(5000); // try-again } while (status == 503 && --timeout > 0); diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index d7a018a045..811c00f64f 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -37,6 +37,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; VideoServerDialog::VideoServerDialog (Session* s) : ArdourDialog (_("Launch Video Server")) diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index cfe30b243c..a1a85a0243 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -43,6 +43,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Timecode; +using namespace VideoUtils; VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height) : editor (ed) @@ -550,7 +551,7 @@ VideoTimeLine::check_server () , video_server_url.c_str() , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/" ); - char *res=curl_http_get(url, NULL); + char *res=a3_curl_http_get(url, NULL); if (res) { if (strstr(res, "status: ok, online.")) { ok = true; } free(res); @@ -572,7 +573,7 @@ VideoTimeLine::check_server_docroot () , video_server_url.c_str() , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/" ); - char *res=curl_http_get(url, NULL); + char *res=a3_curl_http_get(url, NULL); if (!res) { return false; } @@ -668,7 +669,7 @@ VideoTimeLine::flush_cache () { , video_server_url.c_str() , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/" ); - char *res=curl_http_get(url, NULL); + char *res=a3_curl_http_get(url, NULL); if (res) { free (res); } -- cgit v1.2.3