diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-28 17:23:52 +0000 |
| commit | 93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch) | |
| tree | 5bc2149d17fb5272c5b6284f7e902faad39a92f7 /libs/surfaces/tranzport | |
| parent | 3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (diff) | |
fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t
git-svn-id: svn://localhost/ardour2/trunk@933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/tranzport')
| -rw-r--r-- | libs/surfaces/tranzport/tranzport_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/tranzport_control_protocol.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.cc b/libs/surfaces/tranzport/tranzport_control_protocol.cc index d66f3c26bf..04d56c575c 100644 --- a/libs/surfaces/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/tranzport/tranzport_control_protocol.cc @@ -320,7 +320,7 @@ TranzportControlProtocol::show_meter () void TranzportControlProtocol::show_transport_time () { - jack_nframes_t where = session->transport_frame(); + nframes_t where = session->transport_frame(); if (where != last_where) { diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h index e6e1a83e46..e5193a761c 100644 --- a/libs/surfaces/tranzport/tranzport_control_protocol.h +++ b/libs/surfaces/tranzport/tranzport_control_protocol.h @@ -110,7 +110,7 @@ class TranzportControlProtocol : public ARDOUR::ControlProtocol uint32_t last_mins; uint32_t last_secs; uint32_t last_frames; - jack_nframes_t last_where; + nframes_t last_where; ARDOUR::gain_t last_track_gain; uint32_t last_meter_fill; struct timeval last_wheel_motion; |