diff options
Diffstat (limited to 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 2de3448cd1..9b8b7f1d24 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include <cmath> @@ -306,7 +305,7 @@ Session::process_with_events (nframes_t nframes) return; } - end_frame = _transport_frame + nframes; + end_frame = _transport_frame + (nframes_t)abs(floor(nframes * _transport_speed)); { Event* this_event; @@ -354,20 +353,15 @@ Session::process_with_events (nframes_t nframes) while (nframes) { - if (this_event == 0 || this_event->action_frame > end_frame || this_event->action_frame < _transport_frame) { + this_nframes = nframes; /* real (jack) time relative */ + frames_moved = (long) floor (_transport_speed * nframes); /* transport relative */ - this_nframes = nframes; - - } else { - - /* compute nframes to next event */ - - if (this_event->action_frame < end_frame) { - this_nframes = nframes - (end_frame - this_event->action_frame); - } else { - this_nframes = nframes; - } - } + /* running an event, position transport precisely to its time */ + if (this_event && this_event->action_frame <= end_frame && this_event->action_frame >= _transport_frame) { + /* this isn't quite right for reverse play */ + frames_moved = (long) (this_event->action_frame - _transport_frame); + this_nframes = (nframes_t) abs( floor(frames_moved / _transport_speed) ); + } if (this_nframes) { @@ -386,8 +380,6 @@ Session::process_with_events (nframes_t nframes) nframes -= this_nframes; offset += this_nframes; - frames_moved = (nframes_t) floor (_transport_speed * this_nframes); - if (frames_moved < 0) { decrement_transport_position (-frames_moved); } else { @@ -419,8 +411,7 @@ Session::process_with_events (nframes_t nframes) } /* this is necessary to handle the case of seamless looping */ - /* not sure if it will work in conjuction with varispeed */ - end_frame = _transport_frame + nframes; + end_frame = _transport_frame + (nframes_t) floor (nframes * _transport_speed); } |