Call curl_global_init() exactly only once (1/2)

[ardour.git] / gtk2_ardour / sfdb_freesound_mootcher.cc

diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 74290df0a3dad079d0b72aff297f14ac1943e00c..51c195657b26dbc4914c2ea0b19e1e020d2bb678 100644 (file)
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -106,7 +106,7 @@ void Mootcher::ensureWorkingDir ()
 size_t Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
 {
        int realsize = (int)(size * nmemb);
-       struct MemoryStruct *mem = (struct MemoryStruct *)data;
+       struct SfdbMemoryStruct *mem = (struct SfdbMemoryStruct *)data;
 
        mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
 
@@ -142,8 +142,6 @@ std::string Mootcher::sortMethodString(enum sortMethod sort)
 //------------------------------------------------------------------------
 void Mootcher::setcUrlOptions()
 {
-       // basic init for curl
-       curl_global_init(CURL_GLOBAL_ALL);
        // some servers don't like requests that are made without a user-agent field, so we provide one
        curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
        // setup curl error buffer
@@ -161,7 +159,7 @@ void Mootcher::setcUrlOptions()
 std::string Mootcher::doRequest(std::string uri, std::string params)
 {
        std::string result;
-       struct MemoryStruct xml_page;
+       struct SfdbMemoryStruct xml_page;
        xml_page.memory = NULL;
        xml_page.size = 0;