Move MIDI control port ownership into the MIDI Manager, since control port state...

[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..e85234c7a34dbc41c688e8db5626312cf1d3c813 100644 (file)
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -34,9 +34,9 @@
 #endif
 
 #include <glibmm/thread.h>
-#include <ardour/types.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;
@@ -308,7 +302,7 @@ private:
        void show_track_gain ();
        void show_transport_time ();
        void show_bbt (nframes_t where);        
-       void show_smpte (nframes_t where);
+       void show_timecode (nframes_t where);
        void show_wheel_mode ();
        void show_gain ();
        void show_pan ();