NOOP, remove trailing tabs/whitespace.

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

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 2034dd40961143311e9c42f485c22b5f8c22ce84..1c989ec518be45d9bef8191d3791dd187022ffa1 100644 (file)
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 
+#include "pbd/xml++.h"
 #include "midi++/types.h"
 
 #include "control_protocol/types.h"
@@ -20,6 +21,9 @@ namespace ARDOUR {
 }
 
 class MidiByteArray;
+
+namespace ArdourSurface {
+
 class MackieControlProtocol;
 
 namespace Mackie
@@ -48,7 +52,6 @@ public:
        void say_hello ();
 
        bool active() const { return _active; }
-       void drop_routes ();
 
        typedef std::vector<Control*> Controls;
        Controls controls;
@@ -59,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; }
 
@@ -83,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*);
@@ -92,9 +97,6 @@ public:
        /// unless it's already connected
        void connect_to_signals ();
 
-       /// notification from a MackiePort that it's now inactive
-       void handle_port_inactive(Mackie::SurfacePort *);
-
        /// write a sysex message
        void write_sysex (const MidiByteArray& mba);
        void write_sysex (MIDI::byte msg);
@@ -103,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 ();
@@ -114,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
@@ -135,13 +144,6 @@ 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 = "  ");
-       
-       /**
-               Timecode display. Only the difference between timecode and last_timecode will
-               be encoded, to save midi bandwidth. If they're the same, an empty array will
-               be returned
-       */
-       MidiByteArray timecode_display (const std::string & timecode, const std::string & last_timecode = "");
 
        void update_view_mode_display ();
        void update_flip_mode_display ();
@@ -153,8 +155,14 @@ public:
        void next_jog_mode ();
        void set_jog_mode (Mackie::JogWheel::Mode);
 
+        void notify_metering_state_changed();
+       void turn_it_on ();
+
+       XMLNode& get_state ();
+       int set_state (const XMLNode&, int version);
+
   protected:
-       
+
   private:
        MackieControlProtocol& _mcp;
        SurfacePort*           _port;
@@ -165,18 +173,19 @@ public:
        bool                   _connected;
        Mackie::JogWheel*      _jog_wheel;
        Fader*                 _master_fader;
+       float                  _last_master_gain_written;
 
        void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count);
        MidiByteArray host_connection_query (MidiByteArray& bytes);
        MidiByteArray host_connection_confirmation (const MidiByteArray& bytes);
 
-       void init_controls();
+       void init_controls ();
        void init_strips (uint32_t n);
        void setup_master ();
        void master_gain_changed ();
-       void turn_it_on ();
 };
 
+}
 }
 
 #endif