Remove Cruft

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index a85006af5a74f2591887c8aa539f806267b8f700..79e428ce65bc56b9df118698c9ff81cd90a686fc 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -47,6 +47,7 @@
 #include "gtkmm2ext/tabbable.h"
 #include "gtkmm2ext/treeutils.h"
 
+#include "axis_provider.h"
 #include "enums.h"
 #include "route_processor_selection.h"
 
@@ -76,7 +77,7 @@ protected:
        virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const;
 };
 
-class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider
 {
   public:
        static Mixer_UI* instance();
@@ -86,7 +87,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void show_window ();
 
        void set_session (ARDOUR::Session *);
-       void track_editor_selection ();
 
        PluginSelector* plugin_selector();
 
@@ -105,23 +105,23 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void maximise_mixer_space();
        void restore_mixer_space();
 
-        MonitorSection* monitor_section() const { return _monitor_section; }
+       MonitorSection* monitor_section() const { return _monitor_section; }
 
        void deselect_all_strip_processors();
        void delete_processors();
-       void select_strip (MixerStrip&, bool add=false);
        void select_none ();
 
-       bool window_not_visible () const;
-
        void do_vca_assign (boost::shared_ptr<ARDOUR::VCA>);
        void do_vca_unassign (boost::shared_ptr<ARDOUR::VCA>);
-       void show_vca_slaves (boost::shared_ptr<ARDOUR::VCA>);
-       bool showing_vca_slaves_for (boost::shared_ptr<ARDOUR::VCA>) const;
+       void show_spill (boost::shared_ptr<ARDOUR::Stripable>);
+       bool showing_spill_for (boost::shared_ptr<ARDOUR::Stripable>) const;
 
-       sigc::signal1<void,boost::shared_ptr<ARDOUR::VCA> > show_vca_change;
+       sigc::signal1<void,boost::shared_ptr<ARDOUR::Stripable> > show_spill_change;
 
        RouteProcessorSelection& selection() { return _selection; }
+
+       void show_editor_window () const;
+
        void register_actions ();
 
         void load_bindings ();
@@ -174,7 +174,9 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        bool masters_scroller_button_release (GdkEventButton*);
        void scroll_left ();
        void scroll_right ();
-        void toggle_midi_input_active (bool flip_others);
+       void toggle_midi_input_active (bool flip_others);
+
+       void move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable>);
 
        void add_stripables (ARDOUR::StripableList&);
 
@@ -185,18 +187,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void remove_master (VCAMasterStrip*);
 
        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();
-       void select_all_strips ();
-       void unselect_all_audiotrack_strips ();
-       void select_all_audiotrack_strips ();
-       void unselect_all_audiobus_strips ();
-       void select_all_audiobus_strips ();
+       MixerStrip* strip_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
 
-       void strip_select_op (bool audiotrack, bool select);
-       void select_strip_op (MixerStrip*, bool select);
+       AxisView* axis_view_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
+       AxisView* axis_view_by_control (boost::shared_ptr<ARDOUR::AutomationControl>) const;
 
        gint start_updating ();
        gint stop_updating ();
@@ -236,12 +230,11 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        ARDOUR::PluginPresetPtr selected_plugin ();
 
        void initial_track_display ();
-       void show_track_list_menu ();
 
        void set_all_strips_visibility (bool yn);
        void set_all_audio_midi_visibility (int, bool);
-        void track_visibility_changed (std::string const & path);
-        void update_track_visibility ();
+       void track_visibility_changed (std::string const & path);
+       void update_track_visibility ();
 
        void hide_all_routes ();
        void show_all_routes ();
@@ -271,7 +264,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void track_column_click (gint);
        void build_track_menu ();
 
-        MonitorSection* _monitor_section;
+       MonitorSection* _monitor_section;
        PluginSelector    *_plugin_selector;
 
        void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr<ARDOUR::Stripable> ws);
@@ -334,10 +327,11 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
        Width _strip_width;
 
-        void sync_presentation_info_from_treeview ();
-        void sync_treeview_from_presentation_info ();
+       void presentation_info_changed (PBD::PropertyChange const &);
+       void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
+       void sync_presentation_info_from_treeview ();
 
-        bool ignore_reorder;
+       bool ignore_reorder;
 
        void parameter_changed (std::string const &);
        void set_route_group_activation (ARDOUR::RouteGroup *, bool);
@@ -352,16 +346,13 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
            it during a session teardown.
        */
        bool _in_group_rebuild_or_clear;
-        bool _route_deletion_in_progress;
+       bool _route_deletion_in_progress;
 
        void update_title ();
        MixerStrip* strip_by_x (int x);
 
        friend class MixerGroupTabs;
 
-       void follow_editor_selection ();
-       bool _following_editor_selection;
-
        void monitor_section_going_away ();
 
        void monitor_section_attached ();
@@ -380,7 +371,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        // true if mixer list is visible
        bool _show_mixer_list;
 
-       mutable boost::weak_ptr<ARDOUR::VCA> spilled_vca;
+       mutable boost::weak_ptr<ARDOUR::Stripable> spilled_strip;
 
        void escape ();