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

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

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

Modified Files:
	vcddump.c 
Log Message:
Remove some more magic 150 constants and use the lba2msf conversion
routine. variable "extent" renamed "lsn" since that's what it is.


Index: vcddump.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/vcdimager-0.7.12-rocky/frontends/cli/vcddump.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vcddump.c	28 Dec 2002 13:38:29 -0000	1.13
+++ vcddump.c	29 Dec 2002 22:56:52 -0000	1.14
@@ -514,13 +514,13 @@
     for (n = 0; n < num_entries; n++)
       {
         const msf_t *msf = vcdinfo_get_entry_msf(obj, n);
-        const uint32_t extent = msf_to_lba(msf) - PREGAP_SECTORS;
+        const uint32_t lsn = vcdinfo_lba2lsn(msf_to_lba(msf));
         
         fprintf (stdout, " ENTRY[%2.2d]: track# %d (SEQUENCE[%d]), LSN %d "
                  "(msf %2.2x:%2.2x:%2.2x)\n",
                  n, vcdinfo_get_track(obj, n),
                  vcdinfo_get_track(obj, n) - 1,               
-                 extent,
+                 lsn,
                  msf->m, msf->s, msf->f);
       }
 }
@@ -658,7 +658,7 @@
       for (n = 0; n < scandata_count; n++)
         {
           const msf_t *msf = &_sd_v2->points[n];
-          const uint32_t extent = msf_to_lba (msf) - 150;
+          const uint32_t lsn = vcdinfo_lba2lsn(msf_to_lba(msf));
 
           if (!gl.verbose_flag 
               && n > PRINTED_POINTS
@@ -666,7 +666,7 @@
             continue;
 
           fprintf (stdout, "  scanpoint[%.4d]: LSN %u (msf %2.2x:%2.2x:%2.2x)\n",
-                   n, extent, msf->m, msf->s, msf->f);
+                   n, lsn, msf->m, msf->s, msf->f);
 
           if (!gl.verbose_flag
               && n == PRINTED_POINTS
@@ -727,15 +727,16 @@
       for (n = 0; n < scandata_count; n++)
         {
           const msf_t *msf = &_sd4->scandata_table[n];
-          const uint32_t extent = msf_to_lba (msf) - 150;
+          const uint32_t lsn = vcdinfo_lba2lsn(msf_to_lba(msf));
 
           if (!gl.verbose_flag 
               && n > PRINTED_POINTS
               && n < scandata_count - PRINTED_POINTS)
             continue;
 
-          fprintf (stdout, "  scanpoint[%.4d] (ofs:%5d): LSN %u (msf %2.2x:%2.2x:%2.2x)\n",
-                   n, scandata_ofs0 + (n * 3), extent, msf->m, msf->s, msf->f);
+          fprintf (stdout, 
+                   "  scanpoint[%.4d] (ofs:%5d): LSN %u (msf %2.2x:%2.2x:%2.2x)\n",
+                   n, scandata_ofs0 + (n * 3), lsn, msf->m, msf->s, msf->f);
 
           if (!gl.verbose_flag
               && n == PRINTED_POINTS
@@ -765,7 +766,7 @@
     {
       unsigned hh, mm, ss, ss2;
       const msf_t *msf = &(searchdat->points[m]);
-      const uint32_t extent = msf_to_lba(msf) - 150;
+      const uint32_t lsn = vcdinfo_lba2lsn(msf_to_lba(msf));
 
       if (!gl.verbose_flag 
           && m > PRINTED_POINTS 
@@ -781,7 +782,7 @@
 
       fprintf (stdout, " scanpoint[%.4d]: (real time: %.2d:%.2d:%.2d.%.1d) "
                " sector: LSN %u (msf %.2x:%.2x:%.2x)\n", m, hh, mm, ss, ss2,
-               extent, msf->m, msf->s, msf->f);
+               lsn, msf->m, msf->s, msf->f);
       
       if (!gl.verbose_flag
           && m == PRINTED_POINTS && scan_points > (PRINTED_POINTS * 2))