diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-09 02:42:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-09 02:42:40 +0000 |
| commit | 070ca5043c7e961d7a22510125f4036e4d0b8e4b (patch) | |
| tree | 7d91a3f4153c60383007d3f78e2df084b4035826 /libs/ardour/audio_diskstream.cc | |
| parent | 9e9c7a85365a924e207f72c6682a45de04ee95b9 (diff) | |
new keybinding editor, mostly finished but not 100%
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2531 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 184ea8d998..f7e982b502 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -760,14 +760,14 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_ if (rec_nframes == 0 && _actual_speed != 1.0f && _actual_speed != -1.0f) { uint64_t phase = last_phase; - uint64_t phi_delta; + int64_t phi_delta; nframes_t i = 0; // Linearly interpolate into the alt buffer // using 40.24 fixp maths (swh) if (phi != target_phi) { - phi_delta = (target_phi - phi) / nframes; + phi_delta = ((int64_t)(target_phi - phi)) / nframes; } else { phi_delta = 0; } @@ -792,7 +792,7 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_ chaninfo->current_playback_buffer = chaninfo->speed_buffer; } - playback_distance = i + 1; + playback_distance = i; last_phase = (phase & 0xFFFFFF); } else { |