Compact the port matrix slightly, and fix a couple of minor layout bugs.

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index ed8db3fbe88e34a63e8c6fa14dc76e4cc7766709..85662047557154630df1c04dacd755c9a29968c2 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -20,6 +20,8 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/combobox.h>
 
+#include "ardour/utils.h"
+
 class EngineControl;
 
 class ArdourStartup : public Gtk::Assistant {
@@ -54,10 +56,14 @@ class ArdourStartup : public Gtk::Assistant {
        int output_limit_count() const;
 
        bool connect_outs_to_master() const;
-       bool connect_outs_to_physical() const ;
-       
+       bool connect_outs_to_physical() const;
+
+       bool applying () const {
+               return _applying;
+       }
+
   private:
-       bool applying;
+       bool _applying;
        bool config_modified;
        bool new_user;
        bool new_only;
@@ -89,6 +95,7 @@ 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 *);
 
        /* monitoring choices */
 
@@ -103,11 +110,11 @@ class ArdourStartup : public Gtk::Assistant {
        void setup_session_page ();
        Gtk::VBox session_vbox;
        Gtk::HBox session_hbox;
-       
+
        /* recent sessions */
-       
+
        void setup_existing_session_page ();
-       
+
        struct RecentSessionsSorter {
            bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
                    return cmp_nocase(a.first, b.first) == -1;
@@ -132,7 +139,7 @@ class ArdourStartup : public Gtk::Assistant {
        void recent_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col);
 
        /* audio setup page */
-       
+
        void setup_audio_page ();
        EngineControl* engine_dialog;
 
@@ -144,7 +151,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::FileChooserButton session_template_chooser;
 
        struct SessionTemplateColumns : public Gtk::TreeModel::ColumnRecord {
-               SessionTemplateColumns () { 
+               SessionTemplateColumns () {
                        add (name);
                        add (path);
                }
@@ -201,7 +208,7 @@ 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;
 
@@ -209,7 +216,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::CheckButton _limit_input_ports;
        Gtk::SpinButton _input_limit_count;
 
-       Gtk::CheckButton _connect_outputs;      
+       Gtk::CheckButton _connect_outputs;
        Gtk::CheckButton _limit_output_ports;
        Gtk::SpinButton _output_limit_count;
 
@@ -251,7 +258,7 @@ class ArdourStartup : public Gtk::Assistant {
        gint session_options_page_index;
 
        void move_along_now ();
-       
+
 };
 
 #endif /* __gtk2_ardour_startup_h__ */