From 9c2682d6f177c485bdc5827bc1d887387ab75aeb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 17 Jul 2016 17:03:48 +0200 Subject: [PATCH] quick hack to test SSL in bundles this needs to be reverted, and we need a proper curl wrapper, shared by video-timeline AND freesound moocher --- gtk2_ardour/luainstance.cc | 14 ++++++++++++++ gtk2_ardour/utils_videotl.cc | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index 5893c15fd9..4d3ea5f777 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -39,6 +39,7 @@ #include "time_axis_view.h" #include "selection.h" #include "script_selector.h" +#include "utils_videotl.h" #include "pbd/i18n.h" @@ -345,6 +346,17 @@ const char *luasignalstr[] = { #undef ENGINE }; // namespace + +std::string lua_http_get (const char *u) { + char *rv = a3_curl_http_get (u, NULL); + if (!rv) { + return ""; + } + std::string s (rv); + free (rv); + return s; +} + //////////////////////////////////////////////////////////////////////////////// #define xstr(s) stringify(s) @@ -537,6 +549,8 @@ LuaInstance::register_classes (lua_State* L) luabridge::getGlobalNamespace (L) .beginNamespace ("ArdourUI") + .addFunction ("curl_http_get", &lua_http_get) + .beginStdList ("ArdourMarkerList") .endClass () diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index 2d859b692a..0a521a1935 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -337,8 +337,7 @@ extern "C" { struct A3MemoryStruct chunk; long int httpstatus; if (status) *status = 0; - //Glib::usleep(500000); return NULL; // TEST & DEBUG - if (strncmp("http://", u, 7)) return NULL; + if (strncmp("http://", u, 7) && strncmp("https://", u, 8)) return NULL; chunk.data=NULL; chunk.size=0; -- 2.30.2