From b298b82e654e615fa16f0c969ef89c75a5df299c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis <bluegr@gmail.com>
Date: Sun, 10 Jul 2022 15:40:48 +0300
Subject: [PATCH] CHEWY: Remove the overriden music buffer added for bug #13672

The MOD player loads the entirety of a song in memory, so we don't need
to add another music buffer
---
 engines/chewy/r_event.cpp |  1 -
 engines/chewy/sound.cpp   | 13 +------------
 engines/chewy/sound.h     |  4 +---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index e8f8adc3204..920f01fccc5 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -723,7 +723,6 @@ void flic_cut(int16 nr) {
 		}
 
 		g_engine->_sound->stopMusic();
-		g_engine->_sound->disposeMusicBuffer();
 		_G(out)->fadeOut();
 		_G(out)->cls();
 		break;
diff --git a/engines/chewy/sound.cpp b/engines/chewy/sound.cpp
index d5541772710..77dade8ee26 100644
--- a/engines/chewy/sound.cpp
+++ b/engines/chewy/sound.cpp
@@ -130,13 +130,7 @@ void Sound::playMusic(int16 num, bool loop) {
 	delete[] data;
 }
 
-void Sound::playMusic(uint8 *data, uint32 size, uint8 volume, bool handleBuffer) {
-	if (handleBuffer) {
-		_overridenMusicBuffer = new uint8[size];
-		memcpy(_overridenMusicBuffer, data, size);
-		data = _overridenMusicBuffer;
-	}
-		
+void Sound::playMusic(uint8 *data, uint32 size, uint8 volume) {
 	TMFStream *stream = new TMFStream(new Common::MemoryReadStream(data, size), 0);
 	_curMusic = -1;
 
@@ -156,11 +150,6 @@ void Sound::stopMusic() {
 	_mixer->stopHandle(_musicHandle);
 }
 
-void Sound::disposeMusicBuffer() {
-	delete[] _overridenMusicBuffer;
-	_overridenMusicBuffer = nullptr;
-}
-
 bool Sound::isMusicActive() const {
 	return _mixer->isSoundHandleActive(_musicHandle);
 }
diff --git a/engines/chewy/sound.h b/engines/chewy/sound.h
index cecb0e7b2ca..17cfcc0ab93 100644
--- a/engines/chewy/sound.h
+++ b/engines/chewy/sound.h
@@ -60,11 +60,10 @@ public:
 	void setSoundChannelBalance(uint channel, int8 balance);
 
 	void playMusic(int16 num, bool loop = false);
-	void playMusic(uint8 *data, uint32 size, uint8 volume = 63, bool handleBuffer = false);
+	void playMusic(uint8 *data, uint32 size, uint8 volume = 63);
 	void pauseMusic();
 	void resumeMusic();
 	void stopMusic();
-	void disposeMusicBuffer();
 	bool isMusicActive() const;
 	void setUserMusicVolume(uint volume);
 	int getUserMusicVolume() const;
@@ -121,7 +120,6 @@ private:
 
 	SoundResource *_speechRes;
 	SoundResource *_soundRes;
-	uint8 *_overridenMusicBuffer = nullptr;
 };
 
 } // End of namespace Chewy