1 --- vcdimager-0.7.20/lib/info.c.orig 2004-02-08 18:57:11.000000000 +0100
2 +++ vcdimager-0.7.20/lib/info.c 2004-12-05 20:45:08.428008688 +0100
5 /* CdIo tracks start at 1 rather than 0. */
6 if (cdio_get_track_msf(obj->img, track_num+1, &msf)) {
7 - *min = from_bcd8(msf.m);
8 - *sec = from_bcd8(msf.s);
9 - *frame = from_bcd8(msf.f);
10 + *min = cdio_from_bcd8(msf.m);
11 + *sec = cdio_from_bcd8(msf.s);
12 + *frame = cdio_from_bcd8(msf.f);
19 if (obj->vcd_type == VCD_TYPE_SVCD || obj->vcd_type == VCD_TYPE_HQVCD) {
20 - statbuf = iso9660_fs_stat (obj->img, "MPEGAV", true);
21 + statbuf = iso9660_fs_stat (obj->img, "MPEGAV");
23 if (NULL != statbuf) {
24 vcd_warn ("non compliant /MPEGAV folder detected!");
29 - statbuf = iso9660_fs_stat (obj->img, "SVCD/TRACKS.SVD;1", true);
30 + statbuf = iso9660_fs_stat (obj->img, "SVCD/TRACKS.SVD;1");
31 if (NULL != statbuf) {
32 lsn_t lsn = statbuf->lsn;
33 if (statbuf->size != ISO_BLOCKSIZE)
35 iso9660_fs_readdir(img, "EXT", true) and then scanning for
36 the files listed below.
38 - statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true);
39 + statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1");
40 if (NULL != statbuf) {
41 lsn_t lsn = statbuf->lsn;
42 uint32_t secsize = statbuf->secsize;
44 return VCDINFO_OPEN_ERROR;
47 - statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
48 + statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
49 if (NULL != statbuf) {
50 lsn_t lsn = statbuf->lsn;
51 uint32_t secsize = statbuf->secsize;
52 @@ -1877,13 +1877,13 @@
53 iso9660_fs_readdir(img, "SVCD", true) and then scanning for
54 the files listed below.
56 - statbuf = iso9660_fs_stat (img, "MPEGAV", true);
57 + statbuf = iso9660_fs_stat (img, "MPEGAV");
58 if (NULL != statbuf) {
59 vcd_warn ("non compliant /MPEGAV folder detected!");
63 - statbuf = iso9660_fs_stat (img, "SVCD/TRACKS.SVD;1", true);
64 + statbuf = iso9660_fs_stat (img, "SVCD/TRACKS.SVD;1");
66 vcd_warn ("mandatory /SVCD/TRACKS.SVD not found!");
72 - statbuf = iso9660_fs_stat (img, "SVCD/SEARCH.DAT;1", true);
73 + statbuf = iso9660_fs_stat (img, "SVCD/SEARCH.DAT;1");
75 vcd_warn ("mandatory /SVCD/SEARCH.DAT not found!");
81 - statbuf = iso9660_fs_stat (img, "EXT/SCANDATA.DAT;1", true);
82 + statbuf = iso9660_fs_stat (img, "EXT/SCANDATA.DAT;1");
83 if (statbuf != NULL) {
84 lsn_t lsn = statbuf->lsn;
85 uint32_t secsize = statbuf->secsize;
86 --- vcdimager-0.7.20/frontends/cli/vcd-info.c.orig 2004-02-07 04:00:39.000000000 +0100
87 +++ vcdimager-0.7.20/frontends/cli/vcd-info.c 2004-12-05 20:47:11.654275448 +0100
91 img = vcdinfo_get_cd_image(obj);
92 - statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
93 + statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
95 return PBC_VCD2_NO_LOT_X;
96 if (statbuf->size != ISO_BLOCKSIZE * LOT_VCD_SIZE) {
97 ret_status = PBC_VCD2_BAD_LOT_SIZE;
100 - statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true);
101 + statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1");
102 if (NULL != statbuf) {
103 ret_status = PBC_VCD2_EXT;
105 @@ -1184,8 +1184,7 @@
106 ((vcdinfo_get_VCD_type(obj) == VCD_TYPE_SVCD
107 || vcdinfo_get_VCD_type(obj) == VCD_TYPE_HQVCD)
109 - : "/VCD/PSD.VCD;1"),
111 + : "/VCD/PSD.VCD;1"));
113 vcd_warn ("no PSD file entry found in ISO9660 fs");
115 --- vcdimager-0.7.20/frontends/xml/vcd_xml_rip.c.orig 2003-11-16 20:32:01.000000000 +0100
116 +++ vcdimager-0.7.20/frontends/xml/vcd_xml_rip.c 2004-12-05 20:48:05.477093136 +0100
119 if (obj->vcd_type == VCD_TYPE_VCD2)
121 - statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
122 + statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
123 if (statbuf != NULL) {
125 _lot_vcd_sector = statbuf->lsn;
130 - NULL != (statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true))) {
131 + NULL != (statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1"))) {
132 _psd_vcd_sector = statbuf->lsn;
133 _psd_size = statbuf->size;