git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9900 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nexus 2003-04-10 08:34:43 +00:00
parent 6176c34ff9
commit 916276ab2c
1 changed files with 4 additions and 4 deletions

View File

@ -35,7 +35,7 @@ static inline unsigned int vcd_get_msf(mp_vcd_priv_t* vcd){
int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track){ int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track){
vcd->entry.address_format = CD_MSF_FORMAT; vcd->entry.address_format = CD_MSF_FORMAT;
vcd->entry.track = track; 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)); mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
return -1; return -1;
} }
@ -50,7 +50,7 @@ int vcd_get_track_end(mp_vcd_priv_t* vcd, int track){
} }
vcd->entry.address_format = CD_MSF_FORMAT; vcd->entry.address_format = CD_MSF_FORMAT;
vcd->entry.track = track<tochdr.ending_track?(track+1):CDROM_LEADOUT; 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)); mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
return -1; return -1;
} }
@ -93,7 +93,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ 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_SECTOR_SIZE) return 0; // EOF?
vcd->entry.entry.addr.msf.frame++; vcd->entry.entry.addr.msf.frame++;
@ -105,7 +105,7 @@ static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
vcd->entry.entry.addr.msf.minute++; 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; return VCD_SECTOR_DATA;
} }