mackie: if device type is unknown, make -D mackie show that

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

diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index 0e925834b80e482df0f2582bd6e2b43aadae5a02..9cce3d2b9215dc0232e2c1667a0f7447727e6b15 100644 (file)
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -70,14 +70,14 @@ 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 ();
@@ -92,6 +92,11 @@ public:
        void block_vpot_mode_display_for (uint32_t msecs);
 
 private:
+       enum VPotDisplayMode {
+               Name,
+               Value
+       };
+
        Button*  _solo;
        Button*  _recenable;
        Button*  _mute;
@@ -106,8 +111,10 @@ 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;
+       uint64_t return_to_vpot_mode_display_at;
        boost::shared_ptr<ARDOUR::Route> _route;
        PBD::ScopedConnectionList route_connections;
        PBD::ScopedConnectionList subview_connections;
@@ -115,14 +122,11 @@ private:
        int       eq_band;
 
        ARDOUR::AutomationType  _pan_mode;
-       ARDOUR::AutomationType  _trim_mode;
-       ARDOUR::AutomationType  vpot_parameter;
 
        float _last_gain_position_written;
        float _last_pan_azi_position_written;
        float _last_pan_width_position_written;
        float _last_trim_position_written;
-       uint32_t _current_send;
 
        void notify_solo_changed ();
        void notify_mute_changed ();
@@ -133,8 +137,6 @@ private:
        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_processor_changed (bool force_update = true);
        void update_automation ();
        void update_meter ();
@@ -143,24 +145,15 @@ private:
        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<ARDOUR::AutomationType> possible_pot_parameters;
        std::vector<ARDOUR::AutomationType> possible_trim_parameters;
-       void next_pot_mode ();
        void set_vpot_parameter (ARDOUR::AutomationType);
        void show_route_name ();
 
@@ -168,12 +161,17 @@ private:
 
        bool is_midi_track () const;
 
-       typedef std::map<ARDOUR::AutomationType,Control*> ControlParameterMap;
-       ControlParameterMap control_by_parameter;
-
-       void hookup_eq (ARDOUR::AutomationType, uint32_t);
        void notify_eq_change (ARDOUR::AutomationType, uint32_t band, bool force);
-       void setup_eq_vpots (boost::shared_ptr<ARDOUR::Route>);
+       void setup_eq_vpot (boost::shared_ptr<ARDOUR::Route>);
+
+       void notify_dyn_change (ARDOUR::AutomationType, bool force, bool propagate_mode_change);
+       void setup_dyn_vpot (boost::shared_ptr<ARDOUR::Route>);
+
+       void notify_send_level_change (ARDOUR::AutomationType, uint32_t band, bool force);
+       void setup_sends_vpot (boost::shared_ptr<ARDOUR::Route>);
+
+       void notify_trackview_change (ARDOUR::AutomationType, uint32_t band, bool force);
+       void setup_trackview_vpot (boost::shared_ptr<ARDOUR::Route>);
 };
 
 }