dedicated namespace for video-utils

conflicting symbol prophylaxis

diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index a005b74467f5dfb12ead55cede5e9799b63e0d96..57938ac3f154eb4da8c36dc2c33df2c67900c3cf 100644 (file)
--- 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 5ccfa172ea785bd45bed4a06a62de055f662203a..b8f94ac55c277193a489962c50f198a75077ca66 100644 (file)
--- 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 b35f843d15588645969bece1af36e590a80e5445..ea753104dbaf9d887aaac1634503d31cf53e7d13 100644 (file)
--- 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 ee0d755b17852aff007a7025f2a1e86855ce934b..3be2450ca7a22ed7e693a37529b26904e920722d 100644 (file)
--- 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 2a4ce21bdcfe977dbc025ab592d9e6d1c60376ca..ed1bfad766eafbeb8c2fe996deb2acdeff583205 100644 (file)
--- 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<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 +237,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,
@@ -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<Gdk::Pixbuf> img)
+VideoUtils::video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 {
 
        int rowstride = img->get_rowstride();
@@ -299,7 +300,7 @@ video_draw_cross (Glib::RefPtr<Gdk::Pixbuf> img)
 extern "C" {
 #include <curl/curl.h>
 
-       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 89daadc40e380cb07b741b41866562a594996a73..7f6f6052af0ec9500eb89cea93c5f57bd7adba42 100644 (file)
--- 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 3c39dea77b14e85b57ed456a257e74a952204bd6..38a7a5994f5c74007ffafcfcc77d5b4ea83b79d5 100644 (file)
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -36,6 +36,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn)
        : editor (ed)
@@ -196,7 +197,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 d7a018a045b7acbaf344a199d45e715c2fdbe908..811c00f64f19405df90e6ae54ef51fc136bc1319 100644 (file)
--- 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 9a48fcc9e32e88133c963a6221f53046b2b1181a..75f6150691cd9dc36c2c1b7938a2be6a6a90144b 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -45,6 +45,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)
@@ -552,7 +553,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);
@@ -574,7 +575,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;
        }
@@ -670,7 +671,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);
        }