Add Trim to Mackie controls.

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

diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index 225783d0fe36b28e6eb7f73f96959116d20adfce..55a6fbef8c97b68d5245c5233a1295438cf8993e 100644 (file)
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -7,6 +7,7 @@
 #include "evoral/Parameter.hpp"
 
 #include "pbd/property_basics.h"
+#include "pbd/ringbuffer.h"
 #include "pbd/signals.h"
 
 #include "ardour/types.h"
@@ -23,6 +24,8 @@ namespace ARDOUR {
        class ChannelCount;
 }
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Control;
@@ -53,7 +56,7 @@ public:
 
        void add (Control & control);
        int index() const { return _index; } // zero based
-       
+
        void set_route (boost::shared_ptr<ARDOUR::Route>, bool with_messages = true);
 
        // call all signal handlers manually
@@ -61,9 +64,11 @@ public:
 
        void handle_button (Button&, ButtonState bs);
        void handle_fader (Fader&, float position);
+       void handle_fader_touch (Fader&, bool touch_on);
        void handle_pot (Pot&, float delta);
 
        void periodic (uint64_t now_usecs);
+       void redisplay ();
 
        MidiByteArray display (uint32_t line_number, const std::string&);
        MidiByteArray blank_display (uint32_t line_number);
@@ -71,13 +76,14 @@ public:
        void zero ();
 
        void flip_mode_changed (bool notify=false);
+       void potmode_changed (bool notify=false);
 
        void lock_controls ();
        void unlock_controls ();
        bool locked() const { return _controls_locked; }
 
        void gui_selection_changed (const ARDOUR::StrongRouteNotificationList&);
-  
+
        void notify_metering_state_changed();
 
 private:
@@ -99,9 +105,12 @@ private:
        boost::shared_ptr<ARDOUR::Route> _route;
        PBD::ScopedConnectionList route_connections;
 
+       int      _pan_mode;
+
        float _last_gain_position_written;
        float _last_pan_azi_position_written;
        float _last_pan_width_position_written;
+       float _last_trim_position_written;
 
        void notify_solo_changed ();
        void notify_mute_changed ();
@@ -112,7 +121,8 @@ 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 update_automation ();
        void update_meter ();
 
@@ -121,8 +131,17 @@ private:
        void queue_display_reset (uint32_t msecs);
        void clear_display_reset ();
        void reset_display ();
+
+       struct RedisplayRequest {
+               ARDOUR::AutomationType type;
+               float val;
+       };
+
+       RingBuffer<RedisplayRequest> redisplay_requests;
+
        void do_parameter_display (ARDOUR::AutomationType, float val);
-       
+       void queue_parameter_display (ARDOUR::AutomationType, float val);
+
        typedef std::map<std::string,boost::shared_ptr<ARDOUR::Bundle> > BundleMap;
        BundleMap input_bundles;
        BundleMap output_bundles;
@@ -144,6 +163,7 @@ private:
        std::map<Evoral::Parameter,Control*> control_by_parameter;
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_strip_h__ */