part two of allow markup to be used in BoolOption items in an option editor

[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 a1cb4a969e222bc67f079892264227c3cb41b19e..ed1e2abfebbe7b0496bf106188b73486c1501c0a 100644 (file)
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -211,16 +211,21 @@ std::string Mootcher::searchText(std::string query, int page, std::string filter
                snprintf(buf, 23, "p=%d&", page);\r
                params += buf;\r
        }\r
-       \r
-       params += "q=" + query; \r
 \r
-       if (filter != "")\r
-               params += "&f=" + filter;\r
+       char *eq = curl_easy_escape(curl, query.c_str(), query.length());\r
+       params += "q=\"" + std::string(eq) + "\"";\r
+       free(eq);\r
+\r
+       if (filter != "") {\r
+               char *ef = curl_easy_escape(curl, filter.c_str(), filter.length());\r
+               params += "&f=" + std::string(ef);\r
+               free(ef);\r
+       }\r
        \r
        if (sort)\r
                params += "&s=" + sortMethodString(sort);\r
 \r
-       params += "&fields=id,original_filename,duration,serve";        \r
+       params += "&fields=id,original_filename,duration,filesize,samplerate,license,serve";\r
 \r
        return doRequest("/sounds/search", params);\r
 }\r
@@ -339,7 +344,7 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
        caller->freesound_progress_bar.show();\r
 \r
        std::string prog;\r
-       prog = string_compose (_("%1: [Stop]->"), originalFileName);\r
+       prog = string_compose (_("%1"), originalFileName);\r
        caller->freesound_progress_bar.set_text(prog);\r
 \r
        curl_easy_setopt (curl, CURLOPT_NOPROGRESS, 0); // turn on the progress bar\r