X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsfdb_freesound_mootcher.cc;h=51c195657b26dbc4914c2ea0b19e1e020d2bb678;hb=631b8f1b6b82f1c6c71fe5c67179d8cbc2f7775a;hp=586ad09ddd2e8650117a888012fc01b3daa7546e;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 586ad09ddd..51c195657b 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -48,9 +48,9 @@
 #include <iostream>
 
 #include <glib.h>
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "ardour/audio_library.h"
 #include "ardour/rc_configuration.h"
@@ -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;