X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.h;h=fee7013577b29400bb8385f2bb5e761cbd6e8348;hb=46d2b03af0f2e4d9495b447724d0fa275ea774ff;hp=9b06492cdd4a6896e0d381e9dd43c5f16f2d1cb6;hpb=eb85208fe8ab985831acc7011c3cebd219aa0031;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 9b06492cdd..fee7013577 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,11 +44,12 @@ namespace ARDOUR {
 class ExportTimespanSelector;
 class ExportChannelSelector;
 
-class ExportDialog : public ArdourDialog {
+class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
+{
 
   public:
 
-	ExportDialog (PublicEditor & editor, std::string title, std::string xml_node_name);
+	ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
 	~ExportDialog ();
 
 	void set_session (ARDOUR::Session* s);
@@ -65,7 +67,7 @@ class ExportDialog : public ArdourDialog {
 	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
 
-	std::string     xml_node_name;
+	ARDOUR::ExportProfileManager::ExportType type;
 	HandlerPtr      handler;
 	ManagerPtr      profile_manager;
 
@@ -80,25 +82,29 @@ class ExportDialog : public ArdourDialog {
 	boost::scoped_ptr<ExportChannelSelector>  channel_selector;
 	boost::scoped_ptr<ExportFileNotebook>     file_notebook;
 
+	boost::shared_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 notify_errors ();
+	void notify_errors (bool force = false);
 	void close_dialog ();
 
 	void sync_with_manager ();
-	void update_warnings ();
+	void update_warnings_and_example_filename ();
 	void show_conflicting_files ();
 
-	void export_rt ();
-	void export_fw ();
+	void do_export ();
+
+	void update_realtime_selection ();
+	void parameter_changed (std::string const&);
 
 	void show_progress ();
 	gint progress_timeout ();
@@ -107,9 +113,8 @@ class ExportDialog : public ArdourDialog {
 
 	PublicEditor &  editor;
 	StatusPtr       status;
-	PBD::ScopedConnection abort_connection;
 
-	/*** GUI components ***/
+
 
 	/* Warning area */
 
@@ -127,21 +132,17 @@ class ExportDialog : public ArdourDialog {
 
 	/* Progress bar */
 
-	Gtk::Label              progress_label;
 	Gtk::ProgressBar        progress_bar;
 	sigc::connection        progress_connection;
 
-	/* Normalizing */
+	float previous_progress; // Needed for gtk bug workaround
 
-	Gtk::VBox               normalizing_widget;
-	Gtk::Label              normalizing_label;
-	Gtk::ProgressBar        normalizing_bar;
+	void soundcloud_upload_progress(double total, double now, std::string title);
 
 	/* Buttons */
 
 	Gtk::Button *           cancel_button;
-	Gtk::Button *           rt_export_button;
-	Gtk::Button *           fast_export_button;
+	Gtk::Button *           export_button;
 
 };
 
@@ -153,7 +154,7 @@ class ExportRangeDialog : public ExportDialog
   private:
 	void init_components ();
 
-        std::string range_id;
+	std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog