{
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,
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:
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:
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;
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;