[Scummvm-cvs-logs] SF.net SVN: scummvm:[33849] scummvm/branches/gsoc2008-rtl/engines/tinsel

[cpage88 at users.sourceforge.net]

Revision: 33849
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33849&view=rev
Author:   cpage88
Date:     2008-08-13 21:37:02 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Fixed some memory leaks in Tinsel

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp
    scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h

Modified: scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp	2008-08-13 20:45:00 UTC (rev 33848)
+++ scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.cpp	2008-08-13 21:37:02 UTC (rev 33849)
@@ -622,11 +622,11 @@
 	bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
 	//bool adlib = (midiDriver == MD_ADLIB);
 
-	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
+	_driver = MidiDriver::createMidi(midiDriver);
 	if (native_mt32)
-		driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
+		_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 
-	_music = new MusicPlayer(driver);
+	_music = new MusicPlayer(_driver);
 	//_music->setNativeMT32(native_mt32);
 	//_music->setAdlib(adlib);
 
@@ -644,6 +644,8 @@
 	delete _sound;
 	delete _music;
 	delete _console;
+	delete _driver;
+	_screenSurface.free();
 	FreeSs();
 	FreeTextBuffer();
 	FreeHandleTable();

Modified: scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h	2008-08-13 20:45:00 UTC (rev 33848)
+++ scummvm/branches/gsoc2008-rtl/engines/tinsel/tinsel.h	2008-08-13 21:37:02 UTC (rev 33849)
@@ -101,6 +101,7 @@
 	uint16 getVersion() const;
 	Common::Platform getPlatform() const;
 
+	MidiDriver *_driver;
 	SoundManager *_sound;
 	MusicPlayer *_music;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.