diff options
| author | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
| commit | bb457bb960c5bd7ed538f9d31477293415739f68 (patch) | |
| tree | 84324a63b87c03589cd165b9e474296eaebb4772 /libs/ardour/crossfade.cc | |
| parent | 73dd9d37e7d715e0d78c0e51569968f9494dac7f (diff) | |
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/crossfade.cc')
| -rw-r--r-- | libs/ardour/crossfade.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index 508e6515c9..f7711b3224 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -260,7 +260,8 @@ Crossfade::read_raw_internal (Sample* buf, nframes_t start, nframes_t cnt) const nframes_t Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, - float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n) const + float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n, + nframes_t read_frames, nframes_t skip_frames) const { nframes_t offset; nframes_t to_write; @@ -301,9 +302,9 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, } else if (!(_in->opaque())) { memset (crossfade_buffer_in, 0, sizeof (Sample) * to_write); } - - _out->read_at (crossfade_buffer_out, mixdown_buffer, gain_buffer, start, to_write, chan_n); - _in->read_at (crossfade_buffer_in, mixdown_buffer, gain_buffer, start, to_write, chan_n); + + _out->read_at (crossfade_buffer_out, mixdown_buffer, gain_buffer, start, to_write, chan_n, read_frames, skip_frames); + _in->read_at (crossfade_buffer_in, mixdown_buffer, gain_buffer, start, to_write, chan_n, read_frames, skip_frames); float* fiv = new float[to_write]; float* fov = new float[to_write]; |