fix faderport's use of action name

[ardour.git] / libs / surfaces / faderport / faderport.h

diff --git a/libs/surfaces/faderport/faderport.h b/libs/surfaces/faderport/faderport.h
index 9227f1f39fce4c7636ea3c44c3f31ef9a7ecec8f..4d5c9702d93e83330c056014200c3976dee1ad32 100644 (file)
--- a/libs/surfaces/faderport/faderport.h
+++ b/libs/surfaces/faderport/faderport.h
@@ -85,6 +85,7 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
           there's no way to know if the device exists or not.
         */
        static bool probe() { return true; }
+       static void* request_factory (uint32_t);
 
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
@@ -145,6 +146,7 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
                Stop = 5,
                Play = 6,
                RecEnable = 7,
+               Footswitch = 126,
                FaderTouch = 127,
        };
 
@@ -160,11 +162,11 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
        std::string get_action (ButtonID, bool on_press, FaderPort::ButtonState = ButtonState (0));
 
        std::list<boost::shared_ptr<ARDOUR::Bundle> > bundles ();
-       
+
   private:
-       boost::shared_ptr<ARDOUR::Route> _current_route;
-       boost::weak_ptr<ARDOUR::Route> pre_master_route;
-       boost::weak_ptr<ARDOUR::Route> pre_monitor_route;
+       boost::shared_ptr<ARDOUR::Stripable> _current_stripable;
+       boost::weak_ptr<ARDOUR::Stripable> pre_master_stripable;
+       boost::weak_ptr<ARDOUR::Stripable> pre_monitor_stripable;
 
        boost::shared_ptr<ARDOUR::AsyncMIDIPort> _input_port;
        boost::shared_ptr<ARDOUR::AsyncMIDIPort> _output_port;
@@ -281,6 +283,9 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
        void map_recenable_state ();
        void map_transport_state ();
 
+       sigc::connection periodic_connection;
+       bool periodic ();
+
        sigc::connection blink_connection;
        typedef std::list<ButtonID> Blinkers;
        Blinkers blinkers;
@@ -289,18 +294,18 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq
        void start_blinking (ButtonID);
        void stop_blinking (ButtonID);
 
-       void set_current_route (boost::shared_ptr<ARDOUR::Route>);
-       void drop_current_route ();
+       void set_current_stripable (boost::shared_ptr<ARDOUR::Stripable>);
+       void drop_current_stripable ();
        void use_master ();
        void use_monitor ();
-       void gui_track_selection_changed (ARDOUR::RouteNotificationListPtr);
+       void gui_track_selection_changed (ARDOUR::StripableNotificationListPtr);
        PBD::ScopedConnection selection_connection;
-       PBD::ScopedConnectionList route_connections;
+       PBD::ScopedConnectionList stripable_connections;
 
-       void map_route_state ();
-       void map_solo (bool,void*,bool);
-       void map_listen (void*,bool);
-       void map_mute (void*);
+       void map_stripable_state ();
+       void map_solo ();
+       void map_mute ();
+       bool rec_enable_state;
        void map_recenable ();
        void map_gain ();
        void map_cut ();