NO-OP: whitespace

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index f617fdbb6ae49d7e679fefb83846c71b38787df0..1dd4b8de92cdb61954d1ddf84e91723e6da015b3 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -52,6 +52,7 @@
 
 #include "axis_provider.h"
 #include "enums.h"
+#include "monitor_section.h"
 #include "route_processor_selection.h"
 
 namespace ARDOUR {
@@ -101,21 +102,21 @@ public:
 
        void save_plugin_order_file ();
 
-       void show_mixer_list (bool yn);
-       void show_monitor_section (bool);
-
        void show_strip (MixerStrip *);
        void hide_strip (MixerStrip *);
 
        void maximise_mixer_space();
        void restore_mixer_space();
 
-       MonitorSection* monitor_section() const { return _monitor_section; }
+       MonitorSection& monitor_section() { return _monitor_section; }
 
        void deselect_all_strip_processors();
        void delete_processors();
        void select_none ();
 
+       void select_next_strip ();
+       void select_prev_strip ();
+
        void do_vca_assign (boost::shared_ptr<ARDOUR::VCA>);
        void do_vca_unassign (boost::shared_ptr<ARDOUR::VCA>);
        void show_spill (boost::shared_ptr<ARDOUR::Stripable>);
@@ -132,13 +133,18 @@ public:
        void load_bindings ();
        Gtkmm2ext::Bindings*  bindings;
 
-       void showhide_vcas (bool on) {
-               if (on) { vca_vpacker.show(); } else { vca_vpacker.hide(); }
-       }
+       void toggle_mixer_list ();
+       void showhide_mixer_list (bool yn);
+
+       void toggle_monitor_section ();
+       void showhide_monitor_section (bool);
+
+       void toggle_vcas ();
+       void showhide_vcas (bool on);
+       
 #ifdef MIXBUS
-       void showhide_mixbusses (bool on) {
-               if (on) { mb_vpacker.show(); } else { mb_vpacker.hide(); }
-       }
+       void toggle_mixbuses ();
+       void showhide_mixbusses (bool on);
 #endif
 
 protected:
@@ -282,8 +288,8 @@ private:
        void track_column_click (gint);
        void build_track_menu ();
 
-       MonitorSection* _monitor_section;
-       PluginSelector    *_plugin_selector;
+       MonitorSection   _monitor_section;
+       PluginSelector *_plugin_selector;
 
        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 &);
@@ -345,6 +351,7 @@ private:
        bool vca_button_release_event (GdkEventButton*, VCAMasterStrip*);
 
        Width _strip_width;
+       double _spill_scroll_position;
 
        void presentation_info_changed (PBD::PropertyChange const &);
        void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
@@ -373,7 +380,6 @@ private:
        friend class MixerGroupTabs;
 
        void monitor_section_going_away ();
-
        void monitor_section_attached ();
        void monitor_section_detached ();
 
@@ -394,16 +400,12 @@ private:
        /// true if we are in fullscreen mode
        bool _maximised;
 
-       // true if mixer list is visible
-       bool _show_mixer_list;
-
        bool _strip_selection_change_without_scroll;
 
        mutable boost::weak_ptr<ARDOUR::Stripable> spilled_strip;
 
        void escape ();
 
-       Gtkmm2ext::ActionMap myactions;
        RouteProcessorSelection _selection;
        AxisViewSelection _axis_targets;