diff options
author | wm4 <wm4@nowhere> | 2013-12-21 20:36:45 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
commit | 0335011f11d9d13f70db6c46ed6189a74d48ec67 (patch) | |
tree | 03a146b06b5a8c405f5c521abadeeea35c296920 /stream/vcd_read_win32.h | |
parent | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (diff) | |
download | mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.bz2 mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.xz |
stream: mp_msg conversions
We also drop some slave mode stuff from stream_vcd.
Diffstat (limited to 'stream/vcd_read_win32.h')
-rw-r--r-- | stream/vcd_read_win32.h | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h index d5d4032050..7c5117db16 100644 --- a/stream/vcd_read_win32.h +++ b/stream/vcd_read_win32.h @@ -70,11 +70,11 @@ static int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) return VCD_SECTOR_DATA * (vcd_get_msf(vcd, track + 1)); } -static mp_vcd_priv_t* vcd_read_toc(int fd) +static mp_vcd_priv_t* vcd_read_toc(stream_t *stream, int fd) { DWORD dwBytesReturned; HANDLE hd; - int i, min = 0, sec = 0, frame = 0; + int i; mp_vcd_priv_t* vcd = malloc(sizeof(mp_vcd_priv_t)); if (!vcd) return NULL; @@ -82,21 +82,16 @@ static mp_vcd_priv_t* vcd_read_toc(int fd) hd = (HANDLE)_get_osfhandle(fd); if (!DeviceIoControl(hd, IOCTL_CDROM_READ_TOC, NULL, 0, &vcd->toc, sizeof(CDROM_TOC), &dwBytesReturned, NULL)) { - mp_msg(MSGT_OPEN, MSGL_ERR, "read CDROM toc header: %lu\n", + MP_ERR(stream, "read CDROM toc header: %lu\n", GetLastError()); free(vcd); return NULL; } - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", - vcd->toc.FirstTrack); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", - vcd->toc.LastTrack); - for (i = vcd->toc.FirstTrack; i <= vcd->toc.LastTrack + 1; i++) { int index = i - vcd->toc.FirstTrack; if (i <= vcd->toc.LastTrack) { - mp_msg(MSGT_OPEN, MSGL_INFO, "track %02d: adr=%d ctrl=%d" + MP_INFO(stream, "track %02d: adr=%d ctrl=%d" " %02d:%02d:%02d\n", vcd->toc.TrackData[index].TrackNumber, vcd->toc.TrackData[index].Adr, @@ -105,27 +100,6 @@ static mp_vcd_priv_t* vcd_read_toc(int fd) vcd->toc.TrackData[index].Address[2], vcd->toc.TrackData[index].Address[3]); } - - if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO)) { - if (i > vcd->toc.FirstTrack) { - min = vcd->toc.TrackData[index].Address[1] - min; - sec = vcd->toc.TrackData[index].Address[2] - sec; - frame = vcd->toc.TrackData[index].Address[3] - frame; - if (frame < 0) { - frame += 75; - sec--; - } - if (sec < 0) { - sec += 60; - min--; - } - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=" - "%02d:%02d:%02d\n", i - 1, min, sec, frame); - min = vcd->toc.TrackData[index].Address[1]; - sec = vcd->toc.TrackData[index].Address[2]; - frame = vcd->toc.TrackData[index].Address[3]; - } - } } vcd->hd = hd; |