david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Add warning if -c option and something conflicting with it are both given

Browse Source 
* Fixes for mingw32 compile
* Fix a couple of compiler warnings
This commit is contained in:
Chris Cannam
2008-07-07 18:54:18 +00:00
parent 167760625a
commit d6d4af1539
7 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/StretcherProcess.cpp
View File

@@ -504,11 +504,11 @@ RubberBandStretcher::Impl::calculateIncrements(size_t &phaseIncrementRtn,
if (silent) ++m_silentHistory;
else m_silentHistory = 0;
if (m_silentHistory >= (m_windowSize / m_increment) && !phaseReset) {
if (m_silentHistory >= int(m_windowSize / m_increment) && !phaseReset) {
phaseReset = true;
if (m_debugLevel > 1) {
std::cerr << "calculateIncrements: phase reset on silence (silent history == "
<< m_silentHistory << ")" << std::endl;
cerr << "calculateIncrements: phase reset on silence (silent history == "
<< m_silentHistory << ")" << endl;
}
}
}
@@ -1067,7 +1067,7 @@ RubberBandStretcher::Impl::writeChunk(size_t channel, size_t shiftIncrement, boo
windowAccumulator[i] = 0.0f;
}
if (cd.accumulatorFill > si) {
if (int(cd.accumulatorFill) > si) {
cd.accumulatorFill -= si;
} else {
cd.accumulatorFill = 0;