diff options
Diffstat (limited to 'gtk2_ardour/export_dialog.h')
-rw-r--r-- | gtk2_ardour/export_dialog.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 756a3e7b53..315780750e 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -32,6 +32,7 @@ #include "export_file_notebook.h" #include "export_preset_selector.h" #include "ardour_dialog.h" +#include "soundcloud_export_selector.h" #include <gtkmm.h> @@ -43,7 +44,8 @@ namespace ARDOUR { class ExportTimespanSelector; class ExportChannelSelector; -class ExportDialog : public ArdourDialog { +class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList +{ public: @@ -75,26 +77,22 @@ class ExportDialog : public ArdourDialog { // Must initialize all the shared_ptrs below virtual void init_components (); - // Override if the channel selector should not be grown - virtual bool channel_selector_is_expandable() { return true; } - boost::scoped_ptr<ExportPresetSelector> preset_selector; boost::scoped_ptr<ExportTimespanSelector> timespan_selector; boost::scoped_ptr<ExportChannelSelector> channel_selector; boost::scoped_ptr<ExportFileNotebook> file_notebook; + boost::scoped_ptr<SoundcloudExportSelector> soundcloud_selector; Gtk::VBox warning_widget; Gtk::VBox progress_widget; - Gtk::Label * timespan_label; - Gtk::Label * channels_label; + /*** GUI components ***/ + Gtk::Notebook export_notebook; private: void init (); - void expanded_changed(); - void notify_errors (bool force = false); void close_dialog (); @@ -112,10 +110,7 @@ class ExportDialog : public ArdourDialog { PublicEditor & editor; StatusPtr status; - /*** GUI components ***/ - Glib::RefPtr<Gtk::SizeGroup> advanced_sizegroup; - Gtk::Expander * advanced; /* Warning area */ @@ -138,6 +133,8 @@ class ExportDialog : public ArdourDialog { float previous_progress; // Needed for gtk bug workaround + void soundcloud_upload_progress(double total, double now, std::string title); + /* Buttons */ Gtk::Button * cancel_button; @@ -170,9 +167,6 @@ class ExportRegionDialog : public ExportDialog public: ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track); - protected: - virtual bool channel_selector_is_expandable() { return false; } - private: void init_gui (); void init_components (); |