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, 13 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index f7581c5c..ff82ac5c 100644
--- a/Makefile
+++ b/Makefile
@@ -216,13 +216,17 @@ ifneq ($(CRYPTOLIB),)
 	endif
 endif
 ifneq ($(HAVE_OSS)-$(HAVE_ALSA),no-no)
-	executables += mixer
-	mixer_objs := $(addsuffix .o, mixer exec string fd time lsu version)
-	ifeq ($(HAVE_OSS),yes)
-		mixer_objs += oss_mix.o
-	endif
-	ifeq ($(HAVE_ALSA),yes)
-		mixer_objs += alsa_mix.o
+	ifneq ($(CRYPTOLIB),)
+		executables += mixer
+		mixer_objs := $(addsuffix .o, mixer string fd time lsu version \
+			audioc_common net buffer_tree crypt_common \
+			$(CRYPTOLIB) sched client_common sideband)
+		ifeq ($(HAVE_OSS),yes)
+			mixer_objs += oss_mix.o
+		endif
+		ifeq ($(HAVE_ALSA),yes)
+			mixer_objs += alsa_mix.o
+		endif
 	endif
 endif
 ifeq ($(HAVE_CURSES),yes)
@@ -387,7 +391,7 @@ audioc_objs += audioc.lsg.o
 audiod_objs += $(addsuffix _cmd.lsg.o, recv filter audiod write) \
 	client.lsg.o audiod.lsg.o
 client_objs += client.lsg.o
-mixer_objs += mixer.lsg.o
+mixer_objs += mixer.lsg.o client.lsg.o
 filter_objs += filter_cmd.lsg.o filter.lsg.o
 gui_objs += gui.lsg.o
 play_objs += $(addsuffix _cmd.lsg.o, recv filter play write) play.lsg.o
@@ -576,6 +580,7 @@ para_gui: LDFLAGS += $(curses_ldflags)
 para_server \
 para_client \
 para_audiod \
+para_mixer \
 :LDFLAGS += \
 	$(crypto_ldflags)