diff options
author | Tarek Soliman | 2017-12-23 15:40:30 -0600 |
---|---|---|
committer | Tarek Soliman | 2018-01-03 10:40:23 -0600 |
commit | 50d79c5f265aad592ae7f17209653ccbb1fde488 (patch) | |
tree | 1951526e3ff2910acb0588f3a23ba0e9e7e66544 /audio/softsynth/mt32/srchelper/SoxrAdapter.cpp | |
parent | bb5e8d3a11711d409f89739cf3f054cd5bac8c4f (diff) | |
download | scummvm-rg350-50d79c5f265aad592ae7f17209653ccbb1fde488.tar.gz scummvm-rg350-50d79c5f265aad592ae7f17209653ccbb1fde488.tar.bz2 scummvm-rg350-50d79c5f265aad592ae7f17209653ccbb1fde488.zip |
MT32: Update to munt 2.3.0
This uses upstream commit 939cc986d9ffd044f8c6149361127ad5d94e430f
Closes gh-1091
Diffstat (limited to 'audio/softsynth/mt32/srchelper/SoxrAdapter.cpp')
-rw-r--r-- | audio/softsynth/mt32/srchelper/SoxrAdapter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/audio/softsynth/mt32/srchelper/SoxrAdapter.cpp b/audio/softsynth/mt32/srchelper/SoxrAdapter.cpp index b13192be92..5e8dca97d6 100644 --- a/audio/softsynth/mt32/srchelper/SoxrAdapter.cpp +++ b/audio/softsynth/mt32/srchelper/SoxrAdapter.cpp @@ -16,37 +16,37 @@ #include "SoxrAdapter.h" -#include "Synth.h" +#include "../Synth.h" using namespace MT32Emu; static const unsigned int CHANNEL_COUNT = 2; size_t SoxrAdapter::getInputSamples(void *input_fn_state, soxr_in_t *data, size_t requested_len) { - unsigned int length = requested_len < 1 ? 1 : (MAX_SAMPLES_PER_RUN < requested_len ? MAX_SAMPLES_PER_RUN : requested_len); + unsigned int length = requested_len < 1 ? 1 : (MAX_SAMPLES_PER_RUN < requested_len ? MAX_SAMPLES_PER_RUN : static_cast<unsigned int>(requested_len)); SoxrAdapter *instance = static_cast<SoxrAdapter *>(input_fn_state); instance->synth.render(instance->inBuffer, length); *data = instance->inBuffer; return length; } -SoxrAdapter::SoxrAdapter(Synth &useSynth, double targetSampleRate, SampleRateConverter::Quality quality) : +SoxrAdapter::SoxrAdapter(Synth &useSynth, double targetSampleRate, SamplerateConversionQuality quality) : synth(useSynth), inBuffer(new float[CHANNEL_COUNT * MAX_SAMPLES_PER_RUN]) { soxr_io_spec_t ioSpec = soxr_io_spec(SOXR_FLOAT32_I, SOXR_FLOAT32_I); unsigned long qualityRecipe; switch (quality) { - case SampleRateConverter::FASTEST: + case SamplerateConversionQuality_FASTEST: qualityRecipe = SOXR_QQ; break; - case SampleRateConverter::FAST: + case SamplerateConversionQuality_FAST: qualityRecipe = SOXR_LQ; break; - case SampleRateConverter::GOOD: + case SamplerateConversionQuality_GOOD: qualityRecipe = SOXR_MQ; break; - case SampleRateConverter::BEST: + case SamplerateConversionQuality_BEST: default: qualityRecipe = SOXR_16_BITQ; break; |