[Mplayer-cvslog] CVS: main/libmpdemux vcd_read.h,1.13,1.14

Alex Beregszaszi alex at mplayerhq.hu
Wed Jun 18 00:28:32 CEST 2003


Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv967

Modified Files:
	vcd_read.h 
Log Message:
solaris fix by Gtz Waschk <waschk at informatik.uni-rostock.de>

Index: vcd_read.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/vcd_read.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vcd_read.h	9 Apr 2003 07:33:59 -0000	1.13
+++ vcd_read.h	17 Jun 2003 22:28:29 -0000	1.14
@@ -137,7 +137,7 @@
   cdxa.cdxa_data = vcd->buf;
   cdxa.cdxa_format = CDROM_XA_SECTOR_DATA;
   
-  if(ioctl(fd,CDROMCDXA,&cdxa)==-1) {
+  if(ioctl(vcd->fd,CDROMCDXA,&cdxa)==-1) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMCDXA: %s\n",strerror(errno));
     return 0;
   }
@@ -148,7 +148,7 @@
   cdread.cdread_bufaddr = vcd->buf;
   cdread.cdread_buflen = 2336;
 
-  if(ioctl(fd,CDROMREADMODE2,&cdread)==-1) {
+  if(ioctl(vcd->fd,CDROMREADMODE2,&cdread)==-1) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMREADMODE2: %s\n",strerror(errno));
     return 0;
   }
@@ -195,7 +195,7 @@
   sc.uscsi_buflen = 2336;
   sc.uscsi_flags = USCSI_ISOLATE | USCSI_READ;
   sc.uscsi_timeout = 20;
-  if (ioctl(fd, USCSICMD, &sc)) {
+  if (ioctl(vcd->fd, USCSICMD, &sc)) {
       mp_msg(MSGT_STREAM,MSGL_ERR,"USCSICMD: READ CD: %s\n",strerror(errno));
       return -1;
   }



More information about the MPlayer-cvslog mailing list