OSC: Changed gainVCA to gainfader as VCA is already used.

[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 e85234c7a34dbc41c688e8db5626312cf1d3c813..32d88aaf5e9a431b75f424ea38bf92f24367f6ca 100644 (file)
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006 Paul Davis 
+  Copyright (C) 2006 Paul Davis
   Copyright (C) 2007 Mike Taht
 
   This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #include <usb.h>
 #endif
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include "ardour/types.h"
 
 #include "control_protocol/control_protocol.h"
@@ -59,7 +59,7 @@ private:
        const static int STATUS_OFFLINE  = 0xff;
        const static int STATUS_ONLINE = 0x01;
        const static int STATUS_OK = 0x00;
-  
+
         const static int LIGHTS = 7;
         const static int ROWS = 2;
         const static int COLUMNS = 20;
@@ -97,7 +97,7 @@ private:
                ButtonPlay = 0x00100000,
                ButtonRecord = 0x00000100,
                ButtonShift = 0x08000000,
-               ButtonFootswitch = 0x00001000 
+               ButtonFootswitch = 0x00001000
        };
 
        enum WheelShiftMode {
@@ -106,7 +106,7 @@ private:
                WheelShiftMaster,
                WheelShiftMarker
        };
-               
+
        enum WheelMode {
                WheelTimeline,
                WheelScrub,
@@ -124,7 +124,7 @@ private:
                WheelIncrSecond,
                WheelIncrMinute
        };
-         
+
        enum DisplayMode {
                DisplayNormal,
                DisplayRecording,
@@ -170,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];
@@ -183,7 +183,7 @@ private:
         std::bitset<LIGHTS> lights_flash;
 
        int32_t       last_notify;
-       char           last_notify_msg[COLUMNS+1]; 
+       char           last_notify_msg[COLUMNS+1];
        uint32_t       last_bars;
        uint32_t       last_beats;
        uint32_t       last_ticks;
@@ -193,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;
@@ -241,10 +241,10 @@ private:
        void screen_invalidate();
        int  screen_flush();
        void screen_clear();
-       // bool screen_isuptodate(); // think on this - 
+       // bool screen_isuptodate(); // think on this -
        int  screen_show_bling();
 
-       // Commands to write to the lcd 
+       // Commands to write to the lcd
 
        int  lcd_init();
         bool lcd_damage();
@@ -293,7 +293,7 @@ private:
        void enter_bling_mode();
 
        void next_marker (); // basicui doesn't give me enough info
-       void prev_marker (); 
+       void prev_marker ();
 
        void next_display_mode ();
        void normal_update ();
@@ -301,8 +301,8 @@ private:
        void show_current_track ();
        void show_track_gain ();
        void show_transport_time ();
-       void show_bbt (nframes_t where);        
-       void show_timecode (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 ();