projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimize automation-event process splitting
[ardour.git]
/
gtk2_ardour
/
export_dialog.h
diff --git
a/gtk2_ardour/export_dialog.h
b/gtk2_ardour/export_dialog.h
index 5928c67e9fd8890180c9c640cfa4ba380a1f9a38..09385a4b846525dea47e85b444a68b9734191671 100644
(file)
--- a/
gtk2_ardour/export_dialog.h
+++ b/
gtk2_ardour/export_dialog.h
@@
-21,8
+21,14
@@
#ifndef __export_dialog_h__
#define __export_dialog_h__
#ifndef __export_dialog_h__
#define __export_dialog_h__
-#include <boost/scoped_ptr.hpp>
#include <string>
#include <string>
+#include <boost/scoped_ptr.hpp>
+
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/progressbar.h>
#include "ardour/export_profile_manager.h"
#include "ardour/export_profile_manager.h"
@@
-32,8
+38,7
@@
#include "export_file_notebook.h"
#include "export_preset_selector.h"
#include "ardour_dialog.h"
#include "export_file_notebook.h"
#include "export_preset_selector.h"
#include "ardour_dialog.h"
-
-#include <gtkmm.h>
+#include "soundcloud_export_selector.h"
namespace ARDOUR {
class ExportStatus;
namespace ARDOUR {
class ExportStatus;
@@
-43,11
+48,11
@@
namespace ARDOUR {
class ExportTimespanSelector;
class ExportChannelSelector;
class ExportTimespanSelector;
class ExportChannelSelector;
-class ExportDialog : public ArdourDialog
{
-
-
public:
+class ExportDialog : public ArdourDialog
, public PBD::ScopedConnectionList
+{
+public:
- ExportDialog (PublicEditor & editor, std::string title,
std::string xml_node_nam
e);
+ ExportDialog (PublicEditor & editor, std::string title,
ARDOUR::ExportProfileManager::ExportType typ
e);
~ExportDialog ();
void set_session (ARDOUR::Session* s);
~ExportDialog ();
void set_session (ARDOUR::Session* s);
@@
-60,12
+65,16
@@
class ExportDialog : public ArdourDialog {
RESPONSE_CANCEL
};
RESPONSE_CANCEL
};
- protected:
+protected:
+
+ void on_response (int response_id) {
+ Gtk::Dialog::on_response (response_id);
+ }
typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
-
std::string xml_node_nam
e;
+
ARDOUR::ExportProfileManager::ExportType typ
e;
HandlerPtr handler;
ManagerPtr profile_manager;
HandlerPtr handler;
ManagerPtr profile_manager;
@@
-80,25
+89,29
@@
class ExportDialog : public ArdourDialog {
boost::scoped_ptr<ExportChannelSelector> channel_selector;
boost::scoped_ptr<ExportFileNotebook> file_notebook;
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::VBox warning_widget;
Gtk::VBox progress_widget;
- Gtk::Label * timespan_label;
- Gtk::
Label * channels_label
;
+ /*** GUI components ***/
+ Gtk::
Notebook export_notebook
;
-
private:
+private:
void init ();
void init ();
- void notify_errors ();
+ void notify_errors (
bool force = false
);
void close_dialog ();
void sync_with_manager ();
void close_dialog ();
void sync_with_manager ();
- void update_warnings ();
+ void update_warnings
_and_example_filename
();
void show_conflicting_files ();
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 ();
void show_progress ();
gint progress_timeout ();
@@
-107,35
+120,36
@@
class ExportDialog : public ArdourDialog {
PublicEditor & editor;
StatusPtr status;
PublicEditor & editor;
StatusPtr status;
- PBD::ScopedConnection abort_connection;
- /*** GUI components ***/
+
/* Warning area */
Gtk::HBox warn_hbox;
Gtk::Label warn_label;
/* Warning area */
Gtk::HBox warn_hbox;
Gtk::Label warn_label;
- std::string warn_string;
+ std::string
warn_string;
Gtk::HBox list_files_hbox;
Gtk::Label list_files_label;
Gtk::Button list_files_button;
Gtk::HBox list_files_hbox;
Gtk::Label list_files_label;
Gtk::Button list_files_button;
- std::string list_files_string;
+ std::string
list_files_string;
void add_error (std::string const & text);
void add_warning (std::string const & text);
/* Progress bar */
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;
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;
/* Buttons */
Gtk::Button * cancel_button;
- Gtk::Button * rt_export_button;
- Gtk::Button * fast_export_button;
+ Gtk::Button * export_button;
};
};
@@
-147,7
+161,7
@@
class ExportRangeDialog : public ExportDialog
private:
void init_components ();
private:
void init_components ();
-
std::string range_id;
+ std::string range_id;
};
class ExportSelectionDialog : public ExportDialog
};
class ExportSelectionDialog : public ExportDialog