X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fsurface.h;h=1c989ec518be45d9bef8191d3791dd187022ffa1;hb=22b07e0233a29d9633ffa825a79503befaf2e16e;hp=1ed83aef1db88af2c9a2e9ba7751af282c9a0c42;hpb=a1a3f6c8265264227ce19f731bf1863aff229a94;p=ardour.git

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 1ed83aef1d..1c989ec518 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -21,6 +21,9 @@ namespace ARDOUR {
 }
 
 class MidiByteArray;
+
+namespace ArdourSurface {
+
 class MackieControlProtocol;
 
 namespace Mackie
@@ -49,7 +52,6 @@ public:
 	void say_hello ();
 
 	bool active() const { return _active; }
-	void drop_routes ();
 
 	typedef std::vector<Control*> Controls;
 	Controls controls;
@@ -60,7 +62,7 @@ public:
 	std::map<int,Led*> leds;
 	std::map<int,Meter*> meters;
 	std::map<int,Control*> controls_by_device_independent_id;
-	
+
 	Mackie::JogWheel* jog_wheel() const { return _jog_wheel; }
 	Fader* master_fader() const { return _master_fader; }
 
@@ -84,6 +86,8 @@ public:
 	const MidiByteArray& sysex_hdr() const;
 
 	void periodic (uint64_t now_usecs);
+	void redisplay ();
+	void hui_heartbeat ();
 
 	void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id);
 	void handle_midi_controller_message (MIDI::Parser&, MIDI::EventTwoBytes*);
@@ -101,7 +105,7 @@ public:
 
 	/// display an indicator of the first switched-in Route. Do nothing by default.
 	void display_bank_start (uint32_t /*current_bank*/);
-		
+
 	/// called from MackieControlProtocol::zero_all to turn things off
 	void zero_all ();
 	void zero_controls ();
@@ -112,6 +116,13 @@ public:
 
 	void display_timecode (const std::string & /*timecode*/, const std::string & /*timecode_last*/);
 
+	/// sends MCP "reset" message to surface
+	void reset ();
+
+	void recalibrate_faders ();
+	void toggle_backlight ();
+	void set_touch_sensitivity (int);
+
 	/**
 		This is used to calculate the clicks per second that define
 		a transport speed of 1.0 for the jog wheel. 100.0 is 10 clicks
@@ -133,7 +144,7 @@ public:
 	// be two characters
 	void show_two_char_display (const std::string & msg, const std::string & dots = "  ");
 	void show_two_char_display (unsigned int value, const std::string & dots = "  ");
-	
+
 	void update_view_mode_display ();
 	void update_flip_mode_display ();
 
@@ -143,7 +154,7 @@ public:
 
 	void next_jog_mode ();
 	void set_jog_mode (Mackie::JogWheel::Mode);
-  
+
         void notify_metering_state_changed();
 	void turn_it_on ();
 
@@ -151,7 +162,7 @@ public:
 	int set_state (const XMLNode&, int version);
 
   protected:
-	
+
   private:
 	MackieControlProtocol& _mcp;
 	SurfacePort*           _port;
@@ -174,6 +185,7 @@ public:
 	void master_gain_changed ();
 };
 
+}
 }
 
 #endif