ptformat: Update the lib to 9d0b64f (upstream ptformat)

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

diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h
index ab98b92445ad4a6a7bd351925504274a325db94f..bb34f7c016d6cef14163ff48f9f4f2e4814dda96 100644 (file)
--- a/libs/surfaces/push2/push2.h
+++ b/libs/surfaces/push2/push2.h
@@ -370,12 +370,19 @@ class Push2 : public ARDOUR::ControlProtocol
 
   private:
        libusb_device_handle *handle;
+       bool in_use;
        ModifierState _modifier_state;
 
        void do_request (Push2Request*);
-       int stop ();
-       int open ();
-       int close ();
+
+       int begin_using_device ();
+       int stop_using_device ();
+       int device_acquire ();
+       void device_release ();
+       int ports_acquire ();
+       void ports_release ();
+       void run_event_loop ();
+       void stop_event_loop ();
 
        void relax () {}
 
@@ -431,9 +438,6 @@ class Push2 : public ARDOUR::ControlProtocol
 
        bool midi_input_handler (Glib::IOCondition ioc, MIDI::Port* port);
 
-       sigc::connection periodic_connection;
-       bool periodic ();
-
        void thread_init ();
 
        PBD::ScopedConnectionList session_connections;
@@ -516,10 +520,9 @@ class Push2 : public ARDOUR::ControlProtocol
        void other_vpot (int, int);
        void other_vpot_touch (int, bool);
 
-       /* special Stripables */
+       /* special Stripable */
 
        boost::shared_ptr<ARDOUR::Stripable> master;
-       boost::shared_ptr<ARDOUR::Stripable> monitor;
 
        sigc::connection vblank_connection;
        bool vblank ();