diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/surfaces/frontier/tranzport | |
parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (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/frontier/tranzport')
-rw-r--r-- | libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc | 7 | ||||
-rw-r--r-- | libs/surfaces/frontier/tranzport/tranzport_control_protocol.h | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index 1924a4df94..f6a8f4d4b7 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -555,7 +555,7 @@ TranzportControlProtocol::show_meter () } void -TranzportControlProtocol::show_bbt (nframes_t where) +TranzportControlProtocol::show_bbt (framepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,8)) { char buf[16]; @@ -591,12 +591,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_smpte (nframes_t where) +TranzportControlProtocol::show_smpte (framepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,10)) { diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h index 4e37da9916..0c7f600e2c 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h @@ -151,7 +151,7 @@ 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; @@ -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 (); |