fix the cairo-fletcher-fluctuation

[ardour.git] / libs / surfaces / tranzport / tranzport_control_protocol.h

diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
index 929cca3e2b827c70d0607862837b73a6e5ecf6c9..1c318007b081f2f6610cbfc777c790c6eacab714 100644 (file)
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -33,10 +33,10 @@
 #include <usb.h>
 #endif
 
-#include <glibmm/thread.h>
-#include <ardour/types.h>
+#include <glibmm/threads.h>
+#include "ardour/types.h"
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 
 class TranzportControlProtocol : public ARDOUR::ControlProtocol
 {
@@ -145,7 +145,7 @@ private:
                BlingEnter,
                BlingExit
        };
-       
+
        pthread_t       thread;
 #if HAVE_TRANZPORT_KERNEL_DRIVER
        int udev;
@@ -153,18 +153,12 @@ private:
        usb_dev_handle* udev;
 #endif
 
-#if TRANZPORT_THREADS
-       pthread_t       thread_read;
-#endif
        int             last_read_error;
 
        uint32_t        buttonmask;
        uint32_t        timeout;
        uint32_t        inflight;
        uint32_t        current_track_id;
-#if TRANZPORT_THREADS
-       pthread_t       thread_write;
-#endif
        int             last_write_error;
        uint8_t        _datawheel;
        uint8_t        _device_status;
@@ -176,7 +170,7 @@ private:
 
        ARDOUR::gain_t  gain_fraction;
 
-       Glib::Mutex update_lock;
+        Glib::Threads::Mutex update_lock;
 
         std::bitset<ROWS*COLUMNS> screen_invalid;
        char screen_current[ROWS][COLUMNS];
@@ -199,7 +193,7 @@ private:
        uint32_t       last_mins;
        uint32_t       last_secs;
        uint32_t       last_frames;
-       nframes_t      last_where;
+       framepos_t     last_where;
        ARDOUR::gain_t last_track_gain;
        uint32_t       last_meter_fill;
        struct timeval last_wheel_motion;
@@ -307,8 +301,8 @@ private:
        void show_current_track ();
        void show_track_gain ();
        void show_transport_time ();
-       void show_bbt (nframes_t where);        
-       void show_smpte (nframes_t where);
+       void show_bbt (framepos_t where);       
+       void show_timecode (framepos_t where);
        void show_wheel_mode ();
        void show_gain ();
        void show_pan ();