Merged with trunk revision 600

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index f1f004351ae2435565e4d2abebd087fa839a9f01..5108df60142677a433dbf75fdd17cd9e27244d4e 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -45,7 +45,7 @@ namespace ARDOUR {
        class Route;
        class RouteGroup;
        class Session;
-       class DiskStream;
+       class AudioDiskstream;
        class AudioEngine;
 };
 
@@ -72,6 +72,8 @@ class Mixer_UI : public Gtk::Window
        int set_state (const XMLNode& );
 
        void show_window ();
+       void show_strip (MixerStrip *);
+       void hide_strip (MixerStrip *);
 
        void ensure_float (Gtk::Window&);
 
@@ -92,28 +94,25 @@ class Mixer_UI : public Gtk::Window
        Gtk::Button              group_display_button;
        Gtk::ScrolledWindow      track_display_scroller;
        Gtk::ScrolledWindow      group_display_scroller;
-       Gtk::ScrolledWindow      snapshot_display_scroller;
        Gtk::VBox                group_display_vbox;
        Gtk::Frame               track_display_frame;
        Gtk::Frame               group_display_frame;
        Gtk::VPaned              rhs_pane1;
-       Gtk::VPaned              rhs_pane2;
        Gtk::HBox                strip_packer;
        Gtk::HBox                out_packer;
        Gtk::HPaned              list_hpane;
 
+       bool on_key_press_event (GdkEventKey*);
+
        void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
        
        list<MixerStrip *> strips;
 
-       gint strip_scroller_button_release (GdkEventButton*);
+       bool strip_scroller_button_release (GdkEventButton*);
 
        void add_strip (ARDOUR::Route*);
        void remove_strip (MixerStrip *);
 
-       void show_strip (MixerStrip *);
-       void hide_strip (MixerStrip *);
-
        void hide_all_strips (bool with_select);
        void unselect_all_strips();
        void select_all_strips ();
@@ -132,23 +131,46 @@ class Mixer_UI : public Gtk::Window
 
        void disconnect_from_session ();
        
-       sigc::connection screen_update_connection;
-       void update_strips ();
        sigc::connection fast_screen_update_connection;
        void fast_update_strips ();
 
-       void track_display_selected (gint row, gint col, GdkEvent *ev);
-       void track_display_unselected (gint row, gint col, GdkEvent *ev);
-       void queue_track_display_reordered (gint row, gint col);
-       void track_display_reordered_proxy (const Gtk::TreePath& path, const Gtk::TreeIter& i, int* n);
-       void track_display_reordered ();
        void track_name_changed (MixerStrip *);
 
+       void redisplay_track_list ();
+       bool no_track_list_redisplay;
+       bool track_display_button_press (GdkEventButton*);
+       
+       void track_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
+       void track_list_delete (const Gtk::TreeModel::Path&);
+
+       void initial_track_display ();
+       void show_track_list_menu ();
+
+       void set_all_strips_visibility (bool yn);
+       void set_all_audio_visibility (int tracks, bool yn);
+       
+       void hide_all_routes ();
+       void show_all_routes ();
+       void show_all_audiobus ();
+       void hide_all_audiobus ();
+       void show_all_audiotracks();
+       void hide_all_audiotracks ();
+
+       Gtk::Menu* mix_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);
 
        Gtk::Menu *track_menu;
        void track_column_click (gint);
@@ -158,21 +180,18 @@ class Mixer_UI : public Gtk::Window
 
        void strip_name_changed (void *src, MixerStrip *);
 
-       static GdkPixmap *check_pixmap;
-       static GdkBitmap *check_mask;
-       static GdkPixmap *empty_pixmap;
-       static GdkBitmap *empty_mask;
-
        void group_flags_changed (void *src, ARDOUR::RouteGroup *);
 
        /* various treeviews */
        
        struct TrackDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           TrackDisplayModelColumns() { 
+           TrackDisplayModelColumns () {
                    add (text);
+                   add (visible);
                    add (route);
                    add (strip);
            }
+           Gtk::TreeModelColumn<bool>           visible;
            Gtk::TreeModelColumn<Glib::ustring>  text;
            Gtk::TreeModelColumn<ARDOUR::Route*> route;
            Gtk::TreeModelColumn<MixerStrip*>    strip;
@@ -181,53 +200,35 @@ 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;
        };
 
-       struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           SnapshotDisplayModelColumns() { 
-                   add (visible_name);
-                   add (real_name);
-           }
-           Gtk::TreeModelColumn<Glib::ustring> visible_name;
-           Gtk::TreeModelColumn<Glib::ustring> real_name;
-       };
-
-       TrackDisplayModelColumns    track_display_columns;
-       GroupDisplayModelColumns    group_display_columns;
-       SnapshotDisplayModelColumns snapshot_display_columns;
+       TrackDisplayModelColumns    track_columns;
+       GroupDisplayModelColumns    group_columns;
 
        Gtk::TreeView track_display;
        Gtk::TreeView group_display;
-       Gtk::TreeView snapshot_display;
 
-       Glib::RefPtr<Gtk::ListStore> track_display_model;
-       Glib::RefPtr<Gtk::ListStore> group_display_model;
-       Glib::RefPtr<Gtk::ListStore> snapshot_display_model;
+       Glib::RefPtr<Gtk::ListStore> track_model;
+       Glib::RefPtr<Gtk::ListStore> group_model;
 
-       bool track_display_button_press (GdkEventButton*);
        bool group_display_button_press (GdkEventButton*);
-       bool snapshot_display_button_press (GdkEventButton*);
-
-       void track_display_selection_changed ();
        void group_display_selection_changed ();
-       void snapshot_display_selection_changed ();
-
-       void       redisplay_snapshots();
-       void       session_state_saved (string);
 
-       gint strip_button_release_event (GdkEventButton*, MixerStrip*);
+       bool strip_button_release_event (GdkEventButton*, MixerStrip*);
 
        RouteRedirectSelection _selection;
 
        Width _strip_width;
 
-       static const int32_t default_width = -1;
+       static const int32_t default_width = 478;
        static const int32_t default_height = 765;
 };