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 315780750e6c9813c066502dcdcd5f68465d2b2d..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"
@@
-34,8
+40,6
@@
#include "ardour_dialog.h"
#include "soundcloud_export_selector.h"
#include "ardour_dialog.h"
#include "soundcloud_export_selector.h"
-#include <gtkmm.h>
-
namespace ARDOUR {
class ExportStatus;
class ExportHandler;
namespace ARDOUR {
class ExportStatus;
class ExportHandler;
@@
-44,10
+48,9
@@
namespace ARDOUR {
class ExportTimespanSelector;
class ExportChannelSelector;
class ExportTimespanSelector;
class ExportChannelSelector;
-class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
+class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
{
{
-
- public:
+public:
ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
~ExportDialog ();
ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
~ExportDialog ();
@@
-62,7
+65,11
@@
class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
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;
@@
-81,7
+88,8
@@
class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
boost::scoped_ptr<ExportChannelSelector> channel_selector;
boost::scoped_ptr<ExportFileNotebook> file_notebook;
boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
boost::scoped_ptr<ExportChannelSelector> channel_selector;
boost::scoped_ptr<ExportFileNotebook> file_notebook;
- boost::scoped_ptr<SoundcloudExportSelector> soundcloud_selector;
+
+ boost::shared_ptr<SoundcloudExportSelector> soundcloud_selector;
Gtk::VBox warning_widget;
Gtk::VBox progress_widget;
Gtk::VBox warning_widget;
Gtk::VBox progress_widget;
@@
-89,7
+97,7
@@
class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
/*** GUI components ***/
Gtk::Notebook export_notebook;
/*** GUI components ***/
Gtk::Notebook export_notebook;
-
private:
+private:
void init ();
void init ();
@@
-102,6
+110,9
@@
class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
void do_export ();
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 ();
@@
-116,12
+127,12
@@
class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
Gtk::HBox warn_hbox;
Gtk::Label warn_label;
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);
void add_error (std::string const & text);
void add_warning (std::string const & text);