Merge topic branch t/mixer into pupu

para_mixer improvements
-----------------------
Link para_mixer with audioc_common.o to make it single threaded.

* t/mixer:
  Make para_mixer single-threaded.
  mixer: Introduce die().
  crypt: use {con,de}structor to init/shutdown the library.
  client: Use a named enumeration for the client status.
  Introduce struct client_config to hide context from public API.
  mixer: Link with audioc_common.o
  Move recv_buffer() and recv_bin_buffer() from net.c to fd.c.
  mixer: Rename client_cmd() -> run_client_cmd().
  mixer: Rename audioc_cmd() -> run_audioc_cmd().

1 files changed, 0 insertions, 6 deletions

diff --git a/audioc.c b/audioc.c
index 2816c919..7f443a37 100644
--- a/audioc.c
+++ b/audioc.c
@@ -14,12 +14,7 @@
 
 #include "para.h"
 
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <arpa/inet.h>
 #include <sys/un.h>
-#include <netdb.h>
 #include <signal.h>
 #include <lopsub.h>
 
@@ -28,7 +23,6 @@
 #include "audioc.h"
 #include "error.h"
 #include "lsu.h"
-#include "net.h"
 #include "string.h"
 #include "fd.h"
 #include "sideband.h"