[xine-cvs] CVS: xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli vcddump.c,1.28,1.29

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli
In directory sc8-pr-cvs1:/tmp/cvs-serv27787/vcdimager-0.7.12-rocky/frontends/cli

Modified Files:
	vcddump.c 
Log Message:
Support for "default" selection in selection lists.



Index: vcddump.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli/vcddump.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vcddump.c	27 Jan 2003 03:21:24 -0000	1.28
+++ vcddump.c	2 Feb 2003 20:28:34 -0000	1.29
@@ -66,6 +66,7 @@
   */
   int verbose_flag;
   int quiet_flag;
+  int suppress_warnings;
 
   struct show_t
   {
@@ -339,6 +340,7 @@
             const PsdSelectionListDescriptor *d =
               (const void *) (psd + _rofs);
             int i;
+            const unsigned int lid=vcdinfo_get_lid_from_psd(d);
 
             fprintf (stdout,
                      "  PSD[%.2d] (%s): %sselection list descriptor\n"
@@ -352,12 +354,12 @@
                      *(uint8_t *) &d->flags,
                      d->nos, 
                      vcdinfo_get_bsn(d),
-                     vcdinfo_get_lid_from_psd(d),
+                     lid, 
                      _vcd_bool_str (vcdinfo_get_lid_rejected_from_psd(d)),
                      vcdinfo_ofs2str (obj, vcdinfo_get_prev_from_psd(d), ext),
                      vcdinfo_ofs2str (obj, vcdinfo_get_next_from_psd(d), ext),
                      vcdinfo_ofs2str (obj, vcdinfo_get_return_from_psd(d),ext),
-                     vcdinfo_ofs2str (obj, uint16_from_be (d->default_ofs), ext),
+                     vcdinfo_ofs2str (obj, vcdinfo_get_default(obj, lid), ext),
                      vcdinfo_ofs2str (obj, vcdinfo_get_timeout_LID(d), ext),
                      vcdinfo_get_timeout_time(d),
                      vcdinfo_get_loop_count(d), _vcd_bool_str (0x80 & d->loop),
@@ -569,7 +571,7 @@
     for (n = 0; n < num_entries; n++)
       {
         const msf_t *msf = vcdinfo_get_entry_msf(obj, n);
-        const uint32_t lsn = vcdinfo_lba2lsn(msf_to_lba(msf));
+        const lsn_t lsn = vcdinfo_lba2lsn(msf_to_lba(msf));
         
         fprintf (stdout, " ENTRY[%2.2d]: track# %2d (SEQUENCE[%d]), LSN %6d "
                  "(MSF %2.2x:%2.2x:%2.2x)\n",
@@ -636,7 +638,6 @@
                ogt_str[tracks2->contents[j].ogt]);
     }
 
-
   fprintf (stdout, "\nCVD interpretation (probably)\n");
   for (j = 0;j < tracks->tracks; j++)
     {
@@ -1114,6 +1115,19 @@
     
   if (open_rc == VCDINFO_OPEN_OTHER) {
     vcd_warn ("Medium is not VCD image");
+    if (gl.show.fs) 
+      {
+        if (vcdinfo_has_xa(&obj))
+        {
+          /* Suppress XA warnings */
+          int old_suppress_warnings = gl.suppress_warnings;
+          if (!gl.show.no.delimiter) fprintf (stdout, DELIM);
+          gl.suppress_warnings=1;
+          dump_fs (&obj);
+          gl.suppress_warnings=old_suppress_warnings;
+        }
+      }
+
     if (gl.show.tracks) {
       if (!gl.show.no.delimiter) fprintf (stdout, DELIM);
       dump_tracks (&obj);
@@ -1251,6 +1265,9 @@
     return;
 
   if (level == LOG_INFO && gl.quiet_flag)
+    return;
+  
+  if (level == LOG_WARN && gl.suppress_warnings)
     return;
   
   gl_default_vcd_log_handler (level, message);