[xiph-commits] r3311 - in liboggz/trunk: doc src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2007-12-10 22:00:41 -0800 (Mon, 10 Dec 2007)
New Revision: 3311

Modified:
   liboggz/trunk/doc/oggz-comment.1.sgml
   liboggz/trunk/src/tools/oggz-comment.c
Log:
update oggz-comment man page, and correct oggz-comment --help output
for recently added options


Modified: liboggz/trunk/doc/oggz-comment.1.sgml
===================================================================
--- liboggz/trunk/doc/oggz-comment.1.sgml	2007-12-10 08:15:53 UTC (rev 3310)
+++ liboggz/trunk/doc/oggz-comment.1.sgml	2007-12-11 06:00:41 UTC (rev 3311)
@@ -73,11 +73,19 @@
 	<arg choice="opt">--output <parameter>filename</parameter></arg>
       </group>
 
+      <group><arg choice="opt">-c</arg><arg choice="opt">--clear</arg></group>
+
+      <group><arg choice="opt">-a</arg><arg choice="opt">--all</arg></group>
       <group>
 	<arg choice="opt">-s <parameter>serialno</parameter></arg>
 	<arg choice="opt">--serialno <parameter>serialno</parameter></arg>
       </group>
 
+      <group>
+	<arg choice="opt">-t <parameter>content-type</parameter></arg>
+	<arg choice="opt">--type <parameter>content-type</parameter></arg>
+      </group>
+
       <arg choice="plain">filename</arg>
     </cmdsynopsis>
 
@@ -122,7 +130,22 @@
 	      <parameter>filename</parameter>.
 	    </para></listitem>
 	</varlistentry>
+	<varlistentry>
+	  <term>-c, --clear</term>
+	  <listitem><para>Clear comments before editing.</para></listitem>
+	</varlistentry>
+      </variablelist>
+	<varlistentry>
+	  <term>-a, --all</term>
+	  <listitem><para>Edit comments for all logical bitstreams.</para></listitem>
+	</varlistentry>
+      </variablelist>
         <varlistentry>
+          <term>-t <parameter>content-type</parameter>, --type <parameter>content-type</parameter></term>
+          <listitem><para>Edit comments of the logical bitstreams with
+               specified <parameter>content-type</parameter>.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term>-s <parameter>serialno</parameter>, --serialno <parameter>serialno</parameter></term>
           <listitem><para>Edit comments of the logical bitstream with
                specified <parameter>serialno</parameter>.</para></listitem>

Modified: liboggz/trunk/src/tools/oggz-comment.c
===================================================================
--- liboggz/trunk/src/tools/oggz-comment.c	2007-12-10 08:15:53 UTC (rev 3310)
+++ liboggz/trunk/src/tools/oggz-comment.c	2007-12-11 06:00:41 UTC (rev 3311)
@@ -58,9 +58,9 @@
   printf ("                         Specify output filename\n");
   printf ("  -c, --clear            Clear comments before editing\n");
   printf ("  -a, --all              Edit comments for all logical bitstreams\n");
-  printf ("  -t content-type, --serialno content-type\n");
-  printf ("                         Edit comments of the logical bitstream with\n");
-  printf ("                         specified serialno\n");
+  printf ("  -t content-type, --type content-type\n");
+  printf ("                         Edit comments of the logical bitstreams with\n");
+  printf ("                         specified content-type\n");
   printf ("  -s serialno, --serialno serialno\n");
   printf ("                         Edit comments of the logical bitstream with\n");
   printf ("                         specified serialno\n");
@@ -270,13 +270,15 @@
        comments[temp = 0].name = "0";
       }
       serialno = -11;
-    } else if(!strcmp(argv[i], "-t")) {
+    } else if(!strcmp(argv[i], "-t")
+           || !strcmp(argv[i], "--type")) {
       if(comment_table_insert(type_table, comment_table, serialno, comments)) {
        comments = calloc(argc - 2, sizeof(OggzComment));
        comments[temp = 0].name = "0";
       }
       serialno = strto_oggz_content(argv[++i]) * -1;
-    } else if(!strcmp(argv[i], "-s")) {
+    } else if(!strcmp(argv[i], "-s")
+           || !strcmp(argv[i], "--serialno")) {
       if(comment_table_insert(type_table, comment_table, serialno, comments)) {
        comments = calloc(argc - 2, sizeof(OggzComment));
        comments[temp = 0].name = "0";