[Scummvm-cvs-logs] CVS: tools compress_san.cpp,1.37,1.38

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Jan 28 10:24:18 CET 2005


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17480

Modified Files:
	compress_san.cpp 
Log Message:
back code for end track check

Index: compress_san.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_san.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- compress_san.cpp	28 Jan 2005 17:47:16 -0000	1.37
+++ compress_san.cpp	28 Jan 2005 18:19:12 -0000	1.38
@@ -39,7 +39,8 @@
 	str[1] = (char)(tag >> 16);
 	str[2] = (char)(tag >> 8);
 	str[3] = (char)tag;
-	str[4] = '\0';	return str;
+	str[4] = '\0';
+	return str;
 }
 
 void showhelp(char *exename) {
@@ -283,7 +284,8 @@
 	printf("Decompresing tracks files...\n");
 	for (int l = 0; l < MAX_TRACKS; l++) {
 		if (_audioTracks[l].used) {
-			fclose(_audioTracks[l].file);
+			if (_audioTracks[l].file)
+				fclose(_audioTracks[l].file);
 			sprintf(filename, "%s/%s_%04d_%03d.tmp", outputDir, inputFilename, _audioTracks[l].animFrame, _audioTracks[l].trackId);
 			_audioTracks[l].file = fopen(filename, "rb");
 			assert(_audioTracks[l].file);
@@ -598,6 +600,10 @@
 	if (audioTrack->freq == 11025)
 		audioTrack->sizes[index] *= 2;
 	audioTrack->countFrames++;
+	if ((index + 1) == nbframes) {
+		fclose(audioTrack->file);
+		audioTrack->file = NULL;
+	}
 }
 
 void handleDigIACT(FILE *input, int size, char *outputDir, char *inputFilename, char *tmpPath, int flags, int track_flags, int frame) {





More information about the Scummvm-git-logs mailing list