Merge Core Audio fixes

diff --combined lib/Makefile.am
index af4f8a6eaafd9271fe922e07114666725440b0c2,b270e82f6db8cb7e5c629a560e7e485936085e76..9df1dfdce0cf0e146d81539989325899bd9a2795
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -39,6 -39,7 +39,7 @@@ libdisorder_a_SOURCES=charset.c charset
        client-common.c client-common.h                 \
        configuration.c configuration.h                 \
        cookies.c cookies.h                             \
+       coreaudio.c coreaudio.h                         \
        dateparse.c dateparse.h xgetdate.c              \
        defs.c defs.h                                   \
        eclient.c eclient.h                             \
@@@ -54,10 -55,10 +55,10 @@@
        ifreq.c ifreq.h                                 \
        inputline.c inputline.h                         \
        kvp.c kvp.h                                     \
 -      log.c log.h log-impl.h                          \
 +      log.c log.h                                     \
        logfd.c logfd.h                                 \
        macros.c macros-builtin.c macros.h              \
 -      mem.c mem.h mem-impl.h                          \
 +      mem.c mem.h                                     \
        mime.h mime.c                                   \
        mixer.c mixer.h mixer-oss.c mixer-alsa.c        \
        printf.c printf.h                               \