[Scummvm-cvs-logs] CVS: tools extract.c,1.19,1.20

Oliver Kiehl olki at users.sourceforge.net
Tue Aug 12 08:07:02 CEST 2003


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv19907

Modified Files:
	extract.c 
Log Message:
/me slaps himself for forgetting an "else"
also committing logicdeluxe's patch to prevent 22050Hz from being resampled
to 22050Hz which oggenc apparently doesn't like.



Index: extract.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- extract.c	10 Aug 2003 13:58:10 -0000	1.19
+++ extract.c	12 Aug 2003 14:59:06 -0000	1.20
@@ -221,7 +221,7 @@
 
 		if (sample_rate == 0xa5 || sample_rate == 0xa6)
 			real_samplerate = 11025;
-		if (sample_rate == 0xd2 || sample_rate == 0xd3)
+		else if (sample_rate == 0xd2 || sample_rate == 0xd3)
 			real_samplerate = 22050;
 		else
 			real_samplerate = 1000000 / (256 - sample_rate);
@@ -272,7 +272,11 @@
 			if (oggparms.silent) {
 				strcat(fbuf, "--quiet ");
 			}
-			sprintf(fbuf_temp, "-q %i -r -C 1 --raw-endianness=1 -R %i --resample 22050 %s -o %s",
+
+			if (real_samplerate != 22050)
+				strcat(fbuf, "--resample 22050 ");
+
+			sprintf(fbuf_temp, "-q %i -r -C 1 --raw-endianness=1 -R %i %s -o %s",
 				oggparms.quality, real_samplerate,
 				rawname, mp3name);
 			strcat(fbuf, fbuf_temp);





More information about the Scummvm-git-logs mailing list