summaryrefslogtreecommitdiff
path: root/libs/ardour/jack_slave.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-09-28 17:23:52 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-09-28 17:23:52 +0000
commit93c7aeba048f19df5abee5e4325ef8b0ef62c279 (patch)
tree5bc2149d17fb5272c5b6284f7e902faad39a92f7 /libs/ardour/jack_slave.cc
parent3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (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/ardour/jack_slave.cc')
-rw-r--r--libs/ardour/jack_slave.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index 352bcaeee5..2e03b2f45d 100644
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -36,7 +36,7 @@ JACK_Slave::JACK_Slave (jack_client_t* j)
: jack (j)
{
float x;
- jack_nframes_t p;
+ nframes_t p;
/* call this to initialize things */
speed_and_position (x, p);
}
@@ -58,7 +58,7 @@ JACK_Slave::ok() const
}
bool
-JACK_Slave::speed_and_position (float& sp, jack_nframes_t& position)
+JACK_Slave::speed_and_position (float& sp, nframes_t& position)
{
jack_position_t pos;
jack_transport_state_t state;