ardour/livetrax
13
0
Fork 0
Code

Rename Struct defined in freesound header to be less generic

Browse Source 
This could potentially conflict with a struct declared in the
ardour/soundcloud_upload.h file.
This commit is contained in:
Tim Mayberry 2016-09-13 14:24:28 +10:00
parent cec0c57b78
commit 3193aa93ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/sfdb_freesound_mootcher.cc
View File

@ -106,7 +106,7 @@ void Mootcher::ensureWorkingDir ()
size_t Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) size_t Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
{ {
int realsize = (int)(size * nmemb); 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); mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
@ -161,7 +161,7 @@ void Mootcher::setcUrlOptions()
std::string Mootcher::doRequest(std::string uri, std::string params) std::string Mootcher::doRequest(std::string uri, std::string params)
{ {
std::string result; std::string result;
struct MemoryStruct xml_page; struct SfdbMemoryStruct xml_page;
xml_page.memory = NULL; xml_page.memory = NULL;
xml_page.size = 0; xml_page.size = 0;

2
gtk2_ardour/sfdb_freesound_mootcher.h
View File

@ -48,7 +48,7 @@
#include "curl/curl.h" #include "curl/curl.h"
//--- struct to store XML file //--- struct to store XML file
struct MemoryStruct { struct SfdbMemoryStruct {
char *memory; char *memory;
size_t size; size_t size;
}; };