diff options
| author | David Robillard <d@drobilla.net> | 2009-10-28 23:56:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-28 23:56:05 +0000 |
| commit | 63251b0b31652349d26529bf16be676830646c46 (patch) | |
| tree | e66c90240a832d45e362daa7646c85b14d52989b | |
| parent | ed00714b1526ff65c26fa76e6d1a221ea669a20d (diff) | |
On second though, just remove that define entirely.
git-svn-id: svn://localhost/ardour2/branches/3.0@5967 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/session_transport.cc | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index aa398f76dd..e53aa4d5d3 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -155,9 +155,7 @@ Session::realtime_stop (bool abort) past that point to pick up delayed input. */ -#ifndef LEAVE_TRANSPORT_UNADJUSTED decrement_transport_position (_worst_output_latency); -#endif /* the duration change is not guaranteed to have happened, but is likely */ @@ -424,23 +422,22 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) } } -#ifdef LEAVE_TRANSPORT_UNADJUSTED - for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { - if (!(*i)->hidden()) { - (*i)->non_realtime_locate (_transport_frame); - } - if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) { - finished = false; - /* we will be back */ - return; - } + } + + for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { + if (!(*i)->hidden()) { + (*i)->non_realtime_locate (_transport_frame); + } + if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) { + finished = false; + /* we will be back */ + return; } -#endif } - have_looped = false; + have_looped = false; - send_full_time_code (0); + send_full_time_code (0); deliver_mmc (MIDI::MachineControl::cmdStop, 0); deliver_mmc (MIDI::MachineControl::cmdLocate, _transport_frame); |