Merge branch 'mk/client-merge'

* mk/client-merge: (49 commits)
  client: shorten names of the struct client variables
  client: simplified client_read()
  client: client_input_received() returns 0
  client: check for COMMAND_RETURN_CLOSE
  client: renamed local variable "selret" to "ret"
  client: moved CLOSE/KILL check after client_process_line()
  client: don't check FD_ISSET(client->fd) on expired client
  client: removed assert(client->fd)>=0
  fix -Wcast-qual -Wwrite-strings warnings
  playlist: return -1 after assert(0)
  command: concatenate strings at compile time
  audio: don't pass "fd" to {en,dis}ableAudioDevice()
  volume: don't pass "fd" to changeVolumeLevel()
  directory: printDirectoryInfo() does not call commandError()
  directory: don't pass fd to traverseAllIn()
  directory: don't pass fd to traverseAllIn() callbacks
  playlist: PlaylistInfo() does not call commandError()
  playlist: don't pass "fd" to storedPlaylist.c functions
  playlist: don't pass "fd" to playlist.c functions
  playlist: showPlaylist() and shufflePlaylist() cannot fail
  ...

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;