menu item says Fader and Pan, so the automation track should say the same for consistency

[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 ba9b4052c86615577383ab0e754a2e01d7ced060..7daecfc5935f10a740518e04bb76d3f4740aa664 100644 (file)
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -51,7 +51,7 @@
 //------------------------------------------------------------------------\r
 Mootcher::     Mootcher(const char *saveLocation)\r
        : curl( NULL )\r
-       , connection( NULL )\r
+       , connection( 0 )\r
 {\r
        changeWorkingDir(saveLocation);\r
 };\r
@@ -78,9 +78,9 @@ const char* Mootcher::changeWorkingDir(const char *saveLocation)
        \r
        // create Freesound directory and sound dir\r
        std::string sndLocation = basePath;\r
-       mkdir(sndLocation.c_str(), 0x777);        \r
+       mkdir(sndLocation.c_str(), 0777);        \r
        sndLocation += "snd";\r
-       mkdir(sndLocation.c_str(), 0x777);        \r
+       mkdir(sndLocation.c_str(), 0777);        \r
 \r
        return basePath.c_str();\r
 }\r
@@ -108,7 +108,7 @@ size_t              Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void
 //------------------------------------------------------------------------\r
 void           Mootcher::toLog(std::string input)\r
 {\r
-//printf("%s", input.c_str());// for debugging\r
+printf("%s\n", input.c_str());// for debugging\r
 }\r
 \r
 \r
@@ -135,7 +135,7 @@ int                 Mootcher::doLogin(std::string login, std::string password)
        \r
        struct MemoryStruct xml_page;\r
        xml_page.memory = NULL;\r
-       xml_page.size = NULL;\r
+       xml_page.size = 0;\r
 \r
        // create the post message from the login and password\r
        std::string postMessage;\r
@@ -164,7 +164,7 @@ int                 Mootcher::doLogin(std::string login, std::string password)
                curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, -1);\r
 \r
                // the url to get\r
-               std::string login_url = "http://freesound.iua.upf.edu/forum/login.php";\r
+               std::string login_url = "http://www.freesound.org/forum/login.php";\r
                curl_easy_setopt(curl, CURLOPT_URL, login_url.c_str() );\r
 \r
                // perform online request\r
@@ -179,13 +179,10 @@ int                       Mootcher::doLogin(std::string login, std::string password)
                if (connection == 1){\r
                        std::string check_page = xml_page.memory;\r
                        int test = (int)check_page.find("login");   //logged\r
-                       if(     test != -1){\r
-                               sprintf(message, "Login: %s\n", xml_page.memory);\r
-                               toLog(message);\r
-                       }\r
+                       if(     strcmp(xml_page.memory, "login") == 0 )\r
+                               toLog("Logged in.\n");\r
                        else {\r
-                               sprintf(message, "Login: Check username and password\n");\r
-                               toLog(message);\r
+                               toLog("Login failed: Check username and password.\n");\r
                                connection = 0;\r
                        }\r
                }\r
@@ -194,9 +191,10 @@ int                        Mootcher::doLogin(std::string login, std::string password)
                if(xml_page.memory){            \r
                        free( xml_page.memory );\r
                        xml_page.memory = NULL;\r
-                       xml_page.size = NULL;\r
+                       xml_page.size = 0;\r
                }\r
 \r
+               std::cerr << "Login was cool, connection = "  << connection << std::endl;\r
                return connection;\r
        }\r
        else return 3; // will be returned if a curl related problem ocurrs\r
@@ -206,7 +204,7 @@ std::string Mootcher::searchText(std::string word)
 {\r
        struct MemoryStruct xml_page;\r
        xml_page.memory = NULL;\r
-       xml_page.size = NULL;\r
+       xml_page.size = 0;\r
        \r
        std::string result;\r
 \r
@@ -236,7 +234,7 @@ std::string Mootcher::searchText(std::string word)
                        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, -1);\r
                        \r
                        // the url to get\r
-                       std::string search_url = "http://freesound.iua.upf.edu/searchTextXML.php";\r
+                       std::string search_url = "http://www.freesound.org/searchTextXML.php";\r
                        curl_easy_setopt(curl, CURLOPT_URL, search_url.c_str());\r
 \r
                        // perform the online search \r
@@ -255,7 +253,7 @@ std::string Mootcher::searchText(std::string word)
                        if(xml_page.memory){\r
                                free( xml_page.memory );\r
                                xml_page.memory = NULL;\r
-                               xml_page.size = NULL;\r
+                               xml_page.size = 0;\r
                        }\r
 \r
                }\r
@@ -302,7 +300,7 @@ void                Mootcher::GetXml(std::string ID, struct MemoryStruct &xml_page)
                curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&xml_page);\r
 \r
                // URL to get\r
-               std::string getxml_url = "http://freesound.iua.upf.edu/samplesViewSingleXML.php?id=";\r
+               std::string getxml_url = "http://www.freesound.org/samplesViewSingleXML.php?id=";\r
                getxml_url += ID;\r
 \r
                curl_easy_setopt(curl, CURLOPT_URL, getxml_url.c_str() );\r
@@ -462,7 +460,7 @@ std::string Mootcher::getFile(std::string ID)
 \r
                                // create the download url, this url will also update the download statics on the site\r
                                std::string audioURL;\r
-                               audioURL += "http://freesound.iua.upf.edu/samplesDownload.php?id=";\r
+                               audioURL += "http://www.freesound.org/samplesDownload.php?id=";\r
                                audioURL += ID;\r
 \r
                                setcUrlOptions();\r