mackie: properly track lifetime of subview route; fix subview/potmode LED state mgmt

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

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 17b515e3d7d42086c340a4687e1a4d18a917a1f5..5246cf9857b7a17ed7cec91f46babfb55ce617f3 100644 (file)
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+#include <sigc++/trackable.h>
+
 #include "pbd/signals.h"
 #include "pbd/xml++.h"
 #include "midi++/types.h"
@@ -43,7 +45,7 @@ class Jog;
 class Pot;
 class Led;
 
-class Surface : public PBD::ScopedConnectionList
+class Surface : public PBD::ScopedConnectionList, public sigc::trackable
 {
 public:
        Surface (MackieControlProtocol&, const std::string& name, uint32_t number, surface_type_t stype);
@@ -89,8 +91,8 @@ public:
 
        const MidiByteArray& sysex_hdr() const;
 
-       void periodic (uint64_t now_usecs);
-       void redisplay ();
+       void periodic (ARDOUR::microseconds_t now_usecs);
+       void redisplay (ARDOUR::microseconds_t now_usecs);
        void hui_heartbeat ();
 
        void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id);
@@ -151,8 +153,10 @@ public:
 
        void update_view_mode_display ();
        void update_flip_mode_display ();
+       void update_potmode ();
 
        void gui_selection_changed (const ARDOUR::StrongRouteNotificationList&);
+       void subview_mode_changed ();
 
        MackieControlProtocol& mcp() const { return _mcp; }
 
@@ -162,11 +166,15 @@ public:
         void notify_metering_state_changed();
        void turn_it_on ();
 
+       void display_message_for (std::string const& msg, uint64_t msecs);
+
+       bool connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool);
+
+       void master_monitor_may_have_changed ();
+
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
 
-  protected:
-
   private:
        MackieControlProtocol& _mcp;
        SurfacePort*           _port;
@@ -178,7 +186,7 @@ public:
        Mackie::JogWheel*      _jog_wheel;
        Fader*                 _master_fader;
        float                  _last_master_gain_written;
-       PBD::ScopedConnection   port_connection;
+       PBD::ScopedConnection   master_connection;
 
        void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count);
        MidiByteArray host_connection_query (MidiByteArray& bytes);
@@ -189,7 +197,6 @@ public:
        void init_strips (uint32_t n);
        void setup_master ();
        void master_gain_changed ();
-       void connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool);
 
        enum ConnectionState {
                InputConnected = 0x1,
@@ -198,11 +205,11 @@ public:
 
        int connection_state;
 
-       /* this times the duration between press+release events for all
-          possible 127 buttons on THIS surface (not all surfaces).
-       */
+       MidiByteArray display_line (std::string const& msg, int line_num);
 
-       ARDOUR::microseconds_t button_timer[127];
+  public:
+       /* IP MIDI devices need to keep a handle on this and destroy it */
+       GSource*    input_source;
 };
 
 }