[Scummvm-git-logs] scummvm master -> a1de9a95c64c66bd9ee61c91a7ad013ebe621dda

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a1de9a95c6 AUDIO: MT32: Fix Internal Sample Rate Converter Code


Commit: a1de9a95c64c66bd9ee61c91a7ad013ebe621dda
    https://github.com/scummvm/scummvm/commit/a1de9a95c64c66bd9ee61c91a7ad013ebe621dda
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-20T22:54:04Z

Commit Message:
AUDIO: MT32: Fix Internal Sample Rate Converter Code

This was previously disabled implicitly by the missing define
symbols in the SampleRateConvertor module. This has now been enabled
to use the internal rate convertor code.

This was generating undefined macro warnings from GCC when -Wundef
was passed.

Changed paths:
    audio/softsynth/mt32/SampleRateConverter.cpp
    audio/softsynth/mt32/module.mk


diff --git a/audio/softsynth/mt32/SampleRateConverter.cpp b/audio/softsynth/mt32/SampleRateConverter.cpp
index aec13263a3e..7beac346b70 100644
--- a/audio/softsynth/mt32/SampleRateConverter.cpp
+++ b/audio/softsynth/mt32/SampleRateConverter.cpp
@@ -14,7 +14,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cstddef>
+#define MT32EMU_WITH_LIBSOXR_RESAMPLER 0
+#define MT32EMU_WITH_LIBSAMPLERATE_RESAMPLER 0
+#define MT32EMU_WITH_INTERNAL_RESAMPLER 1
 
 #include "SampleRateConverter.h"
 
diff --git a/audio/softsynth/mt32/module.mk b/audio/softsynth/mt32/module.mk
index 7c50f3edaac..5b7a602bb65 100644
--- a/audio/softsynth/mt32/module.mk
+++ b/audio/softsynth/mt32/module.mk
@@ -21,6 +21,12 @@ MODULE_OBJS := \
 	TVP.o \
 	sha1/sha1.o \
 	c_interface/c_interface.o \
+	srchelper/InternalResampler.o \
+	srchelper/srctools/src/FIRResampler.o \
+	srchelper/srctools/src/IIR2xResampler.o \
+	srchelper/srctools/src/LinearResampler.o \
+	srchelper/srctools/src/ResamplerModel.o \
+	srchelper/srctools/src/SincResampler.o \
 	SampleRateConverter.o
 
 # Include common rules