summaryrefslogtreecommitdiff
path: root/libs/surfaces/tranzport
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-12-03 22:26:29 +0000
committerCarl Hetherington <carl@carlh.net>2010-12-03 22:26:29 +0000
commit73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch)
treec0039f3f5a848aed6e880abf11519dad855fa899 /libs/surfaces/tranzport
parent74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff)
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/tranzport')
-rw-r--r--libs/surfaces/tranzport/show.cc7
-rw-r--r--libs/surfaces/tranzport/tranzport_control_protocol.h6
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc
index cefe5f2dd1..c7eb11216a 100644
--- a/libs/surfaces/tranzport/show.cc
+++ b/libs/surfaces/tranzport/show.cc
@@ -284,7 +284,7 @@ TranzportControlProtocol::show_meter ()
}
void
-TranzportControlProtocol::show_bbt (nframes_t where)
+TranzportControlProtocol::show_bbt (framepos_t where)
{
if (where != last_where) {
char buf[16];
@@ -348,12 +348,11 @@ TranzportControlProtocol::show_bbt (nframes_t where)
void
TranzportControlProtocol::show_transport_time ()
{
- nframes_t where = session->transport_frame();
- show_bbt(where);
+ show_bbt (session->transport_frame ());
}
void
-TranzportControlProtocol::show_timecode (nframes_t where)
+TranzportControlProtocol::show_timecode (framepos_t where)
{
if ((where != last_where) || lcd_isdamaged(1,9,10)) {
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
index e85234c7a3..53d64e8e98 100644
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -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;
@@ -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 ();