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, 9 insertions, 16 deletions

diff --git a/src/volume.c b/src/volume.c
index cf2b8eff8..428c3b8a1 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -17,12 +17,10 @@
  */
 #include "volume.h"
 
-#include "command.h"
 #include "conf.h"
 #include "log.h"
 #include "gcc.h"
 #include "utils.h"
-#include "ack.h"
 #include "os_compat.h"
 #include "outputBuffer.h"
 
@@ -169,18 +167,15 @@ static int getOssVolumeLevel(void)
 	return left;
 }
 
-static int changeOssVolumeLevel(int fd, int change, int rel)
+static int changeOssVolumeLevel(int change, int rel)
 {
 	int current;
 	int new;
 	int level;
 
 	if (rel) {
-		if ((current = getOssVolumeLevel()) < 0) {
-			commandError(fd, ACK_ERROR_SYSTEM,
-				     "problem getting current volume");
+		if ((current = getOssVolumeLevel()) < 0)
 			return -1;
-		}
 
 		new = current + change;
 	} else {
@@ -198,7 +193,6 @@ static int changeOssVolumeLevel(int fd, int change, int rel)
 
 	if (ioctl(volume_ossFd, MIXER_WRITE(volume_ossControl), &level) < 0) {
 		closeOssMixer();
-		commandError(fd, ACK_ERROR_SYSTEM, "problems setting volume");
 		return -1;
 	}
 
@@ -328,7 +322,7 @@ static int getAlsaVolumeLevel(void)
 	return ret;
 }
 
-static int changeAlsaVolumeLevel(int fd, int change, int rel)
+static int changeAlsaVolumeLevel(int change, int rel)
 {
 	float vol;
 	long level;
@@ -361,7 +355,6 @@ static int changeAlsaVolumeLevel(int fd, int change, int rel)
 	if ((err =
 	     snd_mixer_selem_set_playback_volume_all(volume_alsaElem,
 						     level)) < 0) {
-		commandError(fd, ACK_ERROR_SYSTEM, "problems setting volume");
 		WARNING("problems setting alsa volume: %s\n",
 			snd_strerror(err));
 		closeAlsaMixer();
@@ -469,7 +462,7 @@ int getVolumeLevel(void)
 	}
 }
 
-static int changeSoftwareVolume(mpd_unused int fd, int change, int rel)
+static int changeSoftwareVolume(int change, int rel)
 {
 	int new = change;
 
@@ -497,19 +490,19 @@ static int changeSoftwareVolume(mpd_unused int fd, int change, int rel)
 	return 0;
 }
 
-int changeVolumeLevel(int fd, int change, int rel)
+int changeVolumeLevel(int change, int rel)
 {
 	switch (volume_mixerType) {
 #ifdef HAVE_ALSA
 	case VOLUME_MIXER_TYPE_ALSA:
-		return changeAlsaVolumeLevel(fd, change, rel);
+		return changeAlsaVolumeLevel(change, rel);
 #endif
 #ifdef HAVE_OSS
 	case VOLUME_MIXER_TYPE_OSS:
-		return changeOssVolumeLevel(fd, change, rel);
+		return changeOssVolumeLevel(change, rel);
 #endif
 	case VOLUME_MIXER_TYPE_SOFTWARE:
-		return changeSoftwareVolume(fd, change, rel);
+		return changeSoftwareVolume(change, rel);
 	default:
 		return 0;
 	}
@@ -531,7 +524,7 @@ void read_sw_volume_state(FILE *fp)
 			continue;
 		sv = strtol(buf + len, &end, 10);
 		if (mpd_likely(!*end))
-			changeSoftwareVolume(STDERR_FILENO, sv, 0);
+			changeSoftwareVolume(sv, 0);
 		else
 			ERROR("Can't parse software volume: %s\n", buf);
 		return;