[xiph-cvs] cvs commit: vorbis-tools/oggenc oggenc.c

[Michael Smith]

msmith      02/03/23 06:19:48

  Modified:    oggenc   oggenc.c
  Log:
  Make use of --managed mandatory when using -b, -m, or -M.
  Update some documentation a little bit.

Revision  Changes    Path
1.52      +8 -5      vorbis-tools/oggenc/oggenc.c

Index: oggenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/oggenc.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- oggenc.c	2002/03/21 07:37:21	1.51
+++ oggenc.c	2002/03/23 14:19:47	1.52
@@ -323,8 +323,7 @@
                     "(for example, certain audio streaming applications).\n"
                     "Usage of the bitrate management engine will generally decrease quality,\n"
                     "using the normal fully VBR modes (quality specified using -q) is\n"
-                    "very highly recommended for most users.\n"
-                    "Usage of the --managed option will become MANDATORY in the next release.\n\n"));
+                    "very highly recommended for most users.\n\n"));
 }
 
 static void usage(void)
@@ -344,7 +343,9 @@
         " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
                 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
                 "                      to encode at a bitrate averaging this. Takes an\n"
-		"                      argument in kbps.\n"
+		"                      argument in kbps. This uses the bitrate management\n"
+        "                      engine, and is not recommended for most users.\n"
+        "                      See -q, --quality for a better alternative.\n"
                 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
                 "                      encoding for a fixed-size channel.\n"
                 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
@@ -518,7 +519,9 @@
                 {
                         case 0:
                 if(!strcmp(long_options[option_index].name, "managed")) {
-                    fprintf(stderr, _("Enabling bitrate management engine\n"));
+                    if(!opt->quiet)
+                        fprintf(stderr, 
+                                _("Enabling bitrate management engine\n"));
                     opt->managed = 1;
                 }
                 else if(!strcmp(long_options[option_index].name, 
@@ -573,7 +576,7 @@
                         case 'b':
                 if(!opt->managed) {
                     print_deprecated_message();
-                    opt->managed = 1;
+                    exit(1);
                 }
 
                                    if(sscanf(optarg, "%d", &opt->nominal_bitrate)

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.