Update internal (and messy) copies to libcdio 0.71 and

vcdimager 0.7.21.

CVS patchset: 7313
CVS date: 2005/01/01 02:43:56

1 files changed, 12 insertions, 11 deletions

diff --git a/src/input/vcd/libvcd/info_private.h b/src/input/vcd/libvcd/info_private.h
index a0152abae..d17b6680b 100644
--- a/src/input/vcd/libvcd/info_private.h
+++ b/src/input/vcd/libvcd/info_private.h
@@ -31,6 +31,7 @@
 #endif
 
 #include <cdio/cdio.h>
+#include <cdio/ds.h>
 #include <cdio/iso9660.h>
 #include <libvcd/types.h>
 #include <libvcd/files_private.h>
@@ -46,16 +47,16 @@ extern "C" {
     
     iso9660_pvd_t pvd;
     
-    InfoVcd info;
-    EntriesVcd entries;
+    InfoVcd_t info;
+    EntriesVcd_t entries;
     
-    VcdList *offset_list;
-    VcdList *offset_x_list;
+    CdioList *offset_list;
+    CdioList *offset_x_list;
     uint32_t *seg_sizes; 
     lsn_t   first_segment_lsn;
     
-    LotVcd *lot;
-    LotVcd *lot_x;
+    LotVcd_t *lot;
+    LotVcd_t *lot_x;
     uint8_t *psd;
     uint8_t *psd_x;
     unsigned int psd_x_size;
@@ -75,18 +76,18 @@ extern "C" {
     entry_num in obj.  NULL is returned if there is no entry.
     The first entry number is 0.
   */
-  const msf_t * vcdinf_get_entry_msf(const EntriesVcd *entries, 
+  const msf_t * vcdinf_get_entry_msf(const EntriesVcd_t *entries, 
 				     unsigned int entry_num);
 
   struct _vcdinf_pbc_ctx {
     unsigned int psd_size;
     lid_t maximum_lid;
     unsigned offset_mult;
-    VcdList *offset_x_list;
-    VcdList *offset_list;
+    CdioList *offset_x_list;
+    CdioList *offset_list;
     
-    LotVcd *lot;
-    LotVcd *lot_x;
+    LotVcd_t *lot;
+    LotVcd_t *lot_x;
     uint8_t *psd;
     uint8_t *psd_x;
     unsigned int psd_x_size;