LCXL: fix off by one cause by fader8master

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

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 122335d9a76b626d1c1a8f334f284eb7c1620be4..218e2e2cbc7c5b65978cd955af9cc56cbb9531b3 100644 (file)
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -22,7 +22,7 @@ namespace MIDI {
 }
 
 namespace ARDOUR {
-       class Route;
+       class Stripable;
        class Port;
 }
 
@@ -79,8 +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 route_is_mapped (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;
@@ -88,12 +88,14 @@ 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> >&);
+
+       void update_strip_selection ();
 
        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);
@@ -154,9 +156,7 @@ public:
 
        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; }
@@ -176,6 +176,8 @@ public:
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
 
+       bool get_qcon_flag() { return is_qcon; }
+
   private:
        MackieControlProtocol& _mcp;
        SurfacePort*           _port;
@@ -206,6 +208,9 @@ public:
 
        int connection_state;
 
+       // QCon Flag
+       bool is_qcon;
+
        MidiByteArray display_line (std::string const& msg, int line_num);
 
   public: