[Scummvm-cvs-logs] SF.net SVN: scummvm:[52333] scummvm/trunk/engines/tinsel/music.cpp

[thebluegr at users.sourceforge.net]

Revision: 52333
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52333&view=rev
Author:   thebluegr
Date:     2010-08-24 12:45:19 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
TINSEL: Adjusted the commented out music debug code for the latest changes to
the lookup tables

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/music.cpp

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2010-08-24 12:41:56 UTC (rev 52332)
+++ scummvm/trunk/engines/tinsel/music.cpp	2010-08-24 12:45:19 UTC (rev 52333)
@@ -368,6 +368,10 @@
 	uint32 curTrack = 0;
 	uint32 songLength = 0;
 
+	// Init
+	for (int i = 0; i < ARRAYSIZE(midiOffsets); i++)
+		midiOffsets[i] = 0;
+
 	while (!midiStream.eos() && !midiStream.err()) {
 		assert(curTrack < ARRAYSIZE(midiOffsets));
 		midiOffsets[curTrack++] = curOffset + (4 * curTrack);
@@ -976,30 +980,22 @@
 	int outFileSize = 0;
 	char buffer[20000];
 
-	int total = (_vm->getFeatures() & GF_SCNFILES) ?
-				ARRAYSIZE(midiOffsetsSCNVersion) :
-				ARRAYSIZE(midiOffsetsGRAVersion);
+	const int total = 155;	// maximum (SCN version)
 
 	for (int i = 0; i < total; i++) {
+		if (midiOffsets[i] == 0)
+			break;
+
 		sprintf(outName, "track%03d.xmi", i + 1);
 		outFile.open(outName);
 
-		if (_vm->getFeatures() & GF_SCNFILES) {
-			if (i < total - 1)
-				outFileSize = midiOffsetsSCNVersion[i + 1] - midiOffsetsSCNVersion[i] - 4;
-			else
-				outFileSize = midiFile.size() - midiOffsetsSCNVersion[i] - 4;
+		if (i < total - 1)
+			outFileSize = midiOffsets[i + 1] - midiOffsets[i] - 4;
+		else
+			outFileSize = midiFile.size() - midiOffsets[i] - 4;
 
-			midiFile.seek(midiOffsetsSCNVersion[i] + 4, SEEK_SET);
-		} else {
-			if (i < total - 1)
-				outFileSize = midiOffsetsGRAVersion[i + 1] - midiOffsetsGRAVersion[i] - 4;
-			else
-				outFileSize = midiFile.size() - midiOffsetsGRAVersion[i] - 4;
+		midiFile.seek(midiOffsets[i] + 4, SEEK_SET);
 
-			midiFile.seek(midiOffsetsGRAVersion[i] + 4, SEEK_SET);
-		}
-
 		assert(outFileSize < 20000);
 		midiFile.read(buffer, outFileSize);
 		outFile.write(buffer, outFileSize);


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