X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.h;h=5e895e54c85a4e9b18320e1670e019db143ec05f;hb=d9cb8a807e9cd9e355e9445caad2f7f9adc0bfad;hp=a720ec0b9c15d7a6d4a3613119a283dd80f6c0a4;hpb=80004a33aa286208161ae18ce6ca917e8f4442c9;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index a720ec0b9c..5e895e54c8 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,26 @@ 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 show_progress ();
 	gint progress_timeout ();
@@ -107,9 +110,8 @@ class ExportDialog : public ArdourDialog {
 
 	PublicEditor &  editor;
 	StatusPtr       status;
-	PBD::ScopedConnection abort_connection;
 
-	/*** GUI components ***/
+
 
 	/* Warning area */
 
@@ -132,11 +134,12 @@ 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;
-	Gtk::Button *           rt_export_button;
-	Gtk::Button *           fast_export_button;
+	Gtk::Button *           export_button;
 
 };
 
@@ -148,7 +151,7 @@ class ExportRangeDialog : public ExportDialog
   private:
 	void init_components ();
 
-        std::string range_id;
+	std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog