From 43ae996b3a18ecad15f6fe872c4194d23b2200cf 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/utils_videotl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour/utils_videotl.h') 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__ */ -- cgit v1.2.3