[Scummvm-cvs-logs] CVS: tools compress_scumm_bun.cpp,1.19,1.20

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 30 13:09:55 CET 2005


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

Modified Files:
	compress_scumm_bun.cpp 
Log Message:
fixed silly bug with latest changes

Index: compress_scumm_bun.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_scumm_bun.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- compress_scumm_bun.cpp	30 Jan 2005 20:42:18 -0000	1.19
+++ compress_scumm_bun.cpp	30 Jan 2005 21:06:57 -0000	1.20
@@ -675,7 +675,7 @@
 	char fbuf[2048];
 	bool err = false;
 
-	sprintf(fbuf, "oggenc -q 0 \"%s\".wav", filename);
+	sprintf(fbuf, "oggenc -q 0 %s.wav", filename);
 	err = system(fbuf) != 0;
 	if (err) {
 		printf("Got error from encoder. (check your parameters)\n");
@@ -749,7 +749,7 @@
 	_waveTmpFile = NULL;
 }
 
-void writeToTempWave(char *fileName, byte *output_data, unsigned int size, int bits) {
+void writeToTempWave(char *fileName, byte *output_data, unsigned int size) {
 	if (!_waveTmpFile) {
 		_waveTmpFile = fopen(fileName, "wb");
 		if (!_waveTmpFile) {
@@ -930,9 +930,8 @@
 		int size = _region[l].length;
 		int offset = _region[l].offset;
 		byte *outputData = convertTo16bit(ptr + offset, size, outputSize, bits, freq, channels);
-		bits = 16;
 		sprintf(tmpPath, "%s/%s_reg%03d.wav", dir, filename, l);
-		writeToTempWave(tmpPath, outputData, outputSize, bits);
+		writeToTempWave(tmpPath, outputData, outputSize);
 		writeWaveHeader(_waveDataSize, freq, channels);
 
 		free(outputData);





More information about the Scummvm-git-logs mailing list