many changes associated with rationalizing selection flow

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 544578c091bde9bf454a2c1f19e8ee625259faaa..70a0e630b73d9ac53fbc7fe11314837af1120e38 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -28,7 +28,6 @@
 #include <gtkmm/label.h>
 #include <gtkmm/button.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/paned.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
@@ -42,8 +41,8 @@
 #include "ardour/plugin.h"
 #include "ardour/plugin_manager.h"
 
-
 #include "gtkmm2ext/dndtreeview.h"
+#include <gtkmm2ext/pane.h>
 #include "gtkmm2ext/treeutils.h"
 
 #include "gtkmm2ext/tabbable.h"
@@ -56,6 +55,7 @@ namespace ARDOUR {
        class RouteGroup;
 };
 
+class AxisView;
 class MixerStrip;
 class PluginSelector;
 class MixerGroupTabs;
@@ -121,7 +121,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        sigc::signal1<void,boost::shared_ptr<ARDOUR::VCA> > show_vca_change;
 
   protected:
-       void set_route_targets_for_operation ();
+       void set_axis_targets_for_operation ();
 
   private:
        Mixer_UI ();
@@ -143,22 +143,23 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        Gtk::Frame            track_display_frame;
        Gtk::Frame            group_display_frame;
        Gtk::Frame            favorite_plugins_frame;
-       Gtk::VPaned           rhs_pane1;
-       Gtk::VPaned           rhs_pane2;
-       Gtk::HPaned           inner_pane;
+       Gtkmm2ext::VPane      rhs_pane1;
+       Gtkmm2ext::VPane      rhs_pane2;
+       Gtkmm2ext::HPane      inner_pane;
        Gtk::HBox             strip_packer;
        Gtk::ScrolledWindow   vca_scroller;
-       Gtk::HBox             vca_packer;
+       Gtk::HBox             vca_hpacker;
+       Gtk::VBox             vca_vpacker;
+       Gtk::EventBox         vca_label_bar;
+       Gtk::Label            vca_label;
        Gtk::EventBox         vca_scroller_base;
        Gtk::HBox             out_packer;
-       Gtk::HPaned           list_hpane;
+       Gtkmm2ext::HPane      list_hpane;
 
        MixerGroupTabs* _group_tabs;
 
        bool on_scroll_event (GdkEventScroll*);
 
-       void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
-
        std::list<MixerStrip *> strips;
 
        void scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>&, int, int, const Gtk::SelectionData&, guint, guint);
@@ -168,13 +169,16 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void scroll_right ();
         void toggle_midi_input_active (bool flip_others);
 
-       void add_strips (ARDOUR::RouteList&);
+       void add_stripables (ARDOUR::StripableList&);
+
+       void add_routes (ARDOUR::RouteList&);
        void remove_strip (MixerStrip *);
 
        void add_masters (ARDOUR::VCAList&);
        void remove_master (VCAMasterStrip*);
 
-       MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>);
+       MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>) const;
+       AxisView* axis_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
 
        void hide_all_strips (bool with_select);
        void unselect_all_strips();
@@ -263,54 +267,50 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
         MonitorSection* _monitor_section;
        PluginSelector    *_plugin_selector;
 
-       void strip_property_changed (const PBD::PropertyChange&, MixerStrip *);
+       void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr<ARDOUR::Stripable> ws);
        void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &);
 
        /* various treeviews */
 
-       struct TrackDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-               TrackDisplayModelColumns () {
+       struct StripableDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
+               StripableDisplayModelColumns () {
                        add (text);
                        add (visible);
-                       add (route);
+                       add (stripable);
                        add (strip);
-                       add (vca);
                }
                Gtk::TreeModelColumn<bool>         visible;
                Gtk::TreeModelColumn<std::string>  text;
-               Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
-               /* if route is non-null, this must be non-null */
-               Gtk::TreeModelColumn<MixerStrip*>  strip;
-               /* if route is null, this may be non-null */
-               Gtk::TreeModelColumn<VCAMasterStrip*>  vca;
+               Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Stripable> > stripable;
+               Gtk::TreeModelColumn<AxisView*>    strip;
        };
 
        struct GroupDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           GroupDisplayModelColumns() {
-                   add (visible);
-                   add (text);
-                   add (group);
-           }
-           Gtk::TreeModelColumn<bool>                                  visible;
-           Gtk::TreeModelColumn<std::string>                   text;
-           Gtk::TreeModelColumn<ARDOUR::RouteGroup*>   group;
+               GroupDisplayModelColumns() {
+                       add (visible);
+                       add (text);
+                       add (group);
+               }
+               Gtk::TreeModelColumn<bool>            visible;
+               Gtk::TreeModelColumn<std::string>         text;
+               Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
        };
 
        struct PluginsDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           PluginsDisplayModelColumns() {
-                   add (name);
-                   add (plugin);
-           }
-           Gtk::TreeModelColumn<std::string> name;
-                       Gtk::TreeModelColumn<ARDOUR::PluginPresetPtr> plugin;
+               PluginsDisplayModelColumns() {
+                       add (name);
+                       add (plugin);
+               }
+               Gtk::TreeModelColumn<std::string> name;
+               Gtk::TreeModelColumn<ARDOUR::PluginPresetPtr> plugin;
        };
 
        ARDOUR::PluginInfoList favorite_order;
        std::map<std::string, bool> favorite_ui_state;
 
-       TrackDisplayModelColumns    track_columns;
-       GroupDisplayModelColumns    group_columns;
-       PluginsDisplayModelColumns  favorite_plugins_columns;
+       StripableDisplayModelColumns stripable_columns;
+       GroupDisplayModelColumns     group_columns;
+       PluginsDisplayModelColumns   favorite_plugins_columns;
 
        Gtk::TreeView track_display;
        Gtk::TreeView group_display;
@@ -374,6 +374,8 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        bool _show_mixer_list;
 
        mutable boost::weak_ptr<ARDOUR::VCA> spilled_vca;
+
+       void escape ();
 };
 
 #endif /* __ardour_mixer_ui_h__ */