bitmath: Finish up optimizations

[platform/upstream/flac.git] / src / metaflac / usage.c

diff --git a/src/metaflac/usage.c b/src/metaflac/usage.c
index f85d395..8e64833 100644 (file)
--- a/src/metaflac/usage.c
+++ b/src/metaflac/usage.c
@@ -1,5 +1,5 @@
 /* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@ static void usage_header(FILE *out)
 {
        fprintf(out, "==============================================================================\n");
        fprintf(out, "metaflac - Command-line FLAC metadata editor version %s\n", FLAC__VERSION_STRING);
-       fprintf(out, "Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson\n");
+       fprintf(out, "Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson\n");
        fprintf(out, "\n");
        fprintf(out, "This program is free software; you can redistribute it and/or\n");
        fprintf(out, "modify it under the terms of the GNU General Public License\n");
@@ -62,7 +62,8 @@ static void usage_summary(FILE *out)
        fprintf(out, "--no-filename         Do not prefix each output line with the FLAC file name\n");
        fprintf(out, "                      (the default if only one FLAC file is specified)\n");
        fprintf(out, "--no-utf8-convert     Do not convert tags from UTF-8 to local charset,\n");
-       fprintf(out, "                      or vice versa.  This is useful for scripts.\n");
+       fprintf(out, "                      or vice versa.  This is useful for scripts, and setting\n");
+       fprintf(out, "                      tags in situations where the locale is wrong.\n");
        fprintf(out, "--dont-use-padding    By default metaflac tries to use padding where possible\n");
        fprintf(out, "                      to avoid rewriting the entire file if the metadata size\n");
        fprintf(out, "                      changes.  Use this option to tell metaflac to not take\n");
@@ -150,11 +151,14 @@ int long_usage(const char *message, ...)
        fprintf(out, "--export-cuesheet-to=FILE  Export CUESHEET block to a cuesheet file, suitable\n");
        fprintf(out, "                      for use by CD authoring software.  Use '-' for stdout.\n");
        fprintf(out, "                      Only one FLAC file may be specified on the command line.\n");
-       fprintf(out, "--import-picture-from=SPECIFICATION  Import a picture and store it in a PICTURE\n");
-       fprintf(out, "                      block.  The SPECIFICATION is a string whose parts are\n");
-       fprintf(out, "                      separated by | characters.  Some parts may be left empty\n");
-       fprintf(out, "                      to invoke default values.  The specification format is:\n");
-       fprintf(out, "         [TYPE]|MIME-TYPE|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE\n");
+       fprintf(out, "--import-picture-from=FILENAME|SPECIFICATION  Import a picture and store it in a\n");
+       fprintf(out, "                      PICTURE block.  Either a filename for the picture file or\n");
+       fprintf(out, "                      a more complete specification form can be used.  The\n");
+       fprintf(out, "                      SPECIFICATION is a string whose parts are separated by |\n");
+       fprintf(out, "                      characters.  Some parts may be left empty to invoke\n");
+       fprintf(out, "                      default values.  FILENAME is just shorthand for\n");
+       fprintf(out, "                      \"||||FILENAME\".  The format of SPECIFICATION is:\n");
+       fprintf(out, "         [TYPE]|[MIME-TYPE]|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE\n");
        fprintf(out, "           TYPE is optional; it is a number from one of:\n");
        fprintf(out, "              0: Other\n");
        fprintf(out, "              1: 32x32 pixels 'file icon' (PNG only)\n");
@@ -179,10 +183,11 @@ int long_usage(const char *message, ...)
        fprintf(out, "             20: Publisher/Studio logotype\n");
        fprintf(out, "             The default is 3 (front cover).  There may only be one picture each\n");
        fprintf(out, "             of type 1 and 2 in a file.\n");
-       fprintf(out, "           MIME-TYPE is mandatory; for best compatibility with players, use\n");
-       fprintf(out, "             pictures with MIME type image/jpeg or image/png.  The MIME type can\n");
-       fprintf(out, "             also be --> to mean that FILE is actually a URL to an image, though\n");
-       fprintf(out, "             this use is discouraged.\n");
+       fprintf(out, "           MIME-TYPE is optional; if left blank, it will be detected from the\n");
+       fprintf(out, "             file.  For best compatibility with players, use pictures with MIME\n");
+       fprintf(out, "             type image/jpeg or image/png.  The MIME type can also be --> to\n");
+       fprintf(out, "             mean that FILE is actually a URL to an image, though this use is\n");
+       fprintf(out, "             discouraged.\n");
        fprintf(out, "           DESCRIPTION is optional; the default is an empty string\n");
        fprintf(out, "           The next part specfies the resolution and color information.  If\n");
        fprintf(out, "             the MIME-TYPE is image/jpeg, image/png, or image/gif, you can\n");