[Scummvm-cvs-logs] SF.net SVN: scummvm:[48327] scummvm/trunk/engines/teenagent/teenagent.cpp

[megath at users.sourceforge.net]

Revision: 48327
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48327&view=rev
Author:   megath
Date:     2010-03-20 16:52:51 +0000 (Sat, 20 Mar 2010)

Log Message:
-----------
fixed another stream leak

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/teenagent.cpp

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2010-03-20 16:45:11 UTC (rev 48326)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2010-03-20 16:52:51 UTC (rev 48327)
@@ -908,15 +908,14 @@
 
 void TeenAgentEngine::playSoundNow(byte id) {
 	Resources *res = Resources::instance();
-	Common::SeekableReadStream *in = res->sam_sam.getStream(id);
-	if (in == NULL) {
+	uint size = res->sam_sam.getSize(id);
+	if (size == 0) {
 		warning("skipping invalid sound %u", id);
 		return;
 	}
 
-	uint size = in->size();
 	byte *data = (byte *)malloc(size);
-	in->read(data, size);
+	res->sam_sam.read(id, data, size);
 	//debug(0, "playing %u samples...", size);
 
 	Audio::AudioStream *stream = Audio::makeRawStream(data, size, 11025, 0);


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