diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-08 16:28:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-08 16:28:21 +0000 |
| commit | ff122d0fe8fde6a8a4edc71f9dbba5d161036300 (patch) | |
| tree | bde7638b27de0f51ae1d02c4bf486c712abcfbe8 /libs/ardour/jack_slave.cc | |
| parent | 660fd702af13ace2d0399e47d5e9a644a6e3a8d7 (diff) | |
monster commit: transport mgmt changes from 2.X (omnibus edition); make slave use nframes64_t ; avoid crashes in Drags when commiting reversible transactions that do not exist
git-svn-id: svn://localhost/ardour2/branches/3.0@6034 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/jack_slave.cc')
| -rw-r--r-- | libs/ardour/jack_slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc index 9f92f1b21f..0f425d09c6 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) { double x; - nframes_t p; + nframes64_t p; /* call this to initialize things */ speed_and_position (x, p); } @@ -64,10 +64,11 @@ JACK_Slave::ok() const } bool -JACK_Slave::speed_and_position (double& sp, nframes_t& position) +JACK_Slave::speed_and_position (double& sp, nframes64_t& position) { jack_position_t pos; jack_transport_state_t state; + state = jack_transport_query (jack, &pos); switch (state) { |