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.

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 76b62cde57fd2b3e397c2e933afe89e63976e55f..57a8ba76300055727d0850251e0c5886c339a961 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -271,10 +271,10 @@ ExportDialog::do_export ()
 {
        try {
                profile_manager->prepare_for_export ();
-               handler->upload_username = soundcloud_selector->username();
-               handler->upload_password = soundcloud_selector->password();
-               handler->upload_public   = soundcloud_selector->upload_public();
-               handler->upload_open     = soundcloud_selector->upload_open();
+               handler->soundcloud_username    = soundcloud_selector->username ();
+               handler->soundcloud_password    = soundcloud_selector->password ();
+               handler->soundcloud_make_public = soundcloud_selector->make_public ();
+               handler->soundcloud_open_page   = soundcloud_selector->open_page ();
 
                handler->SoundcloudProgress.connect_same_thread(
                                *this, 

diff --git a/gtk2_ardour/soundcloud_export_selector.h b/gtk2_ardour/soundcloud_export_selector.h
index 7962ba8b06432a4fc518b2a21c4746f33102c913..87222fcf5e08573c247a7b4d51319178f09522cb 100644 (file)
--- a/gtk2_ardour/soundcloud_export_selector.h
+++ b/gtk2_ardour/soundcloud_export_selector.h
@@ -22,8 +22,8 @@ class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandleP
        int do_progress_callback (double ultotal, double ulnow, const std::string &filename);
        std::string username () { return soundcloud_username_entry.get_text (); }
        std::string password () { return soundcloud_password_entry.get_text (); }
-       bool upload_public () { return soundcloud_public_checkbox.get_active (); }
-       bool upload_open () { return soundcloud_open_checkbox.get_active (); }
+       bool make_public  () { return soundcloud_public_checkbox.get_active (); }
+       bool open_page    () { return soundcloud_open_checkbox.get_active (); }
        void cancel () { soundcloud_cancel = true; }
 
   private:

diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index 25a87045a8d815b66c36fba9f27a6410e0886c73..082ebbcc498454b4015c8c9402d9d186b95ae732 100644 (file)
--- 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<void, double, double, std::string> 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 cded56b439f7c51ffe145f3b2e4450b287b9a9c5..3865bb205a532aa2578c476e34eb46ea6838fb1d 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -325,8 +325,8 @@ ExportHandler::finish_timespan ()
                        subs.insert (std::pair<char, std::string> ('f', filename));
                        subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname(filename)));
                        subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix(filename)));
-                       subs.insert (std::pair<char, std::string> ('u', upload_username));
-                       subs.insert (std::pair<char, std::string> ('p', upload_password));
+                       subs.insert (std::pair<char, std::string> ('u', soundcloud_username));
+                       subs.insert (std::pair<char, std::string> ('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;