1 files changed, 52 insertions, 39 deletions

diff --git a/libmpdemux/vcd_read_fbsd.h b/libmpdemux/vcd_read_fbsd.h
index 478ed34577..cd7449dd4d 100644
--- a/libmpdemux/vcd_read_fbsd.h
+++ b/libmpdemux/vcd_read_fbsd.h
@@ -12,61 +12,71 @@ typedef struct {
 	uint8_t spare           [4];
 } cdsector_t;
 
-static cdsector_t vcd_buf;
-static struct ioc_read_toc_single_entry vcd_entry;
+typedef struct mp_vcd_priv_st {
+  int fd;
+  struct ioc_read_toc_single_entry entry;
+  cdsector_t buf;
+} mp_vcd_priv_t;
 
-static inline void vcd_set_msf(unsigned int sect){
-  vcd_entry.entry.addr.msf.frame=sect%75;
+static inline void vcd_set_msf(mp_vcd_priv_t* vcd, unsigned int sect){
+  vcd->entry.entry.addr.msf.frame=sect%75;
   sect=sect/75;
-  vcd_entry.entry.addr.msf.second=sect%60;
+  vcd->entry.entry.addr.msf.second=sect%60;
   sect=sect/60;
-  vcd_entry.entry.addr.msf.minute=sect;
+  vcd->entry.entry.addr.msf.minute=sect;
 }
 
-static inline unsigned int vcd_get_msf(){
-  return vcd_entry.entry.addr.msf.frame +
-        (vcd_entry.entry.addr.msf.second+
-         vcd_entry.entry.addr.msf.minute*60)*75;
+static inline unsigned int vcd_get_msf(mp_vcd_priv_t* vcd){
+  return vcd->entry.entry.addr.msf.frame +
+        (vcd->entry.entry.addr.msf.second+
+         vcd->entry.entry.addr.msf.minute*60)*75;
 }
 
-int vcd_seek_to_track(int fd,int track){
-  vcd_entry.address_format = CD_MSF_FORMAT;
-  vcd_entry.track  = track;
-  if (ioctl(fd, CDIOREADTOCENTRY, &vcd_entry)) {
-    perror("ioctl dif1");
+int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track){
+  vcd->entry.address_format = CD_MSF_FORMAT;
+  vcd->entry.track  = track;
+  if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd_entry)) {
+    mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
     return -1;
   }
-  return VCD_SECTOR_DATA*vcd_get_msf();
+  return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-int vcd_get_track_end(int fd,int track){
+int vcd_get_track_end(mp_vcd_priv_t* vcd, int track){
   struct ioc_toc_header tochdr;
-  if (ioctl(fd,CDIOREADTOCHEADER,&tochdr)==-1)
-    { perror("read CDROM toc header: "); return -1; }
-  vcd_entry.address_format = CD_MSF_FORMAT;
-  vcd_entry.track  = track<tochdr.ending_track?(track+1):CDROM_LEADOUT;
-  if (ioctl(fd, CDIOREADTOCENTRY, &vcd_entry)) {
-    perror("ioctl dif2");
+  if (ioctl(vcd->fd,CDIOREADTOCHEADER,&tochdr)==-1) {
+    mp_msg(MSGT_STREAM,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
     return -1;
   }
-  return VCD_SECTOR_DATA*vcd_get_msf();
+  vcd->entry.address_format = CD_MSF_FORMAT;
+  vcd->entry.track  = track<tochdr.ending_track?(track+1):CDROM_LEADOUT;
+  if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd_entry)) {
+    mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
+    return -1;
+  }
+  return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-void vcd_read_toc(int fd){
+mp_vcd_priv_t* vcd_read_toc(int fd){
   struct ioc_toc_header tochdr;
+  mp_vcd_priv_t* vcd;
   int i;
-  if (ioctl(fd,CDIOREADTOCHEADER,&tochdr)==-1)
-    { perror("read CDROM toc header: "); return; }
+  if (ioctl(fd,CDIOREADTOCHEADER,&tochdr)==-1) {
+    mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
+    return NULL;
+  }
   for (i=tochdr.starting_track ; i<=tochdr.ending_track ; i++){
       struct ioc_read_toc_single_entry tocentry;
 
       tocentry.track  = i;
       tocentry.address_format = CD_MSF_FORMAT;
 
-      if (ioctl(fd,CDIOREADTOCENTRY,&tocentry)==-1)
-	{ perror("read CDROM toc entry: "); return; }
+      if (ioctl(fd,CDIOREADTOCENTRY,&tocentry)==-1) {
+	mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno));
+	return NULL;
+      }
         
-      printf("track %02d:  adr=%d  ctrl=%d  format=%d  %02d:%02d:%02d\n",
+      mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d:  adr=%d  ctrl=%d  format=%d  %02d:%02d:%02d\n",
           (int)tocentry.track,
           (int)tocentry.entry.addr_type,
           (int)tocentry.entry.control,
@@ -76,20 +86,23 @@ void vcd_read_toc(int fd){
           (int)tocentry.entry.addr.msf.frame
       );
     }
+  vcd = malloc(sizeof(mp_vcd_priv_t));
+  vcd->fd = fd;
+  return vcd;  
 }
 
-static int vcd_read(int fd,char *mem){
+static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
 
-      if (pread(fd,&vcd_buf,VCD_SECTOR_SIZE,vcd_get_msf()*VCD_SECTOR_SIZE)
+      if (pread(vcd->fd,vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
 	 != VCD_SECTOR_SIZE) return 0;  // EOF?
 
-      vcd_entry.entry.addr.msf.frame++;
-      if (vcd_entry.entry.addr.msf.frame==75){
-        vcd_entry.entry.addr.msf.frame=0;
-        vcd_entry.entry.addr.msf.second++;
-        if (vcd_entry.entry.addr.msf.second==60){
-          vcd_entry.entry.addr.msf.second=0;
-          vcd_entry.entry.addr.msf.minute++;
+      vcd->entry.entry.addr.msf.frame++;
+      if (vcd->entry.entry.addr.msf.frame==75){
+        vcd->entry.entry.addr.msf.frame=0;
+        vcd->entry.entry.addr.msf.second++;
+        if (vcd->entry.entry.addr.msf.second==60){
+          vcd->entry.entry.addr.msf.second=0;
+          vcd->entry.entry.addr.msf.minute++;
         }
       }
       memcpy(mem,vcd_buf.data,VCD_SECTOR_DATA);