Don't report an error when the user cancels a time stretch operation.

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 85662047557154630df1c04dacd755c9a29968c2..8867c2dfb358a73d978d5f4e18b1d34332b69ad9 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -44,9 +44,6 @@ class ArdourStartup : public Gtk::Assistant {
        bool create_master_bus() const;
        int master_channel_count() const;
 
-       bool create_control_bus() const;
-       int control_channel_count() const;
-
        bool connect_inputs() const;
        bool limit_inputs_used_for_connection() const;
        int input_limit_count() const;
@@ -58,19 +55,19 @@ class ArdourStartup : public Gtk::Assistant {
        bool connect_outs_to_master() const;
        bool connect_outs_to_physical() const;
 
-       bool applying () const {
-               return _applying;
+       gint response () const { 
+               return  _response;
        }
 
   private:
-       bool _applying;
+       gint _response;
        bool config_modified;
        bool new_user;
        bool new_only;
 
        void on_apply ();
        void on_cancel ();
-       void on_close ();
+       bool on_delete_event (GdkEventAny*);
        void on_prepare (Gtk::Widget*);
 
        static ArdourStartup *the_startup;
@@ -83,6 +80,7 @@ class ArdourStartup : public Gtk::Assistant {
        bool splash_expose (GdkEventExpose* ev);
 
        void setup_first_time_config_page ();
+        void config_changed ();
 
        /* first page */
        Gtk::FileChooserButton* default_dir_chooser;
@@ -95,7 +93,8 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::VBox ic_vbox;
        Gtk::RadioButton ic_new_session_button;
        Gtk::RadioButton ic_existing_session_button;
-       bool initial_choice_activated(GdkEventButton *);
+       bool initial_button_press(GdkEventButton *);
+       void initial_button_activated();
 
        /* monitoring choices */
 
@@ -105,6 +104,14 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::RadioButton monitor_via_ardour_button;
        void setup_monitoring_choice_page ();
 
+       /* monitor section choices */
+
+       Gtk::VBox mon_sec_vbox;
+       Gtk::Label monitor_section_label;
+       Gtk::RadioButton use_monitor_section_button;
+       Gtk::RadioButton no_monitor_section_button;
+       void setup_monitor_section_choice_page ();
+
        /* session page (could be new or existing) */
 
        void setup_session_page ();
@@ -134,7 +141,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::TreeView                recent_session_display;
        Glib::RefPtr<Gtk::TreeStore> recent_session_model;
        Gtk::ScrolledWindow          recent_scroller;
-       void redisplay_recent_sessions ();
+       int redisplay_recent_sessions ();
        void recent_session_row_selected ();
        void recent_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col);
 
@@ -149,6 +156,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::Entry new_name_entry;
        Gtk::FileChooserButton new_folder_chooser;
        Gtk::FileChooserButton session_template_chooser;
+        void new_name_mapped ();
 
        struct SessionTemplateColumns : public Gtk::TreeModel::ColumnRecord {
                SessionTemplateColumns () {
@@ -179,7 +187,6 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::VBox more_options_vbox;
 
        Gtk::Label chan_count_label_1;
-       Gtk::Label chan_count_label_2;
        Gtk::Label chan_count_label_3;
        Gtk::Label chan_count_label_4;
        Gtk::Table advanced_table;
@@ -209,9 +216,6 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::CheckButton _create_master_bus;
        Gtk::SpinButton _master_bus_channel_count;
 
-       Gtk::CheckButton _create_control_bus;
-       Gtk::SpinButton _control_bus_channel_count;
-
        Gtk::CheckButton _connect_inputs;
        Gtk::CheckButton _limit_input_ports;
        Gtk::SpinButton _input_limit_count;
@@ -226,7 +230,6 @@ class ArdourStartup : public Gtk::Assistant {
 
        Gtk::Adjustment _output_limit_count_adj;
        Gtk::Adjustment _input_limit_count_adj;
-       Gtk::Adjustment _control_bus_channel_count_adj;
        Gtk::Adjustment _master_bus_channel_count_adj;
 
        void connect_inputs_clicked ();
@@ -234,7 +237,6 @@ class ArdourStartup : public Gtk::Assistant {
        void limit_inputs_clicked ();
        void limit_outputs_clicked ();
        void master_bus_button_clicked ();
-       void monitor_bus_button_clicked ();
        void setup_more_options_page ();
 
        /* final page */
@@ -252,6 +254,7 @@ class ArdourStartup : public Gtk::Assistant {
        gint new_user_page_index;
        gint default_folder_page_index;
        gint monitoring_page_index;
+       gint monitor_section_page_index;
        gint session_page_index;
        gint initial_choice_index;
        gint final_page_index;