[Scummvm-cvs-logs] CVS: tools extract.c,1.41,1.42 simon2mp3.c,1.34,1.35 sword2mp3.c,1.2,1.3

[Max Horn]

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

Modified Files:
	extract.c simon2mp3.c sword2mp3.c 
Log Message:
Unify usage text

Index: extract.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- extract.c	10 Apr 2004 23:28:40 -0000	1.41
+++ extract.c	5 Dec 2004 02:19:49 -0000	1.42
@@ -169,7 +169,7 @@
 	printf(" --silent     the output of oggenc is hidden (default:disabled)\n");
 
 	printf("\nFlac mode params:\n");
-	printf(" [params]     optional Arguments passed directly to the Encoder\n");
+	printf(" [params]     optional arguments passed directly to the encoder\n");
 	printf("              recommended is: --best -b 1152\n");
 
 	printf("\n --help     this help message\n");

Index: simon2mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/simon2mp3.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- simon2mp3.c	10 Apr 2004 21:20:57 -0000	1.34
+++ simon2mp3.c	5 Dec 2004 02:19:49 -0000	1.35
@@ -151,33 +151,32 @@
 	printf("\nUsage: %s <params> [<file> | mac]\n", exename);
 
 	printf("\nParams:\n");
-
-	printf("--mp3        encode to MP3 format (default)\n");
-	printf("--vorbis     encode to Vorbis format\n");
-	printf("--flac       encode to Flac format\n");
+	printf(" --mp3        encode to MP3 format (default)\n");
+	printf(" --vorbis     encode to Vorbis format\n");
+	printf(" --flac       encode to Flac format\n");
 	printf("(If one of these is specified, it must be the first parameter.)\n");
 
 	printf("\nMP3 mode params:\n");
-	printf("-b <rate>    <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%i)\n", minBitrDef);
-	printf("-B <rate>    <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
-	printf("--vbr        LAME uses the VBR mode (default)\n");
-	printf("--abr        LAME uses the ABR mode\n");
-	printf("-V <value>   specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
-	printf("-q <value>   specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
-	printf("--silent     the output of LAME is hidden (default:disabled)\n");
+	printf(" -b <rate>    <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%i)\n", minBitrDef);
+	printf(" -B <rate>    <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
+	printf(" --vbr        LAME uses the VBR mode (default)\n");
+	printf(" --abr        LAME uses the ABR mode\n");
+	printf(" -V <value>   specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
+	printf(" -q <value>   specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
+	printf(" --silent     the output of LAME is hidden (default:disabled)\n");
 
 	printf("\nVorbis mode params:\n");
-	printf("-b <rate>    <rate> is the nominal bitrate (default:unset)\n");
-	printf("-m <rate>    <rate> is the minimum bitrate (default:unset)\n");
-	printf("-M <rate>    <rate> is the maximum bitrate (default:unset)\n");
-	printf("-q <value>   specifies the value (0 - 10) of VBR quality (10=best) (default:%i)\n", oggqualDef);
-	printf("--silent     the output of oggenc is hidden (default:disabled)\n");
+	printf(" -b <rate>    <rate> is the nominal bitrate (default:unset)\n");
+	printf(" -m <rate>    <rate> is the minimum bitrate (default:unset)\n");
+	printf(" -M <rate>    <rate> is the maximum bitrate (default:unset)\n");
+	printf(" -q <value>   specifies the value (0 - 10) of VBR quality (10=best) (default:%i)\n", oggqualDef);
+	printf(" --silent     the output of oggenc is hidden (default:disabled)\n");
 
 	printf("\nFlac mode params:\n");
-	printf("[params]     optional Arguments passed to the Encoder\n");
-	printf("             recommended is: --best -b 1152\n");
+	printf(" [params]     optional arguments passed directly to the encoder\n");
+	printf("              recommended is: --best -b 1152\n");
 
-	printf("\n--help     this help message\n");
+	printf("\n --help     this help message\n");
 
 	printf("\n\nIf a parameter is not given the default value is used\n");
 	printf("If using VBR mode for MP3 -b and -B must be multiples of 8; the maximum is 160!\n");

Index: sword2mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/sword2mp3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sword2mp3.c	23 Aug 2004 17:00:34 -0000	1.2
+++ sword2mp3.c	5 Dec 2004 02:19:49 -0000	1.3
@@ -55,7 +55,7 @@
 	printf(" --silent     the output of oggenc is hidden (default:disabled)\n");
 
 	printf("\nFlac mode params:\n");
-	printf(" [params]     optional Arguments passed directly to the Encoder\n");
+	printf(" [params]     optional arguments passed directly to the encoder\n");
 	printf("              recommended is: --best -b 1152\n");
 
 	printf("\n --help     this help message\n");