[Scummvm-cvs-logs] CVS: tools compress.c,1.6,1.7 compress_sword1.c,1.4,1.5

[Torbjörn Andersson]

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

Modified Files:
	compress.c compress_sword1.c 
Log Message:
We use rawSamplerate == -1 to indicate that "this is a perfectly sane WAV
file, so there's no need to resample". So don't ask 'lame' to resample.


Index: compress.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- compress.c	1 Jan 2005 10:33:29 -0000	1.6
+++ compress.c	7 Feb 2005 13:38:32 -0000	1.7
@@ -155,7 +155,8 @@
 		 * version 3.93.1): we round the input sample rate up to the next
 		 * higher valid MP3 sample rate, with a margin of 3%.
 		 */
-		tmp += sprintf(tmp, "--resample %d ", map2MP3Frequency(97 * rawSamplerate / 100));
+		if (rawSamplerate != -1)
+			tmp += sprintf(tmp, "--resample %d ", map2MP3Frequency(97 * rawSamplerate / 100));
 
 		if (encparms.silent)
 			tmp += sprintf(tmp, " --silent ");

Index: compress_sword1.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_sword1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- compress_sword1.c	1 Jan 2005 10:33:29 -0000	1.4
+++ compress_sword1.c	7 Feb 2005 13:38:37 -0000	1.5
@@ -517,7 +517,7 @@
 			sprintf(fNameOut, "MUSIC/%s.%s", musicNames[i].fileName, (compMode == kMP3Mode) ? "MP3" : "OGG");
 			
 			printf("encoding file (%3d/%d) %s -> %s.%s\n", i + 1, TOTAL_TUNES, musicNames[i].fileName, musicNames[i].fileName, (compMode == kMP3Mode) ? "MP3" : "OGG");
-			encodeAudio(fNameIn, false, 0, fNameOut, compMode);
+			encodeAudio(fNameIn, false, -1, fNameOut, compMode);
 		}
 	}
 }