MCP: Momentarily light buttons when they are used to trigger a defined action.

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

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 68b3c5f7998f3688331dff6ef47e8205d9446729..3225e23ba06bfa2f7194b55f4752f5dcd1fa5f1e 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"
@@ -20,7 +22,7 @@ namespace MIDI {
 }
 
 namespace ARDOUR {
-       class Route;
+       class Stripable;
        class Port;
 }
 
@@ -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);
@@ -77,7 +79,8 @@ public:
        uint32_t n_strips (bool with_locked_strips = true) const;
        Strip* nth_strip (uint32_t n) const;
 
-       bool route_is_locked_to_strip (boost::shared_ptr<ARDOUR::Route>) const;
+       bool stripable_is_locked_to_strip (boost::shared_ptr<ARDOUR::Stripable>) const;
+       bool stripable_is_mapped (boost::shared_ptr<ARDOUR::Stripable>) const;
 
        /// This collection owns the groups
        typedef std::map<std::string,Group*> Groups;
@@ -85,12 +88,12 @@ public:
 
        SurfacePort& port() const { return *_port; }
 
-       void map_routes (const std::vector<boost::shared_ptr<ARDOUR::Route> >& routes);
+       void map_stripables (const std::vector<boost::shared_ptr<ARDOUR::Stripable> >&);
 
        const MidiByteArray& sysex_hdr() const;
 
        void periodic (ARDOUR::microseconds_t now_usecs);
-       void redisplay (ARDOUR::microseconds_t now_usecs);
+       void redisplay (ARDOUR::microseconds_t now_usecs, bool force);
        void hui_heartbeat ();
 
        void handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t, uint32_t channel_id);
@@ -149,11 +152,10 @@ public:
        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_view_mode_display (bool with_helpful_text);
        void update_flip_mode_display ();
-       void update_potmode ();
 
-       void gui_selection_changed (const ARDOUR::StrongRouteNotificationList&);
+       void subview_mode_changed ();
 
        MackieControlProtocol& mcp() const { return _mcp; }
 
@@ -165,11 +167,13 @@ public:
 
        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;
@@ -181,7 +185,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);
@@ -192,7 +196,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,