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/audiod.c b/audiod.c
index 593e2906..a4c7d92e 100644
--- a/audiod.c
+++ b/audiod.c
@@ -30,7 +30,6 @@
 #include "para.h"
 #include "error.h"
 #include "lsu.h"
-#include "crypt.h"
 #include "list.h"
 #include "sched.h"
 #include "buffer_tree.h"
@@ -1356,7 +1355,6 @@ int main(int argc, char *argv[])
 	version_handle_flag("audiod", OPT_GIVEN(VERSION));
 	handle_help_flags();
 	parse_config_or_die();
-	crypt_init();
 	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
 	if (daemon_init_colors_or_die(OPT_UINT32_VAL(COLOR), COLOR_AUTO,
 			COLOR_NO, OPT_GIVEN(LOGFILE))) {
@@ -1386,7 +1384,6 @@ int main(int argc, char *argv[])
 	ret = init_tasks_and_schedule();
 	audiod_cleanup();
 	sched_shutdown(sched);
-	crypt_shutdown();
 out:
 	lls_free_parse_result(lpr, CMD_PTR);
 	if (errctx)