diff --git a/src/cd-info.c b/src/cd-info.c index 69cd3a7b..012af12a 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -1,5 +1,5 @@ /* - $Id: cd-info.c,v 1.59 2004/05/04 02:06:48 rocky Exp $ + $Id: cd-info.c,v 1.60 2004/05/09 17:05:34 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein Copyright (C) 1996, 1997, 1998 Gerd Knorr @@ -877,28 +877,26 @@ main(int argc, const char *argv[]) printf(STRONG "CD-ROM Track List (%i - %i)\n" NORMAL, first_track_num, num_tracks); - printf(" #: MSF LSN Type Green?\n"); + printf(" #: MSF LSN Type Green?\n"); } /* Read and possibly print track information. */ for (i = first_track_num; i <= CDIO_CDROM_LEADOUT_TRACK; i++) { msf_t msf; - + char *psz_msf; + if (!cdio_get_track_msf(cdio, i, &msf)) { err_exit("cdio_track_msf for track %i failed, I give up.\n", i); } + psz_msf = cdio_msf_to_str(&msf); if (i == CDIO_CDROM_LEADOUT_TRACK) { if (!opts.no_tracks) - printf("%3d: %2.2x:%2.2x:%2.2x %06lu leadout\n", - (int) i, - msf.m, msf.s, msf.f, + printf("%3d: %9s %06lu leadout\n", (int) i, psz_msf, (long unsigned int) cdio_msf_to_lsn(&msf)); break; } else if (!opts.no_tracks) { - printf("%3d: %2.2x:%2.2x:%2.2x %06lu %-5s %s\n", - (int) i, - msf.m, msf.s, msf.f, + printf("%3d: %9s %06lu %-5s %s\n", (int) i, psz_msf, (long unsigned int) cdio_msf_to_lsn(&msf), track_format2str[cdio_get_track_format(cdio, i)], cdio_get_track_green(cdio, i)? "true" : "false"); diff --git a/test/cdda.right b/test/cdda.right index d0565b78..8aa4e1ba 100644 --- a/test/cdda.right +++ b/test/cdda.right @@ -15,9 +15,9 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 audio false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 audio false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/check_opts2.right b/test/check_opts2.right index e641f68e..9cf3dbed 100644 --- a/test/check_opts2.right +++ b/test/check_opts2.right @@ -15,7 +15,7 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 diff --git a/test/check_opts3.right b/test/check_opts3.right index e641f68e..9cf3dbed 100644 --- a/test/check_opts3.right +++ b/test/check_opts3.right @@ -15,7 +15,7 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 diff --git a/test/check_opts4.right b/test/check_opts4.right index ac645c52..f28adb2c 100644 --- a/test/check_opts4.right +++ b/test/check_opts4.right @@ -15,9 +15,9 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/check_opts5.right b/test/check_opts5.right index ac645c52..f28adb2c 100644 --- a/test/check_opts5.right +++ b/test/check_opts5.right @@ -15,9 +15,9 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/check_opts6.right b/test/check_opts6.right index ac645c52..f28adb2c 100644 --- a/test/check_opts6.right +++ b/test/check_opts6.right @@ -15,9 +15,9 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/check_opts7.right b/test/check_opts7.right index ac645c52..f28adb2c 100644 --- a/test/check_opts7.right +++ b/test/check_opts7.right @@ -15,9 +15,9 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/data7.toc b/test/data7.toc new file mode 100644 index 00000000..a99bfb26 --- /dev/null +++ b/test/data7.toc @@ -0,0 +1,13 @@ +// $Id: data7.toc,v 1.1 2004/05/09 17:05:34 rocky Exp $ +// Video CD +// + +CD_ROM_XA + +TRACK MODE1 // ISO filesystem +FILE "vcd_demo.bin" 00:00:00 00:13:57 + +TRACK MODE2_FORM_MIX // XA track with form 1 and form 2 sectors +PREGAP 0:2:0 +FILE "vcd_demo.bin" 00:20:71 00:00:00 + diff --git a/test/isofs-m1.right b/test/isofs-m1.right index 8afb6280..09eb7fb0 100644 --- a/test/isofs-m1.right +++ b/test/isofs-m1.right @@ -15,9 +15,9 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 1) - #: MSF LSN Type Green? - 1: 00:02:00 000000 data false -170: 00:06:02 000302 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 data false +170: 000:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/monvoisin.right b/test/monvoisin.right index c9626cfe..a35c89e8 100644 --- a/test/monvoisin.right +++ b/test/monvoisin.right @@ -15,10 +15,10 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 2) - #: MSF LSN Type Green? - 1: 00:02:00 000000 XA true - 2: 00:18:51 001251 XA true -170: 00:39:71 002846 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 XA true + 2: 000:18.51 001251 XA true +170: 000:39.71 002846 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/svcd_ogt_test_ntsc.right b/test/svcd_ogt_test_ntsc.right index 479c4bcf..53ea1e64 100644 --- a/test/svcd_ogt_test_ntsc.right +++ b/test/svcd_ogt_test_ntsc.right @@ -15,10 +15,10 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 2) - #: MSF LSN Type Green? - 1: 00:02:00 000000 XA true - 2: 00:09:01 000526 XA true -170: 00:56:56 004106 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 XA true + 2: 000:09.01 000526 XA true +170: 000:56.56 004106 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/svcdgs.right b/test/svcdgs.right index 8e5d4bf1..c8ec6364 100644 --- a/test/svcdgs.right +++ b/test/svcdgs.right @@ -15,10 +15,10 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 2) - #: MSF LSN Type Green? - 1: 00:02:00 000000 XA true - 2: 00:22:53 001553 XA true -170: 01:17:62 005687 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 XA true + 2: 000:22.53 001553 XA true +170: 001:17.62 005687 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/vcd_demo_vcdinfo.right b/test/vcd_demo_vcdinfo.right index 5fc69e1b..be7f2f98 100644 --- a/test/vcd_demo_vcdinfo.right +++ b/test/vcd_demo_vcdinfo.right @@ -15,11 +15,11 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 3) - #: MSF LSN Type Green? - 1: 00:02:00 000000 XA true - 2: 00:17:57 001182 XA true - 3: 00:24:71 001721 XA true -170: 00:30:10 002110 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 XA true + 2: 000:17.57 001182 XA true + 3: 000:24.71 001721 XA true +170: 000:30.10 002110 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/videocd.right b/test/videocd.right index 3033af1b..2095daa1 100644 --- a/test/videocd.right +++ b/test/videocd.right @@ -15,13 +15,13 @@ Digital Versital Disc: No Can write DVD-RAM : No __________________________________ CD-ROM Track List (1 - 5) - #: MSF LSN Type Green? - 1: 00:02:00 000000 XA true - 2: 00:13:01 000826 XA true - 3: 00:16:01 001051 XA true - 4: 00:19:01 001276 XA true - 5: 00:22:01 001501 XA true -170: 00:25:01 001726 leadout + #: MSF LSN Type Green? + 1: 000:02.00 000000 XA true + 2: 000:13.01 000826 XA true + 3: 000:16.01 001051 XA true + 4: 000:19.01 001276 XA true + 5: 000:22.01 001501 XA true +170: 000:25.01 001726 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report