diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-08-15 17:20:49 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-10-07 12:23:00 +0100 |
| commit | 15b4ebbb074ce679c5ea7fb44061934fe572cad5 (patch) | |
| tree | 2b30271fec5d49091cb7d6250a6dfbfbd1eb4c03 | |
| parent | 9591a480511da0749afdb51a744c97107604fe75 (diff) | |
add soundcloud export to wscript, and make it compile.
add soundcloud exporter to gtk2_ardour/wscript, and fix compile errors by using
std::string in place of string everywhere.
| -rw-r--r-- | gtk2_ardour/soundcloud_export.cc | 13 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/soundcloud_export.cc b/gtk2_ardour/soundcloud_export.cc index 54f83c9861..90c03f720d 100644 --- a/gtk2_ardour/soundcloud_export.cc +++ b/gtk2_ardour/soundcloud_export.cc @@ -37,7 +37,8 @@ using namespace PBD; static const std::string base_url = "http://api.soundcloud.com/tracks/13158665?client_id="; -size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) +size_t +WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) { register int realsize = (int)(size * nmemb); struct MemoryStruct *mem = (struct MemoryStruct *)data; @@ -58,8 +59,8 @@ SoundcloudUploader::SoundcloudUploader() multi_handle = curl_multi_init(); } -string -SoundcloudUploader::Get_Auth_Token( string username, string password ) +std::string +SoundcloudUploader::Get_Auth_Token( std::string username, std::string password ) { struct MemoryStruct xml_page; xml_page.memory = NULL; @@ -131,7 +132,7 @@ SoundcloudUploader::Get_Auth_Token( string username, string password ) return ""; } - string token = strtok( xml_page.memory, "access_token" ); + std::string token = strtok( xml_page.memory, "access_token" ); token = strtok( NULL, "\"" ); token = strtok( NULL, "\"" ); token = strtok( NULL, "\"" ); @@ -144,7 +145,7 @@ SoundcloudUploader::Get_Auth_Token( string username, string password ) } std::string -SoundcloudUploader::Upload(string file_path, string title, string auth_token, bool ispublic, curl_progress_callback progress_callback, void *caller ) +SoundcloudUploader::Upload(std::string file_path, std::string title, std::string auth_token, bool ispublic, curl_progress_callback progress_callback, void *caller ) { int still_running; @@ -197,7 +198,7 @@ SoundcloudUploader::Upload(string file_path, string title, string auth_token, bo if(curl_handle && multi_handle) { /* what URL that receives this POST */ - string url = "https://api.soundcloud.com/tracks"; + std::string url = "https://api.soundcloud.com/tracks"; curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L); diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index be7164cf05..e6e5ba65af 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -211,6 +211,7 @@ gtk2_ardour_sources = [ 'shuttle_control.cc', 'simpleline.cc', 'simplerect.cc', + 'soundcloud_export.cc', 'splash.cc', 'speaker_dialog.cc', 'startup.cc', |