Clear out any command line session name on closing a session so that the same session...

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 932f828404c9842e9f694804aace1ad128a33371..41609e8de218c7bab84905d3ae203fa0b885cc8c 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -48,6 +48,7 @@ namespace ARDOUR {
 
 class MixerStrip;
 class PluginSelector;
+class MixerGroupTabs;
 
 class Mixer_UI : public Gtk::Window
 {
@@ -79,8 +80,6 @@ class Mixer_UI : public Gtk::Window
 
        RouteRedirectSelection& selection() { return _selection; }
 
-       static const char* get_order_key();
-       
   private:
        ARDOUR::Session         *session;
 
@@ -105,6 +104,8 @@ class Mixer_UI : public Gtk::Window
        Gtk::HBox                               out_packer;
        Gtk::HPaned                             list_hpane;
 
+       MixerGroupTabs* _group_tabs;
+
        // for restoring window geometry.
        int m_root_x, m_root_y, m_width, m_height;
        
@@ -112,6 +113,7 @@ class Mixer_UI : public Gtk::Window
        void get_window_pos_and_size ();
 
        bool on_key_press_event (GdkEventKey*);
+       bool on_key_release_event (GdkEventKey*);
 
        void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
        
@@ -151,9 +153,7 @@ class Mixer_UI : public Gtk::Window
        void redisplay_track_list ();
        bool no_track_list_redisplay;
        bool track_display_button_press (GdkEventButton*);
-#ifdef GTKOSX
-       void queue_draw_all_strips ();
-#endif
+       void strip_width_changed ();
        
        void track_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
        void track_list_delete (const Gtk::TreeModel::Path&);
@@ -172,21 +172,21 @@ class Mixer_UI : public Gtk::Window
        void show_all_audiotracks();
        void hide_all_audiotracks ();
 
-       Gtk::Menu* mix_group_context_menu;
+       Gtk::Menu* route_group_context_menu;
        bool in_group_row_change;
 
        void group_selected (gint row, gint col, GdkEvent *ev);
        void group_unselected (gint row, gint col, GdkEvent *ev);
        void group_display_active_clicked();
-       void new_mix_group ();
-       void remove_selected_mix_group ();
-       void build_mix_group_context_menu ();
-       void activate_all_mix_groups ();
-       void disable_all_mix_groups ();
-       void add_mix_group (ARDOUR::RouteGroup *);
-       void mix_groups_changed ();
-       void mix_group_name_edit (const Glib::ustring&, const Glib::ustring&);
-       void mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
+       void new_route_group ();
+       void remove_selected_route_group ();
+       void build_route_group_context_menu ();
+       void activate_all_route_groups ();
+       void disable_all_route_groups ();
+       void add_route_group (ARDOUR::RouteGroup *);
+       void route_groups_changed ();
+       void route_group_name_edit (const Glib::ustring&, const Glib::ustring&);
+       void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
 
        Gtk::Menu *track_menu;
        void track_column_click (gint);
@@ -215,12 +215,10 @@ class Mixer_UI : public Gtk::Window
 
        struct GroupDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
            GroupDisplayModelColumns() { 
-                   add (active);
                    add (visible);
                    add (text);
                    add (group);
            }
-           Gtk::TreeModelColumn<bool>                                  active;
            Gtk::TreeModelColumn<bool>                                  visible;
            Gtk::TreeModelColumn<Glib::ustring>                 text;
            Gtk::TreeModelColumn<ARDOUR::RouteGroup*>   group;
@@ -244,13 +242,18 @@ class Mixer_UI : public Gtk::Window
 
        Width _strip_width;
 
-       void sync_order_keys (const char *src);
+       void sync_order_keys (std::string const &);
        bool strip_redisplay_does_not_reset_order_keys;
        bool strip_redisplay_does_not_sync_order_keys;
        bool ignore_sync;
 
+       void parameter_changed (std::string const &);
+       void set_route_group_activation (ARDOUR::RouteGroup *, bool);
+
        static const int32_t default_width = 478;
        static const int32_t default_height = 765;
+
+       friend class MixerGroupTabs;
 };
 
 #endif /* __ardour_mixer_ui_h__ */