summaryrefslogtreecommitdiff
path: root/libs/ardour/session_time.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-11-08 16:28:21 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-11-08 16:28:21 +0000
commitff122d0fe8fde6a8a4edc71f9dbba5d161036300 (patch)
treebde7638b27de0f51ae1d02c4bf486c712abcfbe8 /libs/ardour/session_time.cc
parent660fd702af13ace2d0399e47d5e9a644a6e3a8d7 (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/session_time.cc')
-rw-r--r--libs/ardour/session_time.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 9a6eebbaf8..1e1ecd3ed9 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -452,7 +452,7 @@ Session::jack_sync_callback (jack_transport_state_t state,
switch (state) {
case JackTransportStopped:
- if (slave && _transport_frame != pos->frame && post_transport_work == 0) {
+ if (slave && _transport_frame != pos->frame && post_transport_work() == 0) {
request_locate (pos->frame, false);
// cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
return false;
@@ -461,9 +461,9 @@ Session::jack_sync_callback (jack_transport_state_t state,
}
case JackTransportStarting:
- // cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " << post_transport_work << " pos matches ? " << (_transport_frame == pos->frame) << endl;
+ // cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " << post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
if (slave) {
- return _transport_frame == pos->frame && post_transport_work == 0;
+ return _transport_frame == pos->frame && post_transport_work() == 0;
} else {
return true;
}