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

[yuv422]

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:
bd4939a2a4 AUDIO: FluidSynth Don't accept soundfont data if using version 1.x


Commit: bd4939a2a4cbebe86396e76a023692657d515647
    https://github.com/scummvm/scummvm/commit/bd4939a2a4cbebe86396e76a023692657d515647
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-08-19T23:51:04+10:00

Commit Message:
AUDIO: FluidSynth Don't accept soundfont data if using version 1.x

Changed paths:
    audio/softsynth/fluidsynth.cpp


diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index d136e1846a..0f265f0fa3 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -72,7 +72,13 @@ public:
 	MidiChannel *getPercussionChannel() override;
 
 	void setEngineSoundFont(Common::SeekableReadStream *soundFontData) override;
-	bool acceptsSoundFontData() override { return true; }
+	bool acceptsSoundFontData() override {
+#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
+		return true;
+#else
+		return false;
+#endif
+	}
 
 	// AudioStream API
 	bool isStereo() const override { return true; }