Merged with trunk R874.

[ardour.git] / gtk2_ardour / new_session_dialog.h

diff --git a/gtk2_ardour/new_session_dialog.h b/gtk2_ardour/new_session_dialog.h
index 6a7cac82c47ad11ee297fbbe8fccb24c5c3d1edf..b175c1b79d151c1a74cfca50e6cb53af1e9d67a2 100644 (file)
--- a/gtk2_ardour/new_session_dialog.h
+++ b/gtk2_ardour/new_session_dialog.h
@@ -98,18 +98,17 @@ protected:
        Gtk::Label * session_template_label;
        Gtk::Label * chan_count_label;
        Gtk::Table * advanced_table;
-       Gtk::Label * options_label;
        Gtk::HBox * input_port_limit_hbox;
-       Gtk::HBox * input_port_hbox;
+       Gtk::VBox * input_port_vbox;
        Gtk::Table * input_table;
-       Gtk::Alignment * input_port_alignment;
+
        Gtk::Label * input_label;
        Gtk::Frame * input_frame;
        Gtk::HBox * output_port_limit_hbox;
-       Gtk::HBox * output_port_hbox;
+       Gtk::VBox * output_port_vbox;
        Gtk::VBox * output_conn_vbox;
        Gtk::VBox * output_vbox;
-       Gtk::Alignment * output_port_alignment;
+
        Gtk::Label * output_label;
        Gtk::Frame * output_frame;
        Gtk::VBox * advanced_vbox;
@@ -117,18 +116,16 @@ protected:
        Gtk::Expander * advanced_expander;
        Gtk::Table * new_session_table;
        Gtk::HBox * open_session_hbox;
-       Gtk::Alignment * open_session_alignment;
-       Gtk::Label * open_sesion_label;
-       Gtk::Frame * open_session_frame;
        Gtk::ScrolledWindow * recent_scrolledwindow;
-       Gtk::Alignment * recent_alignment;
+
        Gtk::Label * recent_sesion_label;
        Gtk::Frame * recent_frame;
        Gtk::VBox * open_session_vbox;
        Gtk::Entry*  m_name;
        Gtk::FileChooserButton* m_folder;
        Gtk::FileChooserButton* m_template;
-       
+       Gtk::Label * open_session_file_label;
+
        Gtk::CheckButton* m_create_master_bus;
        Gtk::SpinButton* m_master_bus_channel_count;
                
@@ -178,6 +175,14 @@ protected:
        void file_chosen ();
        void template_chosen ();
        void recent_row_activated (const Gtk::TreePath&, Gtk::TreeViewColumn*);
+       void connect_inputs_clicked ();
+       void connect_outputs_clicked ();
+       void limit_inputs_clicked ();
+       void limit_outputs_clicked ();
+       void master_bus_button_clicked ();
+       void monitor_bus_button_clicked ();
+
+       bool on_new_session_page;
 
        
 };