[Scummvm-git-logs] scummvm master -> 562c0f7c8cd7e29ccdcd2eaaa8469edd9fb99a0b

[bluegr]

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:
562c0f7c8c GROOVIE: check for USE_MAD for MP3


Commit: 562c0f7c8cd7e29ccdcd2eaaa8469edd9fb99a0b
    https://github.com/scummvm/scummvm/commit/562c0f7c8cd7e29ccdcd2eaaa8469edd9fb99a0b
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2021-10-13T23:52:24+03:00

Commit Message:
GROOVIE: check for USE_MAD for MP3

The groovie engine is unconditionally trying to acess the
`Audio::makeMP3Stream` method, which won't exist if ScummVM is
being compiled without MAD. Other consumers use this `#ifdef` to
determine if they should try to call it, so I've made the same
change here.

Changed paths:
    engines/groovie/music.cpp


diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index a7add7d57b..d9e57864af 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -808,8 +808,10 @@ bool MusicPlayerTlc::load(uint32 fileref, bool loop) {
 	if (_file->isOpen()) {
 		if (filename.hasSuffix(".m4a"))
 			seekStream = Audio::makeQuickTimeStream(_file, DisposeAfterUse::NO);
+#ifdef USE_MAD
 		else
 			seekStream = Audio::makeMP3Stream(_file, DisposeAfterUse::NO);
+#endif
 	} else {
 		delete _file;
 		_file = NULL;