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

[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:
ba098864de DRAGONS: Don't automatically use fluid synth v1 driver.


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

Commit Message:
DRAGONS: Don't automatically use fluid synth v1 driver.
This version doesn't support loading soundfont data from memory.

Changed paths:
    engines/dragons/midimusicplayer.cpp


diff --git a/engines/dragons/midimusicplayer.cpp b/engines/dragons/midimusicplayer.cpp
index 1ca0a33471..c019115b4f 100644
--- a/engines/dragons/midimusicplayer.cpp
+++ b/engines/dragons/midimusicplayer.cpp
@@ -37,6 +37,10 @@ MidiMusicPlayer::MidiMusicPlayer(BigfileArchive *bigFileArchive, VabSound *music
 
 	if (_driver->acceptsSoundFontData()) {
 		_driver->setEngineSoundFont(loadSoundFont(bigFileArchive));
+	} else {
+		//If the selected driver doesn't support loading soundfont we should assume we got a fluid Synth V1 and reload
+		delete _driver;
+		MidiPlayer::createDriver();
 	}
 
 	int ret = _driver->open();