Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv2623a Modified Files: vcd_read_fbsd.h Log Message: typo fix Index: vcd_read_fbsd.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/vcd_read_fbsd.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vcd_read_fbsd.h 9 Apr 2003 07:33:59 -0000 1.6 +++ vcd_read_fbsd.h 10 Apr 2003 08:34:43 -0000 1.7 @@ -35,7 +35,7 @@ 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)) { + if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd->entry)) { mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno)); return -1; } @@ -50,7 +50,7 @@ } 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)) { + if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd->entry)) { mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno)); return -1; } @@ -93,7 +93,7 @@ static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ - if (pread(vcd->fd,vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*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++; @@ -105,7 +105,7 @@ vcd->entry.entry.addr.msf.minute++; } } - memcpy(mem,vcd_buf.data,VCD_SECTOR_DATA); + memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); return VCD_SECTOR_DATA; }