aboutsummaryrefslogtreecommitdiff
path: root/src/chips/nuked_opl3.cpp
diff options
context:
space:
mode:
authorVitaly Novichkov <Wohlstand@users.noreply.github.com>2018-06-03 23:34:13 +0300
committerGitHub <noreply@github.com>2018-06-03 23:34:13 +0300
commit87e84a89526a5c078f2119eb92422e47923a727a (patch)
tree24298d8b2e2574817c5975dcc75ba4c2d0b01426 /src/chips/nuked_opl3.cpp
parent2c8961252ee2ff91cda38b4dc9b36a957997091a (diff)
parent32d4a6d002297f6978b6e76907a279c5f8c203fe (diff)
downloadlibADLMIDI-87e84a89526a5c078f2119eb92422e47923a727a.tar.gz
libADLMIDI-87e84a89526a5c078f2119eb92422e47923a727a.tar.bz2
libADLMIDI-87e84a89526a5c078f2119eb92422e47923a727a.zip
Merge pull request #105 from jpcima/hq-resampler
clamp the outputs of 16bit adding generators
Diffstat (limited to 'src/chips/nuked_opl3.cpp')
-rw-r--r--src/chips/nuked_opl3.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/chips/nuked_opl3.cpp b/src/chips/nuked_opl3.cpp
index fc6363d..6490f7f 100644
--- a/src/chips/nuked_opl3.cpp
+++ b/src/chips/nuked_opl3.cpp
@@ -73,10 +73,14 @@ int NukedOPL3::generateAndMix(int16_t *output, size_t frames)
#if defined(ADLMIDI_ENABLE_HQ_RESAMPLER)
for(size_t i = 0; i < frames; ++i)
{
- int16_t frame[2];
- generateResampledHq(frame);
- output[0] += (int32_t)frame[0];
- output[1] += (int32_t)frame[1];
+ int32_t frame[2];
+ generateResampledHq32(frame);
+ for (unsigned c = 0; c < 2; ++c) {
+ int32_t temp = (int32_t)output[c] + frame[c];
+ temp = (temp > -32768) ? temp : -32768;
+ temp = (temp < 32767) ? temp : 32767;
+ output[c] = temp;
+ }
output += 2;
}
#else