From 729b48f1a8d100d83953de02d272808897bd9d01 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 5 Jun 2004 02:49:21 +0000 Subject: [PATCH] Go back to two-digit format for minutes in MSF. CD's really can't have more than 99 minutes in them. So we shouldn't give the illusion they can. --- lib/sector.c | 6 +++--- test/cdda-mcn.right | 4 ++-- test/cdda.right | 4 ++-- test/check_opts2.right | 4 ++-- test/check_opts3.right | 4 ++-- test/check_opts4.right | 4 ++-- test/check_opts5.right | 4 ++-- test/check_opts6.right | 4 ++-- test/check_opts7.right | 4 ++-- test/isofs-m1.right | 4 ++-- test/monvoisin.right | 6 +++--- test/svcd_ogt_test_ntsc.right | 6 +++--- test/svcdgs.right | 6 +++--- test/vcd_demo.right | 8 ++++---- test/vcd_demo_vcdinfo.right | 8 ++++---- test/videocd.right | 12 ++++++------ 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/sector.c b/lib/sector.c index f95f9ca1..6722cc6e 100644 --- a/lib/sector.c +++ b/lib/sector.c @@ -1,5 +1,5 @@ /* - $Id: sector.c,v 1.9 2004/05/19 03:00:12 rocky Exp $ + $Id: sector.c,v 1.10 2004/06/05 02:49:21 rocky Exp $ Copyright (C) 2004 Rocky Bernstein Copyright (C) 2000 Herbert Valerio Riedel @@ -34,7 +34,7 @@ #endif -static const char _rcsid[] = "$Id: sector.c,v 1.9 2004/05/19 03:00:12 rocky Exp $"; +static const char _rcsid[] = "$Id: sector.c,v 1.10 2004/06/05 02:49:21 rocky Exp $"; lba_t cdio_lba_to_lsn (lba_t lba) @@ -137,7 +137,7 @@ cdio_msf_to_str (const msf_t *msf) { char buf[16]; - snprintf (buf, sizeof (buf), "%.3x:%.2x.%.2x", msf->m, msf->s, msf->f); + snprintf (buf, sizeof (buf), "%.2x:%.2x.%.2x", msf->m, msf->s, msf->f); return strdup (buf); } diff --git a/test/cdda-mcn.right b/test/cdda-mcn.right index 32207f98..77f87290 100644 --- a/test/cdda-mcn.right +++ b/test/cdda-mcn.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 audio false -170: 000:09.64 000589 leadout + 1: 00:02.00 000000 audio false +170: 00:09.64 000589 leadout Media Catalog Number (MCN): 123456789ABCD __________________________________ CD Analysis Report diff --git a/test/cdda.right b/test/cdda.right index 8aa4e1ba..e622efa6 100644 --- a/test/cdda.right +++ b/test/cdda.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 audio false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 audio false +170: 00: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 9cf3dbed..ce334084 100644 --- a/test/check_opts2.right +++ b/test/check_opts2.right @@ -16,6 +16,6 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 diff --git a/test/check_opts3.right b/test/check_opts3.right index 9cf3dbed..ce334084 100644 --- a/test/check_opts3.right +++ b/test/check_opts3.right @@ -16,6 +16,6 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 diff --git a/test/check_opts4.right b/test/check_opts4.right index f28adb2c..c30eb1c3 100644 --- a/test/check_opts4.right +++ b/test/check_opts4.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00: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 f28adb2c..c30eb1c3 100644 --- a/test/check_opts5.right +++ b/test/check_opts5.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00: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 f28adb2c..c30eb1c3 100644 --- a/test/check_opts6.right +++ b/test/check_opts6.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00: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 f28adb2c..c30eb1c3 100644 --- a/test/check_opts7.right +++ b/test/check_opts7.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/isofs-m1.right b/test/isofs-m1.right index 09eb7fb0..36ac16ad 100644 --- a/test/isofs-m1.right +++ b/test/isofs-m1.right @@ -16,8 +16,8 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type Green? - 1: 000:02.00 000000 data false -170: 000:06.02 000302 leadout + 1: 00:02.00 000000 data false +170: 00:06.02 000302 leadout Media Catalog Number (MCN): 0000010271955 __________________________________ CD Analysis Report diff --git a/test/monvoisin.right b/test/monvoisin.right index a35c89e8..8a346406 100644 --- a/test/monvoisin.right +++ b/test/monvoisin.right @@ -16,9 +16,9 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 2) #: MSF LSN Type Green? - 1: 000:02.00 000000 XA true - 2: 000:18.51 001251 XA true -170: 000:39.71 002846 leadout + 1: 00:02.00 000000 XA true + 2: 00:18.51 001251 XA true +170: 00: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 53ea1e64..f0d0fed4 100644 --- a/test/svcd_ogt_test_ntsc.right +++ b/test/svcd_ogt_test_ntsc.right @@ -16,9 +16,9 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 2) #: MSF LSN Type Green? - 1: 000:02.00 000000 XA true - 2: 000:09.01 000526 XA true -170: 000:56.56 004106 leadout + 1: 00:02.00 000000 XA true + 2: 00:09.01 000526 XA true +170: 00:56.56 004106 leadout Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/svcdgs.right b/test/svcdgs.right index 7e4d3060..4d230cd3 100644 --- a/test/svcdgs.right +++ b/test/svcdgs.right @@ -16,9 +16,9 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 2) #: MSF LSN Type Green? - 1: 000:02.00 000000 XA true - 2: 000:22.53 001553 XA true -170: 001:17.62 005687 leadout + 1: 00:02.00 000000 XA true + 2: 00:22.53 001553 XA true +170: 01:17.62 005687 leadout Media Catalog Number (MCN): __________________________________ CD Analysis Report diff --git a/test/vcd_demo.right b/test/vcd_demo.right index 7775c61d..e8b7c192 100644 --- a/test/vcd_demo.right +++ b/test/vcd_demo.right @@ -16,10 +16,10 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 3) #: 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 + 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 Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/vcd_demo_vcdinfo.right b/test/vcd_demo_vcdinfo.right index be7f2f98..0421a41f 100644 --- a/test/vcd_demo_vcdinfo.right +++ b/test/vcd_demo_vcdinfo.right @@ -16,10 +16,10 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 3) #: 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 + 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 Media Catalog Number (MCN): not available __________________________________ CD Analysis Report diff --git a/test/videocd.right b/test/videocd.right index 2095daa1..424d8143 100644 --- a/test/videocd.right +++ b/test/videocd.right @@ -16,12 +16,12 @@ Digital Versital Disc: No __________________________________ CD-ROM Track List (1 - 5) #: 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 + 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 Media Catalog Number (MCN): not available __________________________________ CD Analysis Report