Improve cdrdao to handle MSF-length.

Remove vcd_demo_toc.right since the cd-info output is now the same as vcd_demo.right vcd_demo.toc adjusted accordingly.
2005-01-22 23:57:10 +00:00
parent e0cce4558d
commit a352d2c8df
6 changed files with 80 additions and 125 deletions
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.43 2005/01/18 03:46:40 rocky Exp $
+#   $Id: Makefile.am,v 1.44 2005/01/22 23:57:10 rocky Exp $
 #
 #    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
@@ -56,7 +56,7 @@ check_SCRIPTS = check_nrg.sh  check_cue.sh  check_cd_read.sh \

 check_PROGRAMS = $(hack)

-check_DATA = vcd_demo.right vcd_demo_vcdinfo.right vcd_demo_vcdinfo_toc.right \
+check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \
 	     videocd.right videocd.nrg \
 	     cdda.right cdda.toc cdda.cue cdda.bin \
 	     isofs-m1.right isofs-m1.toc isofs-m1.cue isofs-m1.bin \
--- a/test/check_cue.sh.in
+++ b/test/check_cue.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_cue.sh.in,v 1.23 2004/12/31 08:27:49 rocky Exp $
+#$Id: check_cue.sh.in,v 1.24 2005/01/22 23:57:11 rocky Exp $
 # Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
 # (via cd-info).

@@ -72,9 +72,9 @@ if test -f ${srcdir}/${fname}.bin ; then
  check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"

  if test -z "@VCDINFO_LIBS@" ; then
-    right=${srcdir}/${fname}_toc.right
+    right=${srcdir}/${fname}.right
  else
-    right=${srcdir}/${fname}_vcdinfo_toc.right
+    right=${srcdir}/${fname}_vcdinfo.right
  fi
  opts="-q --no-device-info --no-disc-mode -t ${srcdir}/${fname}.toc --iso9660"
  if test -f ${srcdir}/${fname}.toc ; then
--- a/test/vcd_demo.toc
+++ b/test/vcd_demo.toc
@@ -1,4 +1,4 @@
-CD_DA
+CD_ROM_XA

 TRACK MODE2_RAW
 COPY
@@ -11,5 +11,5 @@ START 00:02:00

 TRACK MODE2_RAW
 COPY
-FILE "vcd_demo.bin" 00:20:71 00:00:00
+FILE "vcd_demo.bin" 00:20:71 00:05:14
 START 00:02:00
--- a/test/vcd_demo_toc.right
+++ b/test/vcd_demo_toc.right
@@ -1,91 +0,0 @@
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.
-__________________________________
-
-CD-ROM Track List (1 - 3)
-  #: MSF       LSN    Type   Green? Copy? Channels Premphasis?
-  1: 00:02:00  000000 XA     true   yes  
-  2: 00:17:57  001182 XA     true   yes  
-  3: 00:24:71  001721 XA     true   yes  
-170: 00:53:06  003831 leadout (8 MB raw, 8 MB formatted)
-Media Catalog Number (MCN): not available
-__________________________________
-CD Analysis Report
-CD-ROM with CD-RTOS and ISO 9660 filesystem
-ISO 9660: 1032 blocks, label `V0469                           '
-Application: 
-Preparer   : LKVCDIMAGER 5.0.7.10(WIN32)
-Publisher  : LAURENS KOEHOORN
-System     : CD-RTOS CD-BRIDGE
-Volume     : V0469
-Volume Set : 
-ISO9660 filesystem
-/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  ..
-  d d---1xrxrxr 0 0 [fn 00] [LSN     19]      2048 Jul 14 1978 00:00  ext
-  d d---1xrxrxr 0 0 [fn 00] [LSN     20]      2048 Jul 14 1978 00:00  mpegav
-  d d---1xrxrxr 0 0 [fn 00] [LSN     21]      2048 Jul 14 1978 00:00  segment
-  d d---1xrxrxr 0 0 [fn 00] [LSN     22]      2048 Jul 14 1978 00:00  sources
-  d d---1xrxrxr 0 0 [fn 00] [LSN     25]      2048 Jul 14 1978 00:00  vcd
-
-/EXT/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     19]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  ..
-  - ----1xrxrxr 0 0 [fn 01] [LSN    375]     65536 Jul 14 1978 00:00  lot_x.vcd
-  - ----1xrxrxr 0 0 [fn 01] [LSN    407]       144 Jul 14 1978 00:00  psd_x.vcd
-
-/MPEGAV/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     20]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  ..
-  - ---2-xrxrxr 0 0 [fn 01] [LSN   1182]    904036 (   796672) Jul 14 1978 00:00  avseq01.dat
-  - ---2-xrxrxr 0 0 [fn 02] [LSN   1721]    904036 (   796672) Jul 14 1978 00:00  avseq02.dat
-
-/SEGMENT/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     21]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  ..
-  - ---2-xrxrxr 0 0 [fn 01] [LSN    225]    220780 (   194560) Jul 14 1978 00:00  item0001.dat
-
-/Sources/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     22]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  ..
-  d d---1xrxrxr 0 0 [fn 00] [LSN     23]      2048 Jul 14 1978 00:00  html
-  - ----1xrxrxr 0 0 [fn 01] [LSN    434]       842 Dec 11 2002 10:33  index.htm
-  - ----1xrxrxr 0 0 [fn 01] [LSN    435]   1216557 Jan 07 2003 18:01  menu.ppm
-  - ----1xrxrxr 0 0 [fn 01] [LSN   1030]      2793 Jan 07 2003 18:08  source.xml
-
-/Sources/HTML/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     23]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     22]      2048 Jul 14 1978 00:00  ..
-  - ----1xrxrxr 0 0 [fn 01] [LSN    425]      1067 Jan 07 2003 17:51  0.xml
-  - ----1xrxrxr 0 0 [fn 01] [LSN    426]      1067 Jan 07 2003 17:51  1.xml
-  d d---1xrxrxr 0 0 [fn 00] [LSN     24]      2048 Jul 14 1978 00:00  img
-  - ----1xrxrxr 0 0 [fn 01] [LSN    427]      1327 Jan 07 2003 17:51  movies.css
-  - ----1xrxrxr 0 0 [fn 01] [LSN    428]     12024 Jan 07 2003 17:51  toc.xsl
-
-/Sources/HTML/img/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     24]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     23]      2048 Jul 14 1978 00:00  ..
-  - ----1xrxrxr 0 0 [fn 01] [LSN    408]      1999 Nov 13 2002 07:27  al.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    409]      7626 Jan 07 2003 17:42  loeki_groep_01.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    413]      9986 Jan 07 2003 17:42  loeki_groep_02.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    418]       207 Nov 14 2002 19:33  a_left.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    419]       207 Nov 14 2002 19:33  a_right.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    420]       441 Nov 13 2002 10:54  animatie.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    421]       250 Nov 14 2002 11:44  face_up2.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    422]       259 Nov 13 2002 11:09  familie.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    423]      1010 Nov 14 2002 11:52  goldstar2.gif
-  - ----1xrxrxr 0 0 [fn 01] [LSN    424]      1783 Nov 13 2002 07:15  vcd.gif
-
-/VCD/:
-  d d---1xrxrxr 0 0 [fn 00] [LSN     25]      2048 Jul 14 1978 00:00  .
-  d d---1xrxrxr 0 0 [fn 00] [LSN     18]      2048 Jul 14 1978 00:00  ..
-  - ----1xrxrxr 0 0 [fn 00] [LSN    151]      2048 Jul 14 1978 00:00  entries.vcd
-  - ----1xrxrxr 0 0 [fn 00] [LSN    150]      2048 Jul 14 1978 00:00  info.vcd
-  - ----1xrxrxr 0 0 [fn 00] [LSN    152]     65536 Jul 14 1978 00:00  lot.vcd
-  - ----1xrxrxr 0 0 [fn 00] [LSN    184]        72 Jul 14 1978 00:00  psd.vcd
-
-XA sectors   Video CD   
-session #2 starts at track  2, LSN: 1182, ISO 9660 blocks:   1032
-ISO 9660: 1032 blocks, label `V0469                           '