[Scummvm-cvs-logs] SF.net SVN: scummvm: [28442] scummvm/branches/branch-0-10-0/backends/ platform/ds/arm9/source

[agent-q at users.sourceforge.net]

Revision: 28442
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28442&view=rev
Author:   agent-q
Date:     2007-08-04 02:27:33 -0700 (Sat, 04 Aug 2007)

Log Message:
-----------
DS: Fix initialisation of semaphore and leak of file handle when WAV format was incorrect

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/cdaudio.cpp
    scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/cdaudio.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/cdaudio.cpp	2007-08-04 06:18:28 UTC (rev 28441)
+++ scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/cdaudio.cpp	2007-08-04 09:27:33 UTC (rev 28442)
@@ -168,6 +168,7 @@
 	
 	if ((waveHeader.fmtFormatTag != 17) && (waveHeader.fmtFormatTag != 20)) {
 		consolePrintf("Wave file is in the wrong format!  You must use IMA-ADPCM 4-bit mono.\n");
+		DS::std_fclose(file);
 		return;
 	}
 	

Modified: scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp	2007-08-04 06:18:28 UTC (rev 28441)
+++ scummvm/branches/branch-0-10-0/backends/platform/ds/arm9/source/dsmain.cpp	2007-08-04 09:27:33 UTC (rev 28442)
@@ -2742,6 +2742,8 @@
 		formatSramOption();
 	}
 
+	IPC->adpcm.semaphore = false;
+
 //	printf("'%s'", Common::ConfigManager::kTransientDomain.c_str());
 	//printf("'%s'", Common::ConfigManager::kApplicationDomain.c_str());
 


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