Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstre...

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index e96178160af9298fe26e8d20cdaacb5c12026068..935e85559e7d2240320295a969ac09ba6847881a 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -33,8 +33,10 @@
 #include <gtkmm/treeview.h>
 
 #include "pbd/stateful.h"
+#include "pbd/signals.h"
 
 #include "ardour/ardour.h"
+#include "ardour/session_handle.h"
 
 #include "route_processor_selection.h"
 #include "enums.h"
@@ -42,23 +44,22 @@
 namespace ARDOUR {
        class Route;
        class RouteGroup;
-       class Session;
-       class AudioDiskstream;
 };
 
 class MixerStrip;
 class PluginSelector;
 class MixerGroupTabs;
+class MonitorSection;
 
-class Mixer_UI : public Gtk::Window
+class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
        Mixer_UI ();
        ~Mixer_UI();
 
-       void connect_to_session (ARDOUR::Session *);
+       void set_session (ARDOUR::Session *);
 
-       PluginSelector& plugin_selector();
+       PluginSelector* plugin_selector();
 
        void  set_strip_width (Width);
        Width get_strip_width () const { return _strip_width; }
@@ -79,10 +80,9 @@ class Mixer_UI : public Gtk::Window
        void set_auto_rebinding(bool);
 
        RouteRedirectSelection& selection() { return _selection; }
+        MonitorSection* monitor_section() const { return _monitor_section; }
 
   private:
-       ARDOUR::Session         *session;
-
        bool                                    _visible;
 
        Gtk::HBox                               global_hpacker;
@@ -114,12 +114,15 @@ class Mixer_UI : public Gtk::Window
 
        bool on_key_press_event (GdkEventKey*);
        bool on_key_release_event (GdkEventKey*);
+       bool on_scroll_event (GdkEventScroll*);
 
        void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
 
        std::list<MixerStrip *> strips;
 
        bool strip_scroller_button_release (GdkEventButton*);
+       void scroll_left ();
+       void scroll_right ();
 
        void add_strip (ARDOUR::RouteList&);
        void remove_strip (MixerStrip *);
@@ -143,7 +146,7 @@ class Mixer_UI : public Gtk::Window
        gint start_updating ();
        gint stop_updating ();
 
-       void disconnect_from_session ();
+       void session_going_away ();
 
        sigc::connection fast_screen_update_connection;
        void fast_update_strips ();
@@ -192,11 +195,11 @@ class Mixer_UI : public Gtk::Window
        void track_column_click (gint);
        void build_track_menu ();
 
+        MonitorSection* _monitor_section;
        PluginSelector    *_plugin_selector;
 
-       void strip_name_changed (MixerStrip *);
-
-       void group_flags_changed (void *src, ARDOUR::RouteGroup *);
+       void strip_property_changed (const PBD::PropertyChange&, MixerStrip *);
+       void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &);
 
        /* various treeviews */