diff options
author | Max Kellermann <max@duempel.org> | 2008-09-07 13:51:50 +0200 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-09-09 01:12:38 -0700 |
commit | 2a6a8a35c6b31e3c83891076dab86dc2da2d82ae (patch) | |
tree | 27ca71bfba317352b13c25850effc3497600be9d /src/audio.c | |
parent | 288c051c55e741bbf9387579ea7f066ab6f754f0 (diff) | |
download | mpd-2a6a8a35c6b31e3c83891076dab86dc2da2d82ae.tar.gz mpd-2a6a8a35c6b31e3c83891076dab86dc2da2d82ae.tar.xz mpd-2a6a8a35c6b31e3c83891076dab86dc2da2d82ae.zip |
audio: don't pass "fd" to {en,dis}ableAudioDevice()
No protocol code in the audio output library.
Diffstat (limited to 'src/audio.c')
-rw-r--r-- | src/audio.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/audio.c b/src/audio.c index 9a65df858..d4447bc7e 100644 --- a/src/audio.c +++ b/src/audio.c @@ -19,9 +19,7 @@ #include "audio.h" #include "audioOutput.h" #include "log.h" -#include "command.h" #include "path.h" -#include "ack.h" #include "myfprintf.h" #include "os_compat.h" @@ -428,13 +426,10 @@ void sendMetadataToAudioDevice(const struct mpd_tag *tag) } } -int enableAudioDevice(int fd, unsigned int device) +int enableAudioDevice(unsigned int device) { - if (device >= audioOutputArraySize) { - commandError(fd, ACK_ERROR_ARG, "audio output device id %i " - "doesn't exist\n", device); + if (device >= audioOutputArraySize) return -1; - } if (!(audioDeviceStates[device] & 0x01)) audioDeviceStates[device] = DEVICE_ENABLE; @@ -442,13 +437,11 @@ int enableAudioDevice(int fd, unsigned int device) return 0; } -int disableAudioDevice(int fd, unsigned int device) +int disableAudioDevice(unsigned int device) { - if (device >= audioOutputArraySize) { - commandError(fd, ACK_ERROR_ARG, "audio output device id %i " - "doesn't exist\n", device); + if (device >= audioOutputArraySize) return -1; - } + if (audioDeviceStates[device] & 0x01) audioDeviceStates[device] = DEVICE_DISABLE; |