[xiph-commits] r3294 - liboggz/trunk/src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2007-12-06 21:01:04 -0800 (Thu, 06 Dec 2007)
New Revision: 3294

Modified:
   liboggz/trunk/src/tools/oggzdump.c
Log:
display "calc. gpos" instead of appending "(VIRT)" for calculated granulepos
in oggzdump 


Modified: liboggz/trunk/src/tools/oggzdump.c
===================================================================
--- liboggz/trunk/src/tools/oggzdump.c	2007-12-07 03:48:25 UTC (rev 3293)
+++ liboggz/trunk/src/tools/oggzdump.c	2007-12-07 05:01:04 UTC (rev 3294)
@@ -256,14 +256,17 @@
   fprintf (outfile, ": serialno %010ld, ",
 	   oddata->hide_serialno ? -1 : serialno);
 
-  fprintf (outfile, "granulepos ");
   if (oddata->hide_granulepos) {
-    fprintf (outfile, "gGg");
+    fprintf (outfile, "granulepos gGg");
   } else {
+    if (op->granulepos == -1) {
+      fprintf (outfile, "calc. gpos ");
+    } else {
+      fprintf (outfile, "granulepos ");
+    }
     ot_fprint_granulepos (outfile, oggz, serialno, calced_gp);
-    if (op->granulepos == -1) {
-      fprintf (outfile, " (VIRT)");
-    } else if (op->granulepos != calced_gp) {
+
+    if (op->granulepos != -1 && op->granulepos != calced_gp) {
       fprintf (outfile, " ERR: file gp ");
       ot_fprint_granulepos (outfile, oggz, serialno, op->granulepos);
     }