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, 2 insertions, 2 deletions

diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index b65a8253f..2ee942809 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -636,8 +636,8 @@ static int myShout_play(AudioOutput * audioOutput,
 
 	for (i = 0; i < samples; i++) {
 		for (j = 0; j < sd->audioFormat->channels; j++) {
-			vorbbuf[j][i] =
-			  (*((mpd_sint16 *)deconst_ptr(playChunk))) / 32768.0;
+			vorbbuf[j][i] = (*((const mpd_sint16 *) playChunk))
+			                 / 32768.0;
 			playChunk += bytes;
 		}
 	}