diff options
| -rw-r--r-- | gtk2_ardour/export_format_dialog.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/export_format_dialog.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/export_format_specification.h | 3 | ||||
| -rw-r--r-- | libs/ardour/export_format_manager.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/export_format_specification.cc | 11 |
5 files changed, 1 insertions, 32 deletions
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index 69c494e090..b4d266c43e 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/gtk2_ardour/export_format_dialog.cc @@ -51,7 +51,6 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : silence_end_checkbox (_("Add silence at end:")), silence_end_clock ("silence_end", true, "", true, false, true), - upload_checkbox(_("Upload to Soundcloud")), command_label(_("Command to run post-export\n(%f=full path & filename, %d=directory, %b=basename, %u=username, %p=password):")), format_table (3, 4), @@ -116,7 +115,6 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : silence_table.attach (silence_end_checkbox, 1, 2, 2, 3); silence_table.attach (silence_end_clock, 2, 3, 2, 3); - get_vbox()->pack_start (upload_checkbox, false, false); get_vbox()->pack_start (command_label, false, false); get_vbox()->pack_start (command_entry, false, false); @@ -149,7 +147,6 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) : with_cue.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_with_cue)); with_toc.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_with_toc)); - upload_checkbox.signal_toggled().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_upload)); command_entry.signal_changed().connect (sigc::mem_fun (*this, &ExportFormatDialog::update_command)); cue_toc_vbox.pack_start (with_cue, false, false); @@ -305,7 +302,6 @@ ExportFormatDialog::load_state (FormatPtr spec) } tag_checkbox.set_active (spec->tag()); - upload_checkbox.set_active (spec->upload()); command_entry.set_text (spec->command()); } @@ -728,11 +724,6 @@ ExportFormatDialog::update_with_toc () manager.select_with_toc (with_toc.get_active()); } -void -ExportFormatDialog::update_upload () -{ - manager.select_upload (upload_checkbox.get_active()); -} void ExportFormatDialog::update_command () diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h index 6b92625e7a..8a3211db23 100644 --- a/gtk2_ardour/export_format_dialog.h +++ b/gtk2_ardour/export_format_dialog.h @@ -179,9 +179,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList Gtk::CheckButton silence_end_checkbox; AudioClock silence_end_clock; - /* Upload */ + /* Post-export hook */ - Gtk::CheckButton upload_checkbox; Gtk::Label command_label; Gtk::Entry command_entry; @@ -317,7 +316,6 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList void update_with_toc (); void update_with_cue (); - void update_upload (); void update_command (); Gtk::TreeView sample_format_view; diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h index d41fe3e97a..26d28648a2 100644 --- a/libs/ardour/ardour/export_format_specification.h +++ b/libs/ardour/ardour/export_format_specification.h @@ -96,7 +96,6 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase { void set_tag (bool tag_it) { _tag = tag_it; } void set_with_cue (bool yn) { _with_cue = yn; } void set_with_toc (bool yn) { _with_toc = yn; } - void set_upload (bool yn) { _upload = yn; } void set_command (std::string command) { _command = command; } void set_silence_beginning (AnyTime const & value) { _silence_beginning = value; } @@ -127,7 +126,6 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase { float normalize_target () const { return _normalize_target; } bool with_toc() const { return _with_toc; } bool with_cue() const { return _with_cue; } - bool upload() const { return _upload; } std::string command() const { return _command; } bool tag () const { return _tag && supports_tagging; } @@ -178,7 +176,6 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase { float _normalize_target; bool _with_toc; bool _with_cue; - bool _upload; std::string _command; /* serialization helpers */ diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc index 3ee940ffb6..04cfa76677 100644 --- a/libs/ardour/export_format_manager.cc +++ b/libs/ardour/export_format_manager.cc @@ -293,12 +293,6 @@ ExportFormatManager::select_with_toc (bool value) check_for_description_change (); } -void -ExportFormatManager::select_upload (bool value) -{ - current_selection->set_upload (value); - check_for_description_change (); -} void ExportFormatManager::set_command (std::string command) diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc index 8b921519f7..5191146790 100644 --- a/libs/ardour/export_format_specification.cc +++ b/libs/ardour/export_format_specification.cc @@ -170,7 +170,6 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s) , _normalize_target (1.0) , _with_toc (false) , _with_cue (false) - , _upload (false) , _command ("") { format_ids.insert (F_None); @@ -246,7 +245,6 @@ ExportFormatSpecification::get_state () root->add_property ("id", _id.to_s()); root->add_property ("with-cue", _with_cue ? "true" : "false"); root->add_property ("with-toc", _with_toc ? "true" : "false"); - root->add_property ("upload", _upload ? "true" : "false"); root->add_property ("command", _command); node = root->add_child ("Encoding"); @@ -325,11 +323,6 @@ ExportFormatSpecification::set_state (const XMLNode & root) _with_toc = false; } - if ((prop = root.property ("upload"))) { - _upload = string_is_affirmative (prop->value()); - } else { - _upload = false; - } if ((prop = root.property ("command"))) { _command = prop->value(); @@ -606,10 +599,6 @@ ExportFormatSpecification::description (bool include_name) components.push_back ("CUE"); } - if (_upload) { - components.push_back ("Upload"); - } - if (!_command.empty()) { components.push_back ("+"); } |