diff --git a/src/sfizz/FilePool.cpp b/src/sfizz/FilePool.cpp index 3cd57684..9b43a2be 100644 --- a/src/sfizz/FilePool.cpp +++ b/src/sfizz/FilePool.cpp @@ -273,7 +273,7 @@ sfz::FilePromisePtr sfz::FilePool::getFilePromise(const std::string& filename) n auto promise = emptyPromises.back(); promise->filename = preloaded->first; promise->preloadedData = preloaded->second.preloadedData; - promise->sampleRate = preloaded->second.information.sampleRate; + promise->sampleRate = static_cast(preloaded->second.information.sampleRate); promise->oversamplingFactor = oversamplingFactor; promise->creationTime = std::chrono::high_resolution_clock::now(); diff --git a/src/sfizz/MidiState.cpp b/src/sfizz/MidiState.cpp index b4267f12..434423b0 100644 --- a/src/sfizz/MidiState.cpp +++ b/src/sfizz/MidiState.cpp @@ -137,7 +137,7 @@ void sfz::MidiState::reset() noexcept void sfz::MidiState::resetAllControllers(int delay) noexcept { - for (unsigned ccIdx = 0; ccIdx < config::numCCs; ++ccIdx) + for (int ccIdx = 0; ccIdx < config::numCCs; ++ccIdx) ccEvent(delay, ccIdx, 0.0f); pitchBend = 0; diff --git a/src/sfizz/MidiState.h b/src/sfizz/MidiState.h index 7d4078fb..6c634838 100644 --- a/src/sfizz/MidiState.h +++ b/src/sfizz/MidiState.h @@ -176,7 +176,7 @@ private: * Pitch bend status */ int pitchBend { 0 }; - double sampleRate { config::defaultSampleRate }; + float sampleRate { config::defaultSampleRate }; int samplesPerBlock { config::defaultSamplesPerBlock }; unsigned internalClock { 0 }; }; diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index a499bc10..bcc7196d 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -970,7 +970,7 @@ float sfz::Region::getBasePitchVariation(int noteNumber, float velocity) const n auto pitchVariationInCents = pitchKeytrack * (noteNumber - (int)pitchKeycenter); // note difference with pitch center pitchVariationInCents += tune; // sample tuning pitchVariationInCents += config::centPerSemitone * transpose; // sample transpose - pitchVariationInCents += static_cast(velocity * pitchVeltrack); // track velocity + pitchVariationInCents += static_cast(velocity) * pitchVeltrack; // track velocity pitchVariationInCents += pitchDistribution(Random::randomGenerator); // random pitch changes return centsFactor(pitchVariationInCents); } @@ -994,7 +994,7 @@ float sfz::Region::getPhase() const noexcept float phase; if (oscillatorPhase >= 0) { phase = oscillatorPhase * (1.0f / 360.0f); - phase -= static_cast(phase); + phase -= static_cast(static_cast(phase)); } else { std::uniform_real_distribution phaseDist { 0.0001f, 0.9999f }; phase = phaseDist(Random::randomGenerator); diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index b2640738..caa51ca0 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -407,13 +407,13 @@ bool sfz::Synth::loadSfzFile(const fs::path& file) noteActivationLists[note].push_back(region); } - for (unsigned cc = 0; cc < config::numCCs; cc++) { + for (int cc = 0; cc < config::numCCs; cc++) { if (region->ccTriggers.contains(cc) || region->ccConditions.contains(cc)) ccActivationLists[cc].push_back(region); } // Defaults - for (unsigned cc = 0; cc < config::numCCs; cc++) { + for (int cc = 0; cc < config::numCCs; cc++) { region->registerCC(cc, resources.midiState.getCCValue(cc)); } @@ -1026,12 +1026,12 @@ void sfz::Synth::resetAllControllers(int delay) noexcept resources.midiState.resetAllControllers(delay); for (auto& voice : voices) { voice->registerPitchWheel(delay, 0); - for (unsigned cc = 0; cc < config::numCCs; ++cc) + for (int cc = 0; cc < config::numCCs; ++cc) voice->registerCC(delay, cc, 0.0f); } for (auto& region : regions) { - for (unsigned cc = 0; cc < config::numCCs; ++cc) + for (int cc = 0; cc < config::numCCs; ++cc) region->registerCC(cc, 0.0f); } }