From 84bcf5981274ea0674f5702ef1f0570c2b57a0f2 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Fri, 23 May 2014 18:33:43 +0100 Subject: Better names for Soundcloud-related members of ExportHandler Rename the Soundcloud-related members of ExportHandler to all begin with soundcloud_, and rename a couple of members of SoundcloudExportSelector too for consistency. --- libs/ardour/ardour/export_handler.h | 8 ++++---- libs/ardour/export_handler.cc | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index 25a87045a8..082ebbcc49 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -114,10 +114,10 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr PBD::Signal3 SoundcloudProgress; /* upload credentials & preferences */ - std::string upload_username; - std::string upload_password; - bool upload_public; - bool upload_open; + std::string soundcloud_username; + std::string soundcloud_password; + bool soundcloud_make_public; + bool soundcloud_open_page; private: diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index cded56b439..3865bb205a 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -325,8 +325,8 @@ ExportHandler::finish_timespan () subs.insert (std::pair ('f', filename)); subs.insert (std::pair ('d', Glib::path_get_dirname(filename))); subs.insert (std::pair ('b', PBD::basename_nosuffix(filename))); - subs.insert (std::pair ('u', upload_username)); - subs.insert (std::pair ('p', upload_password)); + subs.insert (std::pair ('u', soundcloud_username)); + subs.insert (std::pair ('p', soundcloud_password)); std::cerr << "running command: " << fmt->command() << "..." << std::endl; @@ -347,25 +347,25 @@ ExportHandler::finish_timespan () if (fmt->soundcloud_upload()) { SoundcloudUploader *soundcloud_uploader = new SoundcloudUploader; - std::string token = soundcloud_uploader->Get_Auth_Token(upload_username, upload_password); + std::string token = soundcloud_uploader->Get_Auth_Token(soundcloud_username, soundcloud_password); std::cerr << "uploading " << filename << std::endl - << "username = " << upload_username - << ", password = " << upload_password + << "username = " << soundcloud_username + << ", password = " << soundcloud_password << " - token = " << token << " ..." << std::endl; std::string path = soundcloud_uploader->Upload ( filename, PBD::basename_nosuffix(filename), // title token, - upload_public, + soundcloud_make_public, this); if (path.length() != 0) { - if (upload_open) { - std::cerr << "opening " << path << " ..." << std::endl; - open_uri(path.c_str()); // open the soundcloud website to the new file + if (soundcloud_open_page) { + std::cerr << "opening " << path << " ..." << std::endl; + open_uri(path.c_str()); // open the soundcloud website to the new file } } else { error << _("upload to Soundcloud failed. Perhaps your email or password are incorrect?\n") << endmsg; -- cgit v1.2.3