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

* 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

View File

@@ -249,7 +249,7 @@ RubberBandStretcher::Impl::setPitchScale(double fs)
m_pitchScale != 1.f) {
// resampling mode has changed
for (int c = 0; c < m_channels; ++c) {
for (int c = 0; c < int(m_channels); ++c) {
if (m_channelData[c]->resampler) {
m_channelData[c]->resampler->reset();
}
@@ -932,7 +932,7 @@ RubberBandStretcher::Impl::calculateStretch()
if (i >= m_silence.size()) break;
if (m_silence[i]) ++history;
else history = 0;
if (history >= (m_windowSize / m_increment) && increments[i] >= 0) {
if (history >= int(m_windowSize / m_increment) && increments[i] >= 0) {
increments[i] = -increments[i];
if (m_debugLevel > 1) {
std::cerr << "phase reset on silence (silent history == "