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

diff --git a/src/interface.h b/src/client.h
index c83381319..a4cb4a902 100644
--- a/src/interface.h
+++ b/src/client.h
@@ -21,12 +21,13 @@
 
 #include "os_compat.h"
 
-void initInterfaces(void);
-void openAInterface(int fd, const struct sockaddr *addr);
-void freeAllInterfaces(void);
-void closeOldInterfaces(void);
-int interfacePrintWithFD(int fd, const char *buffer, size_t len);
+void client_manager_init(void);
+void client_manager_deinit(void);
+int client_manager_io(void);
+void client_manager_expire(void);
 
-int doIOForInterfaces(void);
+void client_new(int fd, const struct sockaddr *addr);
+
+int client_print(int fd, const char *buffer, size_t len);
 
 #endif