X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fstrip.h;h=9cce3d2b9215dc0232e2c1667a0f7447727e6b15;hb=a1d2c1307782a1fe7dfae57e36ab480e9efbb189;hp=d7e80c95e571ee59b96cf008c24bbeb276c9d19d;hpb=3b7e2f7d67ad87bfb0ce183c10e9d00e71b6b085;p=ardour.git

diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index d7e80c95e5..9cce3d2b92 100644
--- 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"
@@ -14,6 +15,7 @@
 
 #include "control_group.h"
 #include "types.h"
+#include "mackie_control_protocol.h"
 #include "midi_byte_array.h"
 #include "device_info.h"
 
@@ -23,6 +25,8 @@ namespace ARDOUR {
 	class ChannelCount;
 }
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Control;
@@ -33,15 +37,9 @@ class Fader;
 class Meter;
 class SurfacePort;
 
-struct StripControlDefinition {
-    const char* name;
-    uint32_t base_id;
-    Control* (*factory)(Surface&, int index, const char* name, Group&);
-};
-
 struct GlobalControlDefinition {
     const char* name;
-    uint32_t id;
+    int id;
     Control* (*factory)(Surface&, int index, const char* name, Group&);
     const char* group_name;
 };
@@ -59,32 +57,46 @@ public:
 
 	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);
 
 	// call all signal handlers manually
-	void notify_all();
+	void notify_all ();
 
 	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 periodic (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 flip_mode_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 (ARDOUR::RouteNotificationListPtr);
+	void gui_selection_changed (const ARDOUR::StrongRouteNotificationList&);
+
+	void notify_metering_state_changed();
+
+	void block_screen_display_for (uint32_t msecs);
+	void block_vpot_mode_display_for (uint32_t msecs);
 
 private:
+	enum VPotDisplayMode {
+		Name,
+		Value
+	};
+
 	Button*  _solo;
 	Button*  _recenable;
 	Button*  _mute;
@@ -97,13 +109,24 @@ private:
 	int      _index;
 	Surface* _surface;
 	bool     _controls_locked;
-	uint64_t _reset_display_at;
+	bool     _transport_is_rolling;
+	bool     _metering_active;
+	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;
+	PBD::ScopedConnectionList send_connections;
+	int       eq_band;
+
+	ARDOUR::AutomationType  _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 ();
@@ -114,38 +137,44 @@ private:
 	void notify_panner_width_changed (bool force_update = true);
 	void notify_active_changed ();
 	void notify_route_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 queue_display_reset (uint32_t msecs);
-	void clear_display_reset ();
-	void reset_display ();
-	void do_parameter_display (ARDOUR::AutomationType, float val);
-	
-	typedef std::map<std::string,boost::shared_ptr<ARDOUR::Bundle> > BundleMap;
-	BundleMap input_bundles;
-	BundleMap output_bundles;
-
-	void build_input_list (const ARDOUR::ChanCount&);
-	void build_output_list (const ARDOUR::ChanCount&);
-	void maybe_add_to_bundle_map (BundleMap& bm, boost::shared_ptr<ARDOUR::Bundle>, bool for_input, const ARDOUR::ChanCount&);
+	void return_to_vpot_mode_display ();
+	void next_pot_mode ();
 
+	void do_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;
-	void next_pot_mode ();
-	void set_vpot_parameter (Evoral::Parameter);
+	std::vector<ARDOUR::AutomationType> possible_pot_parameters;
+	std::vector<ARDOUR::AutomationType> possible_trim_parameters;
+	void set_vpot_parameter (ARDOUR::AutomationType);
+	void show_route_name ();
 
 	void reset_saved_values ();
 
-	std::map<Evoral::Parameter,Control*> control_by_parameter;
+	bool is_midi_track () const;
+
+	void notify_eq_change (ARDOUR::AutomationType, uint32_t band, bool force);
+	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>);
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_strip_h__ */