mackie: redesign display logic entirely

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

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index c0a2cff8719194703a859b95a65dbb5c8f58baa3..c536c438561e29b326efb56f6af8de347c6ee24c 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);
@@ -78,6 +80,7 @@ public:
        Strip* nth_strip (uint32_t n) const;
 
        bool route_is_locked_to_strip (boost::shared_ptr<ARDOUR::Route>) const;
+       bool route_is_mapped (boost::shared_ptr<ARDOUR::Route>) const;
 
        /// This collection owns the groups
        typedef std::map<std::string,Group*> Groups;
@@ -90,7 +93,7 @@ public:
        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,12 @@ 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; }
 
@@ -167,6 +171,8 @@ public:
 
        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);
 
@@ -181,6 +187,7 @@ public:
        Mackie::JogWheel*      _jog_wheel;
        Fader*                 _master_fader;
        float                  _last_master_gain_written;
+       PBD::ScopedConnection   master_connection;
 
        void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count);
        MidiByteArray host_connection_query (MidiByteArray& bytes);