summaryrefslogtreecommitdiffstats
path: root/stream/stream_vcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'stream/stream_vcd.c')
-rw-r--r--stream/stream_vcd.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 2460bc65b6..3a9d644cc6 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -117,26 +117,26 @@ static int open_s(stream_t *stream,int mode)
f=open(dev,O_RDONLY | O_CLOEXEC);
#endif
if(f<0){
- mp_msg(MSGT_OPEN,MSGL_ERR,"CD-ROM Device '%s' not found.\n",dev);
+ MP_ERR(stream, "CD-ROM Device '%s' not found.\n",dev);
return STREAM_ERROR;
}
- vcd = vcd_read_toc(f);
+ vcd = vcd_read_toc(stream, f);
if(!vcd) {
- mp_msg(MSGT_OPEN,MSGL_ERR,"Failed to get cd toc\n");
+ MP_ERR(stream, "Failed to get cd toc\n");
close(f);
return STREAM_ERROR;
}
ret2=vcd_get_track_end(vcd,1);
if(ret2<0){
- mp_msg(MSGT_OPEN, MSGL_ERR, "%s (get)\n", "Error selecting VCD track.");
+ MP_ERR(stream, "%s (get)\n", "Error selecting VCD track.");
close(f);
free(vcd);
return STREAM_ERROR;
}
ret=vcd_seek_to_track(vcd,1);
if(ret<0){
- mp_msg(MSGT_OPEN, MSGL_ERR, "%s (seek)\n", "Error selecting VCD track.");
+ MP_ERR(stream, "%s (seek)\n", "Error selecting VCD track.");
close(f);
free(vcd);
return STREAM_ERROR;
@@ -149,15 +149,15 @@ static int open_s(stream_t *stream,int mode)
if (vcd_read(vcd, mem) != VCD_SECTOR_DATA || mem[2] || mem[3])
break;
}
- mp_msg(MSGT_OPEN, MSGL_DBG2, "%d leading sectors skipped\n", tmp - sect);
+ MP_DBG(stream, "%d leading sectors skipped\n", tmp - sect);
vcd_set_msf(vcd, tmp);
ret = tmp * VCD_SECTOR_DATA;
- mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X end: 0x%X\n",ret,ret2);
+ MP_VERBOSE(stream, "VCD start byte position: 0x%X end: 0x%X\n",ret,ret2);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) {
- mp_msg(MSGT_OPEN,MSGL_WARN,"Error in CDRIOCSETBLOCKSIZE");
+ MP_WARN(stream, "Error in CDRIOCSETBLOCKSIZE");
}
#endif