From 10c83e8bf50991bd4116aa694977819ae1998d88 Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Thu, 19 Aug 2021 09:29:32 +0300 Subject: [PATCH] =?UTF-8?q?Fixed=20sound=20pops=20introduced=20by=20WaveMi?= =?UTF-8?q?x=20upsampler.=20This=20does=20not=20fix=20WINE=20issues,=20but?= =?UTF-8?q?=20at=20least=20you=20don=E2=80=99t=20have=20to=20up=20sample?= =?UTF-8?q?=20manually.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpaceCadetPinball/WaveMix.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SpaceCadetPinball/WaveMix.cpp b/SpaceCadetPinball/WaveMix.cpp index 9391ccf..e07524c 100644 --- a/SpaceCadetPinball/WaveMix.cpp +++ b/SpaceCadetPinball/WaveMix.cpp @@ -2377,6 +2377,12 @@ HPSTR WaveMix::SamplesPerSecAlign(HPSTR lpInData, DWORD nInSamplesPerSec, DWORD } } + // Dump raw PCM for analysis. + /*FILE* file; + fopen_s(&file,"wav1_dump.raw", "w"); + fwrite(dataBufBup, 1, sampleSize * dwNumSamples2, file); + fclose(file);*/ + GlobalUnlock(GlobalHandle(lpInDataBup)); GlobalFree(GlobalHandle(lpInDataBup)); return dataBufBup; @@ -2427,7 +2433,7 @@ void WaveMix::RepSample(HPSTR lpOutData, HPSTR lpInData, unsigned nRep, int nByt { auto sample = *src; auto dst2 = &dst[nChannels]; - auto delta = (src[nChannels] - src[0]) / nRep; + auto delta = (src[nChannels] - src[0]) / static_cast(nRep); *dst = *src; dst++; for (auto repeatIndex = nRep - 1; repeatIndex; repeatIndex--) @@ -2447,7 +2453,7 @@ void WaveMix::RepSample(HPSTR lpOutData, HPSTR lpInData, unsigned nRep, int nByt { auto sample = *src; auto dst2 = &dst[nChannels]; - auto delta = (src[nChannels] - src[0]) / nRep; /*Was dst[nChannels] - */ + auto delta = (src[nChannels] - src[0]) / static_cast(nRep); /*Was dst[nChannels] - */ *dst = *src; ++dst; for (auto repeatIndex2 = nRep - 1; repeatIndex2; --repeatIndex2)