thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CHEWY: Remove the overriden music buffer added for bug #13672

Browse source 
The MOD player loads the entirety of a song in memory, so we don't need
to add another music buffer
This commit is contained in:
Filippos Karapetis 2022-07-10 15:40:48 +03:00
parent 81e4f91d75
commit b298b82e65
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/chewy/r_event.cpp
View file

@ -723,7 +723,6 @@ void flic_cut(int16 nr) {
} }
g_engine->_sound->stopMusic(); g_engine->_sound->stopMusic();
g_engine->_sound->disposeMusicBuffer();
_G(out)->fadeOut(); _G(out)->fadeOut();
_G(out)->cls(); _G(out)->cls();
break; break;

13
engines/chewy/sound.cpp
View file

@ -130,13 +130,7 @@ void Sound::playMusic(int16 num, bool loop) {
delete[] data; delete[] data;
} }
void Sound::playMusic(uint8 *data, uint32 size, uint8 volume, bool handleBuffer) { void Sound::playMusic(uint8 *data, uint32 size, uint8 volume) {
if (handleBuffer) {
_overridenMusicBuffer = new uint8[size];
memcpy(_overridenMusicBuffer, data, size);
data = _overridenMusicBuffer;
}
TMFStream *stream = new TMFStream(new Common::MemoryReadStream(data, size), 0); TMFStream *stream = new TMFStream(new Common::MemoryReadStream(data, size), 0);
_curMusic = -1; _curMusic = -1;
@ -156,11 +150,6 @@ void Sound::stopMusic() {
_mixer->stopHandle(_musicHandle); _mixer->stopHandle(_musicHandle);
} }
void Sound::disposeMusicBuffer() {
delete[] _overridenMusicBuffer;
_overridenMusicBuffer = nullptr;
}
bool Sound::isMusicActive() const { bool Sound::isMusicActive() const {
return _mixer->isSoundHandleActive(_musicHandle); return _mixer->isSoundHandleActive(_musicHandle);
} }

4
engines/chewy/sound.h
View file

@ -60,11 +60,10 @@ public:
void setSoundChannelBalance(uint channel, int8 balance); void setSoundChannelBalance(uint channel, int8 balance);
void playMusic(int16 num, bool loop = false); 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 pauseMusic();
void resumeMusic(); void resumeMusic();
void stopMusic(); void stopMusic();
void disposeMusicBuffer();
bool isMusicActive() const; bool isMusicActive() const;
void setUserMusicVolume(uint volume); void setUserMusicVolume(uint volume);
int getUserMusicVolume() const; int getUserMusicVolume() const;
@ -121,7 +120,6 @@ private:
SoundResource *_speechRes; SoundResource *_speechRes;
SoundResource *_soundRes; SoundResource *_soundRes;
uint8 *_overridenMusicBuffer = nullptr;
}; };
} // End of namespace Chewy } // End of namespace Chewy