libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 09:49:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed memory leak when returning to launcher in AGOS engine by properly creating and deleting midi driver pointer

Browse Source 
svn-id: r32129
This commit is contained in:
Christopher Page 2008-05-14 23:26:32 +00:00
parent cbe03226a4
commit 5e592d4e4a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/agos/agos.cpp
View File

@ -558,14 +558,17 @@ int AGOSEngine::init() {
// Setup midi driver
int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI);
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
MidiDriver *driver = MidiDriver::createMidi(midiDriver);
_driver = MidiDriver::createMidi(midiDriver);
if (_nativeMT32) {
driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
}
_midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_nativeMT32);
_midi.setDriver(driver);
_midi.setDriver(_driver);
int ret = _midi.open();
if (ret)
warning("MIDI Player init failed: \"%s\"", _midi.getErrorName (ret));
@ -877,6 +880,7 @@ AGOSEngine::~AGOSEngine() {
delete _gameFile;
_midi.close();
delete _driver;
for (uint i = 0; i < _itemHeap.size(); i++) {
delete[] _itemHeap[i];
@ -1015,6 +1019,7 @@ void AGOSEngine::shutdown() {
delete _gameFile;
_midi.close();
delete _driver;
for (uint i = 0; i < _itemHeap.size(); i++) {
delete[] _itemHeap[i];

1
engines/agos/agos.h
View File

@ -523,6 +523,7 @@ protected:
byte _lettersToPrintBuf[80];
MidiPlayer _midi;
MidiDriver *_driver;
bool _midiEnabled;
bool _nativeMT32;