diff options
Diffstat (limited to 'stream/vcd_read_fbsd.h')
| -rw-r--r-- | stream/vcd_read_fbsd.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index 0765163b35..fe3bb8c5ae 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.h @@ -132,7 +132,6 @@ read_toc_entry(mp_vcd_priv_t *vcd, int nr) vcd->entry.track = nr; #endif if (ioctl(vcd->fd, READ_TOC, &vcd->entry) == -1) { - mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno)); return 0; } return 1; @@ -155,18 +154,15 @@ vcd_get_track_end(mp_vcd_priv_t* vcd, int track) 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 ioc_toc_header tochdr; mp_vcd_priv_t* vcd; int i, last_startsect; if (ioctl(fd, CDIOREADTOCHEADER, &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.starting_track); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track); vcd = malloc(sizeof(mp_vcd_priv_t)); vcd->fd = fd; vcd->tochdr = tochdr; @@ -178,7 +174,7 @@ vcd_read_toc(int fd) } if (i <= tochdr.ending_track) - mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n", + MP_INFO(stream, "track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n", #ifdef VCD_NETBSD (int)vcd->entry.starting_track, (int)vcd->entry.data->addr_type, @@ -194,22 +190,6 @@ vcd_read_toc(int fd) (int)TOCADDR(vcd->entry).msf.frame ); - if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO)) - { - int startsect = vcd_get_msf(vcd); - if (i > tochdr.starting_track) - { - // convert duraion to MSF - vcd_set_msf(vcd, startsect - last_startsect); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, - "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", - i - 1, - TOCADDR(vcd->entry).msf.minute, - TOCADDR(vcd->entry).msf.second, - TOCADDR(vcd->entry).msf.frame); - } - last_startsect = startsect; - } } return vcd; } @@ -240,12 +220,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) sc.timeout = 10000; rc = ioctl(vcd->fd, SCIOCCOMMAND, &sc); if (rc == -1) { - mp_msg(MSGT_STREAM,MSGL_ERR,"SCIOCCOMMAND: %s\n",strerror(errno)); return -1; } if (sc.retsts || sc.error) { - mp_msg(MSGT_STREAM,MSGL_ERR,"scsi command failed: status %d error %d\n", - sc.retsts,sc.error); return -1; } #else |