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

[agent-q at users.sourceforge.net]

Revision: 24172
          http://svn.sourceforge.net/scummvm/?rev=24172&view=rev
Author:   agent-q
Date:     2006-10-07 08:36:30 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
More MMD changes, and fix to Zip reader not reading folders within Zip.

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/backends/ds/arm9/source/osystem_ds.cpp
    scummvm/branches/branch-0-9-0/backends/ds/arm9/source/zipreader.cpp

Modified: scummvm/branches/branch-0-9-0/backends/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/backends/ds/arm9/source/osystem_ds.cpp	2006-10-07 15:34:06 UTC (rev 24171)
+++ scummvm/branches/branch-0-9-0/backends/ds/arm9/source/osystem_ds.cpp	2006-10-07 15:36:30 UTC (rev 24172)
@@ -399,7 +399,7 @@
 
 int OSystem_DS::getOutputSampleRate() const
 {
-	return 11025;
+	return DS::getSoundFrequency();
 }
 
 bool OSystem_DS::openCD(int drive)

Modified: scummvm/branches/branch-0-9-0/backends/ds/arm9/source/zipreader.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/backends/ds/arm9/source/zipreader.cpp	2006-10-07 15:34:06 UTC (rev 24171)
+++ scummvm/branches/branch-0-9-0/backends/ds/arm9/source/zipreader.cpp	2006-10-07 15:36:30 UTC (rev 24172)
@@ -92,6 +92,8 @@
 	if (_allFilesVisible) return true;
 	
 	getFileName(name);
+
+//	consolePrintf("N:'%s'D:'%s'\n", name, _directory);
 	
 	if (_directory[0] == 0) { // Root directory
 		name[strlen(name) - 1] = 0;
@@ -214,7 +216,15 @@
 
 void ZipFile::changeDirectory(char* dir) {
 //	consolePrintf("Current dir now '%s'\n", dir);
+
 	strcpy(_directory, dir);
+	for (int r = 0; r < (int) strlen(_directory); r++) {
+		if (_directory[r] == '/') _directory[r] = '\\';
+	}
+	
+	if (_directory[strlen(_directory) - 1] == '\\')	{
+		_directory[strlen(_directory) - 1] = '\0';
+	}
 }
 
 ZipFile::~ZipFile() {


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