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

[lephilousophe]

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:
b5c67b9ae0 TINSEL: Fix build when MP3 decoding isn't available


Commit: b5c67b9ae0127628e407e6e2acfdf7a5073d734f
    https://github.com/scummvm/scummvm/commit/b5c67b9ae0127628e407e6e2acfdf7a5073d734f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-03-04T14:01:28+01:00

Commit Message:
TINSEL: Fix build when MP3 decoding isn't available

Changed paths:
    engines/tinsel/music.cpp


diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 58e5a0c0f3..22869757cf 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -1003,6 +1003,7 @@ struct MusicSegmentNoir {
 };
 
 void PCMMusicPlayer::loadMP3MusicFromSegment(int segmentNum) {
+#ifdef USE_MAD
 	MusicSegmentNoir *musicSegments = (MusicSegmentNoir *)_vm->_handle->LockMem(_hSegment);
 
 	Common::SeekableReadStream *sampleStream = readSampleData(_filename, musicSegments[segmentNum].sampleOffset, 
@@ -1010,6 +1011,10 @@ void PCMMusicPlayer::loadMP3MusicFromSegment(int segmentNum) {
 
 	delete _curChunk;
 	_curChunk = Audio::makeMP3Stream(sampleStream, DisposeAfterUse::YES);
+#else
+	delete _curChunk;
+	_curChunk = 0;
+#endif
 }
 
 void PCMMusicPlayer::loadMusicFromSegment(int segmentNum) {