From ff122d0fe8fde6a8a4edc71f9dbba5d161036300 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 8 Nov 2009 16:28:21 +0000 Subject: 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 --- libs/ardour/session_time.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/ardour/session_time.cc') 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; } -- cgit v1.2.3