diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-09 18:26:47 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-09 18:26:47 +0000 |
commit | 9c88023faf6d63806fa747eda541294f22a1e5f3 (patch) | |
tree | 0e7891587cf986aa9c2b4bd0de6587982a1c4c32 /libs/rubberband | |
parent | b007f7fe621e8390b41df5a725fbb697d3d69fb9 (diff) |
make separate work with/without selected tracks; make align-regions-*-relative work correctly; make waveform muted color show correctly
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2855 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/rubberband')
-rw-r--r-- | libs/rubberband/src/Resampler.cpp | 3 | ||||
-rw-r--r-- | libs/rubberband/src/StretcherProcess.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/rubberband/src/Resampler.cpp b/libs/rubberband/src/Resampler.cpp index 731ac4ee38..2196856abd 100644 --- a/libs/rubberband/src/Resampler.cpp +++ b/libs/rubberband/src/Resampler.cpp @@ -117,7 +117,8 @@ Resampler::D::resample(float **in, float **out, size_t incount, float ratio, data.src_ratio = ratio; data.end_of_input = (final ? 1 : 0); - int err = src_process(m_src, &data); + int err = 0; + err = src_process(m_src, &data); //!!! check err, respond appropriately diff --git a/libs/rubberband/src/StretcherProcess.cpp b/libs/rubberband/src/StretcherProcess.cpp index 1e8e7d1afb..3ea4bee53e 100644 --- a/libs/rubberband/src/StretcherProcess.cpp +++ b/libs/rubberband/src/StretcherProcess.cpp @@ -710,7 +710,7 @@ RubberBandStretcher::Impl::writeChunk(size_t channel, size_t shiftIncrement, boo cerr << "writeChunk(" << channel << ", " << shiftIncrement << ", " << last << ")" << endl; } - for (int i = 0; i < shiftIncrement; ++i) { + for (unsigned int i = 0; i < shiftIncrement; ++i) { if (cd.windowAccumulator[i] > 0.f) { cd.accumulator[i] /= cd.windowAccumulator[i]; } |