diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/utils_videotl.h | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/utils_videotl.h')
| -rw-r--r-- | gtk2_ardour/utils_videotl.h | 5 |
1 files changed, 4 insertions, 1 deletions
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__ */ |