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, 3 deletions

diff --git a/net.h b/net.h
index fde0424d..c2d35fed 100644
--- a/net.h
+++ b/net.h
@@ -44,9 +44,6 @@ int para_listen_simple(unsigned l4type, uint16_t port);
 /** Pretty-printing of IPv4/6 socket addresses */
 char *remote_name(int sockfd);
 
-int recv_bin_buffer(int fd, char *buf, size_t size);
-int recv_buffer(int fd, char *buf, size_t size);
-
 int para_accept(int fd, void *addr, socklen_t size, int *new_fd);
 int create_local_socket(const char *name);
 int connect_local_socket(const char *name);