claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Ouptut of LSN has one more place just to be sure.

Browse Source 
cd-info.c: use new msf_to_str routine.
This commit is contained in:
rocky
2004-05-09 17:05:34 +00:00
parent 08863d33bb
commit 21a5f21a9a
15 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cd-info.c
View File

@@ -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 <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -883,22 +883,20 @@ main(int argc, const char *argv[])
/* Read and possibly print track information. */ /* Read and possibly print track information. */
for (i = first_track_num; i <= CDIO_CDROM_LEADOUT_TRACK; i++) { for (i = first_track_num; i <= CDIO_CDROM_LEADOUT_TRACK; i++) {
msf_t msf; msf_t msf;
char *psz_msf;
if (!cdio_get_track_msf(cdio, i, &msf)) { if (!cdio_get_track_msf(cdio, i, &msf)) {
err_exit("cdio_track_msf for track %i failed, I give up.\n", i); 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 (i == CDIO_CDROM_LEADOUT_TRACK) {
if (!opts.no_tracks) if (!opts.no_tracks)
printf("%3d: %2.2x:%2.2x:%2.2x %06lu leadout\n", printf("%3d: %9s %06lu leadout\n", (int) i, psz_msf,
(int) i,
msf.m, msf.s, msf.f,
(long unsigned int) cdio_msf_to_lsn(&msf)); (long unsigned int) cdio_msf_to_lsn(&msf));
break; break;
} else if (!opts.no_tracks) { } else if (!opts.no_tracks) {
printf("%3d: %2.2x:%2.2x:%2.2x %06lu %-5s %s\n", printf("%3d: %9s %06lu %-5s %s\n", (int) i, psz_msf,
(int) i,
msf.m, msf.s, msf.f,
(long unsigned int) cdio_msf_to_lsn(&msf), (long unsigned int) cdio_msf_to_lsn(&msf),
track_format2str[cdio_get_track_format(cdio, i)], track_format2str[cdio_get_track_format(cdio, i)],
cdio_get_track_green(cdio, i)? "true" : "false"); cdio_get_track_green(cdio, i)? "true" : "false");

4
test/cdda.right
View File

@@ -16,8 +16,8 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 audio false 1: 000:02.00 000000 audio false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

4
test/check_opts2.right
View File

@@ -16,6 +16,6 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955

4
test/check_opts3.right
View File

@@ -16,6 +16,6 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955

4
test/check_opts4.right
View File

@@ -16,8 +16,8 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

4
test/check_opts5.right
View File

@@ -16,8 +16,8 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

4
test/check_opts6.right
View File

@@ -16,8 +16,8 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

4
test/check_opts7.right
View File

@@ -16,8 +16,8 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

13
test/data7.toc Normal file
View File

@@ -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

4
test/isofs-m1.right
View File

@@ -16,8 +16,8 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 1) CD-ROM Track List (1 - 1)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 data false 1: 000:02.00 000000 data false
170: 00:06:02 000302 leadout 170: 000:06.02 000302 leadout
Media Catalog Number (MCN): 0000010271955 Media Catalog Number (MCN): 0000010271955
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

6
test/monvoisin.right
View File

@@ -16,9 +16,9 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 2) CD-ROM Track List (1 - 2)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 XA true 1: 000:02.00 000000 XA true
2: 00:18:51 001251 XA true 2: 000:18.51 001251 XA true
170: 00:39:71 002846 leadout 170: 000:39.71 002846 leadout
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

6
test/svcd_ogt_test_ntsc.right
View File

@@ -16,9 +16,9 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 2) CD-ROM Track List (1 - 2)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 XA true 1: 000:02.00 000000 XA true
2: 00:09:01 000526 XA true 2: 000:09.01 000526 XA true
170: 00:56:56 004106 leadout 170: 000:56.56 004106 leadout
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

6
test/svcdgs.right
View File

@@ -16,9 +16,9 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 2) CD-ROM Track List (1 - 2)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 XA true 1: 000:02.00 000000 XA true
2: 00:22:53 001553 XA true 2: 000:22.53 001553 XA true
170: 01:17:62 005687 leadout 170: 001:17.62 005687 leadout
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

8
test/vcd_demo_vcdinfo.right
View File

@@ -16,10 +16,10 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 3) CD-ROM Track List (1 - 3)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 XA true 1: 000:02.00 000000 XA true
2: 00:17:57 001182 XA true 2: 000:17.57 001182 XA true
3: 00:24:71 001721 XA true 3: 000:24.71 001721 XA true
170: 00:30:10 002110 leadout 170: 000:30.10 002110 leadout
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________
CD Analysis Report CD Analysis Report

12
test/videocd.right
View File

@@ -16,12 +16,12 @@ Digital Versital Disc: No
__________________________________ __________________________________
CD-ROM Track List (1 - 5) CD-ROM Track List (1 - 5)
#: MSF LSN Type Green? #: MSF LSN Type Green?
1: 00:02:00 000000 XA true 1: 000:02.00 000000 XA true
2: 00:13:01 000826 XA true 2: 000:13.01 000826 XA true
3: 00:16:01 001051 XA true 3: 000:16.01 001051 XA true
4: 00:19:01 001276 XA true 4: 000:19.01 001276 XA true
5: 00:22:01 001501 XA true 5: 000:22.01 001501 XA true
170: 00:25:01 001726 leadout 170: 000:25.01 001726 leadout
Media Catalog Number (MCN): not available Media Catalog Number (MCN): not available
__________________________________ __________________________________
CD Analysis Report CD Analysis Report