1 files changed, 13 insertions, 36 deletions

diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index 85a58fcf61..c6a49603a4 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -42,6 +42,7 @@ static int sun_vcd_read(mp_vcd_priv_t*, int*);
 #endif
 
 struct mp_vcd_priv_st {
+  stream_t *stream;
   int fd;
   struct cdrom_tocentry entry;
   char buf[VCD_SECTOR_SIZE];
@@ -68,7 +69,7 @@ static int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
   vcd->entry.cdte_format = CDROM_MSF;
   vcd->entry.cdte_track  = track;
   if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {
-    mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
+    MP_ERR(vcd->stream, "ioctl dif1: %s\n",strerror(errno));
     return -1;
   }
   return VCD_SECTOR_DATA*vcd_get_msf(vcd);
@@ -78,22 +79,20 @@ static int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){
   vcd->entry.cdte_format = CDROM_MSF;
   vcd->entry.cdte_track  = track<vcd->tochdr.cdth_trk1?(track+1):CDROM_LEADOUT;
   if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {
-    mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
+    MP_ERR(vcd->stream, "ioctl dif2: %s\n",strerror(errno));
     return -1;
   }
   return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-static mp_vcd_priv_t* vcd_read_toc(int fd){
+static mp_vcd_priv_t* vcd_read_toc(stream_t *stream, int fd){
   struct cdrom_tochdr tochdr;
   mp_vcd_priv_t* vcd;
-  int i, min = 0, sec = 0, frame = 0;
+  int i;
   if (ioctl(fd,CDROMREADTOCHDR,&tochdr)==-1) {
-    mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
+    MP_ERR(stream, "read CDROM toc header: %s\n",strerror(errno));
     return NULL;
   }
-  mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.cdth_trk0);
-  mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.cdth_trk1);
   for (i=tochdr.cdth_trk0 ; i<=tochdr.cdth_trk1 + 1; i++){
       struct cdrom_tocentry tocentry;
 
@@ -101,12 +100,12 @@ static mp_vcd_priv_t* vcd_read_toc(int fd){
       tocentry.cdte_format = CDROM_MSF;
 
       if (ioctl(fd,CDROMREADTOCENTRY,&tocentry)==-1) {
-	mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno));
+	MP_ERR(stream, "read CDROM toc entry: %s\n",strerror(errno));
 	return NULL;
       }
 
       if (i<=tochdr.cdth_trk1)
-      mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d:  adr=%d  ctrl=%d  format=%d  %02d:%02d:%02d  mode: %d\n",
+      MP_INFO(stream, "track %02d:  adr=%d  ctrl=%d  format=%d  %02d:%02d:%02d  mode: %d\n",
           (int)tocentry.cdte_track,
           (int)tocentry.cdte_adr,
           (int)tocentry.cdte_ctrl,
@@ -117,31 +116,9 @@ static mp_vcd_priv_t* vcd_read_toc(int fd){
           (int)tocentry.cdte_datamode
       );
 
-      if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
-      {
-        if (i > tochdr.cdth_trk0)
-        {
-          min = tocentry.cdte_addr.msf.minute - min;
-          sec = tocentry.cdte_addr.msf.second - sec;
-          frame = tocentry.cdte_addr.msf.frame - frame;
-          if ( frame < 0 )
-          {
-            frame += 75;
-            sec --;
-          }
-          if ( sec < 0 )
-          {
-            sec += 60;
-            min --;
-          }
-          mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
-        }
-        min = tocentry.cdte_addr.msf.minute;
-        sec = tocentry.cdte_addr.msf.second;
-        frame = tocentry.cdte_addr.msf.frame;
-      }
     }
   vcd = malloc(sizeof(mp_vcd_priv_t));
+  vcd->stream = stream;
   vcd->fd = fd;
   vcd->tochdr = tochdr;
   return vcd;
@@ -193,7 +170,7 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset)
   cdxa.cdxa_format = CDROM_XA_SECTOR_DATA;
 
   if(ioctl(vcd->fd,CDROMCDXA,&cdxa)==-1) {
-    mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMCDXA: %s\n",strerror(errno));
+    MP_ERR(vcd->stream, "CDROMCDXA: %s\n",strerror(errno));
     return 0;
   }
   *offset = 0;
@@ -204,7 +181,7 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset)
   cdread.cdread_buflen = 2336;
 
   if(ioctl(vcd->fd,CDROMREADMODE2,&cdread)==-1) {
-    mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMREADMODE2: %s\n",strerror(errno));
+    MP_ERR(vcd->stream, "CDROMREADMODE2: %s\n",strerror(errno));
     return 0;
   }
   *offset = 8;
@@ -230,11 +207,11 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset)
   sc.uscsi_flags = USCSI_ISOLATE | USCSI_READ;
   sc.uscsi_timeout = 20;
   if (ioctl(vcd->fd, USCSICMD, &sc)) {
-      mp_msg(MSGT_STREAM,MSGL_ERR,"USCSICMD: READ CD: %s\n",strerror(errno));
+      MP_ERR(vcd->stream, "USCSICMD: READ CD: %s\n",strerror(errno));
       return -1;
   }
   if (sc.uscsi_status) {
-      mp_msg(MSGT_STREAM,MSGL_ERR,"scsi command failed with status %d\n", sc.uscsi_status);
+      MP_ERR(vcd->stream, "scsi command failed with status %d\n", sc.uscsi_status);
       return -1;
   }
   *offset = 0;