X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Ffrontier%2Ftranzport%2Ftranzport_control_protocol.h;h=39addbbaca808537f039160d867370762782413a;hb=4dc63966f0872efe768dad61eb9b8785d06b92d1;hp=f13e4a3a44d57cc7300ddbb87b6c8e5c8ba846f3;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git

diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
index f13e4a3a44..39addbbaca 100644
--- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
@@ -8,11 +8,11 @@
 #include <pthread.h>
 #include <usb.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.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
 {
@@ -94,7 +94,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 	       WheelIncrSecond,
 	       WheelIncrMinute
 	};
-	  
+	
 	enum DisplayMode {
 		DisplayNormal,
 		DisplayRecording,
@@ -130,7 +130,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 
 	ARDOUR::gain_t  gain_fraction;
 
-	Glib::Mutex update_lock;
+        Glib::Threads::Mutex update_lock;
 
 	bool screen_invalid[2][20];
 	char screen_current[2][20];
@@ -151,10 +151,10 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 	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;
+	uint64_t       last_wheel_motion;
 	int            last_wheel_dir;
 
 	Glib::Mutex io_lock;
@@ -190,9 +190,9 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 	void screen_invalidate();
 	int  screen_flush();
 	void screen_clear();
-	// bool screen_isuptodate(); // think on this - 
+	// bool screen_isuptodate(); // think on this -
 
-	// Commands to write to the lcd 
+	// Commands to write to the lcd
 
 	int  lcd_init();
         bool lcd_damage();
@@ -246,8 +246,8 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol
 	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_smpte (framepos_t where);
 	void show_wheel_mode ();
 	void show_gain ();
 	void show_pan ();