missing initialization

[ardour.git] / libs / surfaces / mackie / strip.h

diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index 2fd33f323aa3342fca9ed60c9d823c18b8a25d52..e19bfad386cfc4816701c93e865fb5fdb45350b1 100644 (file)
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -15,11 +15,12 @@
 
 #include "control_group.h"
 #include "types.h"
+#include "mackie_control_protocol.h"
 #include "midi_byte_array.h"
 #include "device_info.h"
 
 namespace ARDOUR {
-       class Route;
+       class Stripable;
        class Bundle;
        class ChannelCount;
 }
@@ -52,12 +53,13 @@ public:
        Strip (Surface&, const std::string & name, int index, const std::map<Button::ID,StripButtonInfo>&);
        ~Strip();
 
-       boost::shared_ptr<ARDOUR::Route> route() const { return _route; }
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const { return _stripable; }
 
        void add (Control & control);
        int index() const { return _index; } // zero based
+       Surface* surface() const { return _surface; }
 
-       void set_route (boost::shared_ptr<ARDOUR::Route>, bool with_messages = true);
+       void set_stripable (boost::shared_ptr<ARDOUR::Stripable>, bool with_messages = true);
 
        // call all signal handlers manually
        void notify_all ();
@@ -68,20 +70,21 @@ public:
        void handle_pot (Pot&, float delta);
 
        void periodic (ARDOUR::microseconds_t now_usecs);
-       void redisplay (ARDOUR::microseconds_t now_usecs);
+       void redisplay (ARDOUR::microseconds_t now_usecs, bool force = true);
 
        MidiByteArray display (uint32_t line_number, const std::string&);
        MidiByteArray blank_display (uint32_t line_number);
 
        void zero ();
 
-       void potmode_changed (bool notify=false);
+       void flip_mode_changed ();
+       void subview_mode_changed ();
 
        void lock_controls ();
        void unlock_controls ();
        bool locked() const { return _controls_locked; }
 
-       void gui_selection_changed (const ARDOUR::StrongRouteNotificationList&);
+       void gui_selection_changed (const ARDOUR::StrongStripableNotificationList&);
 
        void notify_metering_state_changed();
 
@@ -89,6 +92,11 @@ public:
        void block_vpot_mode_display_for (uint32_t msecs);
 
 private:
+       enum VPotDisplayMode {
+               Name,
+               Value
+       };
+
        Button*  _solo;
        Button*  _recenable;
        Button*  _mute;
@@ -103,13 +111,17 @@ private:
        bool     _controls_locked;
        bool     _transport_is_rolling;
        bool     _metering_active;
-       uint64_t _block_vpot_mode_redisplay_until;
+       std::string pending_display[2];
+       std::string current_display[2];
        uint64_t _block_screen_redisplay_until;
-       boost::shared_ptr<ARDOUR::Route> _route;
-       PBD::ScopedConnectionList route_connections;
+       uint64_t return_to_vpot_mode_display_at;
+       boost::shared_ptr<ARDOUR::Stripable> _stripable;
+       PBD::ScopedConnectionList stripable_connections;
+       PBD::ScopedConnectionList subview_connections;
+       PBD::ScopedConnectionList send_connections;
+       int       eq_band;
 
        ARDOUR::AutomationType  _pan_mode;
-       ARDOUR::AutomationType  _trim_mode;
 
        float _last_gain_position_written;
        float _last_pan_azi_position_written;
@@ -124,43 +136,42 @@ private:
        void notify_panner_azi_changed (bool force_update = true);
        void notify_panner_width_changed (bool force_update = true);
        void notify_active_changed ();
-       void notify_route_deleted ();
-       void notify_trim_changed (bool force_update = true);
-       void notify_phase_changed (bool force_update = true);
-
+       void notify_stripable_deleted ();
+       void notify_processor_changed (bool force_update = true);
        void update_automation ();
        void update_meter ();
+       std::string vpot_mode_string ();
 
-       std::string vpot_mode_string () const;
+       boost::shared_ptr<ARDOUR::AutomationControl> mb_pan_controllable;
 
        void return_to_vpot_mode_display ();
-
-       struct RedisplayRequest {
-               ARDOUR::AutomationType type;
-               float val;
-       };
-
-       RingBuffer<RedisplayRequest> redisplay_requests;
+       void next_pot_mode ();
 
        void do_parameter_display (ARDOUR::AutomationType, float val);
-       void queue_parameter_display (ARDOUR::AutomationType, float val);
-
        void select_event (Button&, ButtonState);
        void vselect_event (Button&, ButtonState);
        void fader_touch_event (Button&, ButtonState);
 
-       std::vector<Evoral::Parameter> possible_pot_parameters;
-       std::vector<Evoral::Parameter> possible_trim_parameters;
-       void next_pot_mode ();
-       void set_vpot_parameter (Evoral::Parameter);
-       void show_route_name ();
+       std::vector<ARDOUR::AutomationType> possible_pot_parameters;
+       std::vector<ARDOUR::AutomationType> possible_trim_parameters;
+       void set_vpot_parameter (ARDOUR::AutomationType);
+       void show_stripable_name ();
 
        void reset_saved_values ();
 
        bool is_midi_track () const;
 
-       typedef std::map<Evoral::Parameter,Control*> ControlParameterMap;
-       ControlParameterMap control_by_parameter;
+       void notify_eq_change (ARDOUR::AutomationType, uint32_t band, bool force);
+       void setup_eq_vpot (boost::shared_ptr<ARDOUR::Stripable>);
+
+       void notify_dyn_change (ARDOUR::AutomationType, bool force, bool propagate_mode_change);
+       void setup_dyn_vpot (boost::shared_ptr<ARDOUR::Stripable>);
+
+       void notify_send_level_change (ARDOUR::AutomationType, uint32_t band, bool force);
+       void setup_sends_vpot (boost::shared_ptr<ARDOUR::Stripable>);
+
+       void notify_trackview_change (ARDOUR::AutomationType, uint32_t band, bool force);
+       void setup_trackview_vpot (boost::shared_ptr<ARDOUR::Stripable>);
 };
 
 }