X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.h;h=fee7013577b29400bb8385f2bb5e761cbd6e8348;hb=52275254a7adb9a446c104cc7dcfde82d1792786;hp=4182b0f236800ec5d367c29ae49e88a48a453cb4;hpb=4d112a8e6b90fa64a5cd333042044768111ba994;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 4182b0f236..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:
 
-	explicit ExportDialog (PublicEditor & editor, Glib::ustring title);
+	ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
 	~ExportDialog ();
 
 	void set_session (ARDOUR::Session* s);
@@ -65,6 +67,7 @@ class ExportDialog : public ArdourDialog {
 	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
 
+	ARDOUR::ExportProfileManager::ExportType type;
 	HandlerPtr      handler;
 	ManagerPtr      profile_manager;
 
@@ -79,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 ();
@@ -106,35 +113,36 @@ class ExportDialog : public ArdourDialog {
 
 	PublicEditor &  editor;
 	StatusPtr       status;
-	PBD::ScopedConnection abort_connection;
 
-	/*** GUI components ***/
+
 
 	/* Warning area */
 
 	Gtk::HBox           warn_hbox;
 	Gtk::Label          warn_label;
-	Glib::ustring       warn_string;
+	std::string       warn_string;
 
 	Gtk::HBox           list_files_hbox;
 	Gtk::Label          list_files_label;
 	Gtk::Button         list_files_button;
-	Glib::ustring       list_files_string;
+	std::string       list_files_string;
 
 	void add_error (std::string const & text);
 	void add_warning (std::string const & text);
 
 	/* Progress bar */
 
-	Gtk::Label              progress_label;
 	Gtk::ProgressBar        progress_bar;
 	sigc::connection        progress_connection;
 
+	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;
 
 };
 
@@ -145,8 +153,8 @@ class ExportRangeDialog : public ExportDialog
 
   private:
 	void init_components ();
-        
-        std::string range_id;
+
+	std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog
@@ -160,7 +168,7 @@ class ExportSelectionDialog : public ExportDialog
 
 class ExportRegionDialog : public ExportDialog
 {
-	public:
+  public:
 	ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track);
 
   private:
@@ -171,4 +179,13 @@ class ExportRegionDialog : public ExportDialog
 	ARDOUR::AudioTrack & track;
 };
 
+class StemExportDialog : public ExportDialog
+{
+  public:
+	StemExportDialog (PublicEditor & editor);
+
+  private:
+	void init_components ();
+};
+
 #endif /* __ardour_export_dialog_h__ */