From 0335011f11d9d13f70db6c46ed6189a74d48ec67 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:36:45 +0100 Subject: stream: mp_msg conversions We also drop some slave mode stuff from stream_vcd. --- stream/stream_dvd_common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'stream/stream_dvd_common.c') diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index 31d045ae5b..6c29d446c5 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -49,7 +49,7 @@ const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", int dvd_speed=0; /* 0 => don't touch speed */ -void dvd_set_speed(char *device, unsigned speed) +void dvd_set_speed(stream_t *stream, char *device, unsigned speed) { #if defined(__linux__) && defined(SG_IO) && defined(GPCMD_SET_STREAMING) int fd; @@ -69,13 +69,13 @@ void dvd_set_speed(char *device, unsigned speed) return; case -1: /* restore default value */ if (dvd_speed == 0) return; /* we haven't touched the speed setting */ - mp_msg(MSGT_OPEN, MSGL_INFO, "Restoring DVD speed... "); + MP_INFO(stream, "Restoring DVD speed... "); break; default: /* limit to KB/s */ // speed < 100 is multiple of DVD single speed (1350KB/s) if (speed < 100) speed *= 1350; - mp_msg(MSGT_OPEN, MSGL_INFO, "Limiting DVD speed to %dKB/s... ", speed); + MP_INFO(stream, "Limiting DVD speed to %dKB/s... ", speed); break; } @@ -108,14 +108,14 @@ void dvd_set_speed(char *device, unsigned speed) fd = open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC); if (fd == -1) { - mp_msg(MSGT_OPEN, MSGL_INFO, "Couldn't open DVD device for writing, changing DVD speed needs write access.\n"); + MP_INFO(stream, "Couldn't open DVD device for writing, changing DVD speed needs write access.\n"); return; } if (ioctl(fd, SG_IO, &sghdr) < 0) - mp_msg(MSGT_OPEN, MSGL_INFO, "failed\n"); + MP_INFO(stream, "failed\n"); else - mp_msg(MSGT_OPEN, MSGL_INFO, "successful\n"); + MP_INFO(stream, "successful\n"); close(fd); #endif -- cgit v1.2.3