[Scummvm-cvs-logs] CVS: tools simon2mp3.c,1.19,1.20 extract-common.c,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Sun Nov 9 06:02:22 CET 2003


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

Modified Files:
	simon2mp3.c extract-common.c 
Log Message:
cleanup

Index: simon2mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/simon2mp3.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- simon2mp3.c	9 Nov 2003 13:50:03 -0000	1.19
+++ simon2mp3.c	9 Nov 2003 14:01:57 -0000	1.20
@@ -25,7 +25,6 @@
 unsigned int offsets[32768];
 
 char infile_base[256];
-char fbuf_temp[1024];
 char buf[256];
 
 void end(void)
@@ -191,7 +190,8 @@
 	int length;
 	FILE *f;
 	char fbuf[2048];
-	int size;
+	char *tmp;
+	size_t size;
 	char wavname[256];
 	char outname[256];
 
@@ -200,9 +200,8 @@
 	length += 8;
 	fseek(input, -8, SEEK_CUR);
 
+	/* Copy the WAV data to a temporary file */
 	sprintf(wavname, "tempfile.wav");
-	sprintf(outname, oggmode ? TEMP_OGG : TEMP_MP3);
-
 	f = fopen(wavname, "wb");
 	while (length > 0) {
 		size = fread(fbuf, 1, length > 2048 ? 2048 : length, input);
@@ -213,36 +212,37 @@
 	}
 	fclose(f);
 
+	/* Convert the WAV temp file to OGG/MP3 */
+	/* TODO: Unify this with the conversion code in get_voc() */
+	sprintf(outname, oggmode ? TEMP_OGG : TEMP_MP3);
+	tmp = fbuf;
 	if (oggmode) {
-		sprintf(fbuf, "oggenc ");
-		if (oggparms.nominalBitr != -1) {
-			sprintf(fbuf_temp, "-b %i ", oggparms.nominalBitr);
-			strcat(fbuf, fbuf_temp);
-		}
-		if (oggparms.minBitr != -1) {
-			sprintf(fbuf_temp, "-m %i ", oggparms.minBitr);
-			strcat(fbuf, fbuf_temp);
-		}
-		if (oggparms.maxBitr != -1) {
-			sprintf(fbuf_temp, "-M %i ", oggparms.maxBitr);
-			strcat(fbuf, fbuf_temp);
-		}
-		if (oggparms.silent) {
-			strcat(fbuf, "--quiet ");
-		}
-		strcat(fbuf, fbuf_temp);
+		tmp += sprintf(tmp, "oggenc ");
+		if (oggparms.nominalBitr != -1)
+			tmp += sprintf(tmp, "--bitrate=%i ", oggparms.nominalBitr);
+		if (oggparms.minBitr != -1)
+			tmp += sprintf(tmp, "--min-bitrate=%i ", oggparms.minBitr);
+		if (oggparms.maxBitr != -1)
+			tmp += sprintf(tmp, "--max-bitrate=%i ", oggparms.maxBitr);
+		if (oggparms.silent)
+			tmp += sprintf(tmp, "--quiet ");
+		tmp += sprintf(tmp, "--quality=%i ", oggparms.quality);
+		tmp += sprintf(tmp, "--output=%s ", outname);
+		tmp += sprintf(tmp, "%s ", wavname);
 		system(fbuf);
 	} else {
+		tmp += sprintf(tmp, "lame -t -m m ");
 		if (encparms.abr == 1)
-			sprintf(fbuf_temp,"--abr %i",encparms.minBitr);
+			tmp += sprintf(tmp, "--abr %i ", encparms.minBitr);
 		else
-			sprintf(fbuf_temp,"--vbr-new -b %i",encparms.minBitr);
+			tmp += sprintf(tmp, "--vbr-new -b %i ", encparms.minBitr);
 		if (encparms.silent == 1)
-			strcat(fbuf_temp," --silent");
-		sprintf(fbuf,
-			"lame -t -q %i %s -V %i -B %i -m m %s %s",
-			encparms.algqual, fbuf_temp, encparms.vbrqual,
-			encparms.maxBitr, wavname, outname);
+			tmp += sprintf(tmp, " --silent ");
+
+		tmp += sprintf(tmp, "-q %i ", encparms.algqual);
+		tmp += sprintf(tmp, "-V %i ", encparms.vbrqual);
+		tmp += sprintf(tmp, "-B %i ", encparms.maxBitr);
+		tmp += sprintf(tmp, "%s %s ", wavname, outname);
 		system(fbuf);
 	}
 }

Index: extract-common.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract-common.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract-common.c	9 Nov 2003 13:50:03 -0000	1.2
+++ extract-common.c	9 Nov 2003 14:01:58 -0000	1.3
@@ -95,10 +95,14 @@
 		fclose(f);
 
 		/* Convert the raw temp file to OGG/MP3 */
+		/* TODO: Unify this with the conversion code in get_wav() */
 		sprintf(outname, oggmode ? TEMP_OGG : TEMP_MP3);
 		tmp = fbuf;
 		if (oggmode) {
-			tmp += sprintf(tmp, "oggenc --raw --raw-chan=1 --raw-bits=8 ");
+			tmp += sprintf(tmp, "oggenc ");
+			tmp += sprintf(tmp, "--raw --raw-chan=1 --raw-bits=8 ");
+			tmp += sprintf(tmp, "--raw-rate=%i ", real_samplerate);
+
 			if (oggparms.nominalBitr != -1)
 				tmp += sprintf(tmp, "--bitrate=%i ", oggparms.nominalBitr);
 			if (oggparms.minBitr != -1)
@@ -107,25 +111,24 @@
 				tmp += sprintf(tmp, "--max-bitrate=%i ", oggparms.maxBitr);
 			if (oggparms.silent)
 				tmp += sprintf(tmp, "--quiet ");
-
 			tmp += sprintf(tmp, "--quality=%i ", oggparms.quality);
-			tmp += sprintf(tmp, "--raw-rate=%i ", real_samplerate);
 			tmp += sprintf(tmp, "--output=%s ", outname);
 			tmp += sprintf(tmp, "%s ", rawname);
 			system(fbuf);
 		} else {
-			tmp += sprintf(tmp, "lame -t -m m -r --bitwidth 8 ");
+			tmp += sprintf(tmp, "lame -t -m m ");
+			tmp += sprintf(tmp, "-r --bitwidth 8 ");
+			tmp += sprintf(tmp, "-s %d ", real_samplerate);
+
 			if (encparms.abr == 1)
 				tmp += sprintf(tmp, "--abr %i ", encparms.minBitr);
 			else
 				tmp += sprintf(tmp, "--vbr-new -b %i ", encparms.minBitr);
 			if (encparms.silent == 1)
 				tmp += sprintf(tmp, " --silent ");
-
 			tmp += sprintf(tmp, "-q %i ", encparms.algqual);
 			tmp += sprintf(tmp, "-V %i ", encparms.vbrqual);
 			tmp += sprintf(tmp, "-B %i ", encparms.maxBitr);
-			tmp += sprintf(tmp, "-s %d ", real_samplerate);
 			tmp += sprintf(tmp, "%s %s ", rawname, outname);
 			system(fbuf);
 		}





More information about the Scummvm-git-logs mailing list