comparison libmpdemux/vcd_read_fbsd.h @ 9899:248c478a0699

typo fix
author nexus
date Thu, 10 Apr 2003 08:34:43 +0000
parents d862231858d5
children aa15d627a00b
comparison
equal deleted inserted replaced
9898:51b2ab729370 9899:248c478a0699
33 } 33 }
34 34
35 int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track){ 35 int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track){
36 vcd->entry.address_format = CD_MSF_FORMAT; 36 vcd->entry.address_format = CD_MSF_FORMAT;
37 vcd->entry.track = track; 37 vcd->entry.track = track;
38 if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd_entry)) { 38 if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd->entry)) {
39 mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno)); 39 mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif1: %s\n",strerror(errno));
40 return -1; 40 return -1;
41 } 41 }
42 return VCD_SECTOR_DATA*vcd_get_msf(vcd); 42 return VCD_SECTOR_DATA*vcd_get_msf(vcd);
43 } 43 }
48 mp_msg(MSGT_STREAM,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno)); 48 mp_msg(MSGT_STREAM,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
49 return -1; 49 return -1;
50 } 50 }
51 vcd->entry.address_format = CD_MSF_FORMAT; 51 vcd->entry.address_format = CD_MSF_FORMAT;
52 vcd->entry.track = track<tochdr.ending_track?(track+1):CDROM_LEADOUT; 52 vcd->entry.track = track<tochdr.ending_track?(track+1):CDROM_LEADOUT;
53 if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd_entry)) { 53 if (ioctl(vcd->fd, CDIOREADTOCENTRY, &vcd->entry)) {
54 mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno)); 54 mp_msg(MSGT_STREAM,MSGL_ERR,"ioctl dif2: %s\n",strerror(errno));
55 return -1; 55 return -1;
56 } 56 }
57 return VCD_SECTOR_DATA*vcd_get_msf(vcd); 57 return VCD_SECTOR_DATA*vcd_get_msf(vcd);
58 } 58 }
91 return vcd; 91 return vcd;
92 } 92 }
93 93
94 static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ 94 static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
95 95
96 if (pread(vcd->fd,vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE) 96 if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
97 != VCD_SECTOR_SIZE) return 0; // EOF? 97 != VCD_SECTOR_SIZE) return 0; // EOF?
98 98
99 vcd->entry.entry.addr.msf.frame++; 99 vcd->entry.entry.addr.msf.frame++;
100 if (vcd->entry.entry.addr.msf.frame==75){ 100 if (vcd->entry.entry.addr.msf.frame==75){
101 vcd->entry.entry.addr.msf.frame=0; 101 vcd->entry.entry.addr.msf.frame=0;
103 if (vcd->entry.entry.addr.msf.second==60){ 103 if (vcd->entry.entry.addr.msf.second==60){
104 vcd->entry.entry.addr.msf.second=0; 104 vcd->entry.entry.addr.msf.second=0;
105 vcd->entry.entry.addr.msf.minute++; 105 vcd->entry.entry.addr.msf.minute++;
106 } 106 }
107 } 107 }
108 memcpy(mem,vcd_buf.data,VCD_SECTOR_DATA); 108 memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
109 return VCD_SECTOR_DATA; 109 return VCD_SECTOR_DATA;
110 } 110 }
111 111