diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/ChangeLog pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/ChangeLog
--- pulseaudio-0.9.22~0.9.21+341-g62bf/ChangeLog	2010-01-15 01:27:19.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/ChangeLog	2010-01-15 23:52:17.000000000 +0000
@@ -1,4 +1,4 @@
-2010-01-14  gettextize  <bug-gnu-gettext@gnu.org>
+2010-01-15  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.am (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
 	* configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/config.h.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/config.h.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/config.h.in	2010-01-15 01:27:31.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/config.h.in	2010-01-15 23:52:30.000000000 +0000
@@ -36,9 +36,6 @@
 /* Gettext package */
 #undef GETTEXT_PACKAGE
 
-/* Define to 1 if you have the `accept4' function. */
-#undef HAVE_ACCEPT4
-
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -73,9 +70,6 @@
 /* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
-/* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */
-#undef HAVE_COREAUDIO_COREAUDIO_H
-
 /* Define to 1 if you have the `ctime_r' function. */
 #undef HAVE_CTIME_R
 
@@ -245,9 +239,6 @@
 /* Define to 1 if you have the `pipe' function. */
 #undef HAVE_PIPE
 
-/* Define to 1 if you have the `pipe2' function. */
-#undef HAVE_PIPE2
-
 /* Define to 1 if you have the <poll.h> header file. */
 #undef HAVE_POLL_H
 
@@ -471,12 +462,12 @@
    */
 #undef LT_OBJDIR
 
+/* netbsd implementation */
+#undef NETBSD_ATOMIC_OPS
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
-/* Build target is Darwin. */
-#undef OS_IS_DARWIN
-
 /* Build target is Windows. */
 #undef OS_IS_WIN32
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/configure pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/configure
--- pulseaudio-0.9.22~0.9.21+341-g62bf/configure	2010-01-15 01:27:31.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/configure	2010-01-15 23:52:30.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.19-341-g62bf.
+# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.21-24-gfa64.
 #
 # Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
 #
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='pulseaudio'
 PACKAGE_TARNAME='pulseaudio'
-PACKAGE_VERSION='0.9.19-341-g62bf'
-PACKAGE_STRING='pulseaudio 0.9.19-341-g62bf'
+PACKAGE_VERSION='0.9.21-24-gfa64'
+PACKAGE_STRING='pulseaudio 0.9.21-24-gfa64'
 PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net'
 PACKAGE_URL=''
 
@@ -751,7 +751,6 @@
 LIBOBJS
 FORCE_PREOPEN_FALSE
 FORCE_PREOPEN_TRUE
-udevrulesdir
 modlibexecdir
 PREOPEN_MODS
 PREOPEN_MODS_FALSE
@@ -766,10 +765,6 @@
 PA_SYSTEM_USER
 BUILD_MANPAGES_FALSE
 BUILD_MANPAGES_TRUE
-HAVE_FFTW_FALSE
-HAVE_FFTW_TRUE
-FFTW_LIBS
-FFTW_CFLAGS
 HAVE_OPENSSL_FALSE
 HAVE_OPENSSL_TRUE
 HAVE_OPENSSL
@@ -841,9 +836,6 @@
 HAVE_ALSA
 ASOUNDLIB_LIBS
 ASOUNDLIB_CFLAGS
-HAVE_COREAUDIO_FALSE
-HAVE_COREAUDIO_TRUE
-HAVE_COREAUDIO
 HAVE_OSS_WRAPPER_FALSE
 HAVE_OSS_WRAPPER_TRUE
 HAVE_OSS_OUTPUT_FALSE
@@ -925,9 +917,6 @@
 ALLOCA
 HAVE_MKFIFO_FALSE
 HAVE_MKFIFO_TRUE
-HAVE_BONJOUR_FALSE
-HAVE_BONJOUR_TRUE
-HAVE_BONJOUR
 PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
@@ -940,8 +929,6 @@
 HAVE_AF_UNIX_TRUE
 HAVE_REGEX_FALSE
 HAVE_REGEX_TRUE
-OS_IS_DARWIN_FALSE
-OS_IS_DARWIN_TRUE
 OS_IS_WIN32_FALSE
 OS_IS_WIN32_TRUE
 LIBLTDL
@@ -990,7 +977,6 @@
 LDFLAGS
 CFLAGS
 CC
-STOW
 host_os
 host_vendor
 host_cpu
@@ -1081,6 +1067,7 @@
 enable_default_build_tests
 enable_atomic_arm_linux_helpers
 enable_atomic_arm_memory_barrier
+enable_netbsd_atomic_ops
 enable_static
 enable_shared
 with_pic
@@ -1097,7 +1084,6 @@
 with_database
 enable_oss_output
 enable_oss_wrapper
-enable_coreaudio_output
 enable_alsa
 enable_solaris
 enable_glib2
@@ -1115,7 +1101,6 @@
 enable_dbus
 enable_ipv6
 enable_openssl
-with_fftw
 enable_manpages
 with_system_user
 with_system_group
@@ -1125,7 +1110,6 @@
 enable_static_bins
 with_preopen_mods
 with_module_dir
-with_udev_rules_dir
 enable_force_preopen
 '
       ac_precious_vars='build_alias
@@ -1171,9 +1155,7 @@
 DBUS_CFLAGS
 DBUS_LIBS
 OPENSSL_CFLAGS
-OPENSSL_LIBS
-FFTW_CFLAGS
-FFTW_LIBS'
+OPENSSL_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1715,7 +1697,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pulseaudio 0.9.19-341-g62bf to adapt to many kinds of systems.
+\`configure' configures pulseaudio 0.9.21-24-gfa64 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1785,7 +1767,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pulseaudio 0.9.19-341-g62bf:";;
+     short | recursive ) echo "Configuration of pulseaudio 0.9.21-24-gfa64:";;
    esac
   cat <<\_ACEOF
 
@@ -1803,6 +1785,8 @@
                           use inline asm or libatomic_ops instead
   --enable-atomic-arm-memory-barrier
                           only really needed in SMP arm systems
+  --enable-netbsd-atomic-ops
+                          Use the native NetBSD atomic_ops implementation
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1815,8 +1799,6 @@
   --disable-samplerate    Disable optional libsamplerate support
   --disable-oss-output    Disable optional OSS output support
   --disable-oss-wrapper   Disable optional OSS wrapper support
-  --disable-coreaudio-output
-                          Disable optional CoreAudio output support
   --disable-alsa          Disable optional ALSA support
   --disable-solaris       Disable optional Solaris audio support
   --disable-glib2         Disable optional GLib 2 support
@@ -1855,7 +1837,6 @@
   --without-caps          Omit support for POSIX capabilities.
   --with-database=auto|tdb|gdbm|simple
                           Choose database backend.
-  --without-fftw          Omit FFTW-using modules (equalizer)
   --with-system-user=<user>
                           User for running the PulseAudio daemon as a
                           system-wide instance (pulse)
@@ -1868,8 +1849,6 @@
   --with-preopen-mods     Modules to preopen in daemon (default: all).
   --with-module-dir       Directory where to install the modules to (defaults
                           to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules
-  --with-udev-rules-dir   Directory where to install udev rules to (defaults
-                          to /lib/udev/rules.d)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1932,8 +1911,6 @@
               C compiler flags for OPENSSL, overriding pkg-config
   OPENSSL_LIBS
               linker flags for OPENSSL, overriding pkg-config
-  FFTW_CFLAGS C compiler flags for FFTW, overriding pkg-config
-  FFTW_LIBS   linker flags for FFTW, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2001,7 +1978,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pulseaudio configure 0.9.19-341-g62bf
+pulseaudio configure 0.9.21-24-gfa64
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2465,7 +2442,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pulseaudio $as_me 0.9.19-341-g62bf, which was
+It was created by pulseaudio $as_me 0.9.21-24-gfa64, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2817,8 +2794,6 @@
 as_fn_append ac_func_list " strsignal"
 as_fn_append ac_func_list " sig2str"
 as_fn_append ac_func_list " strtof_l"
-as_fn_append ac_func_list " pipe2"
-as_fn_append ac_func_list " accept4"
 as_fn_append ac_func_list " open64"
 as_fn_append ac_header_list " valgrind/memcheck.h"
 # Check that the precious variables saved in the cache have kept the same
@@ -3366,7 +3341,7 @@
 
 # Define the identity of the package.
  PACKAGE='pulseaudio'
- VERSION='0.9.19-341-g62bf'
+ VERSION='0.9.21-24-gfa64'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3507,12 +3482,12 @@
 
 PA_API_VERSION=12
 
-PA_PROTOCOL_VERSION=17
+PA_PROTOCOL_VERSION=16
 
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-LIBPULSE_VERSION_INFO=12:0:12
+LIBPULSE_VERSION_INFO=12:2:12
 
 
 # A simplified, synchronous, ABI-stable interface for client
@@ -3607,52 +3582,32 @@
 _ACEOF
 
 
-# Extract the first word of "stow", so it can be a program name with args.
-set dummy stow; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STOW+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STOW"; then
-  ac_cv_prog_STOW="$STOW" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STOW="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_STOW" && ac_cv_prog_STOW="no"
-fi
-fi
-STOW=$ac_cv_prog_STOW
-if test -n "$STOW"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STOW" >&5
-$as_echo "$STOW" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if type -p stow > /dev/null && test -d /usr/local/stow ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&5
+$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&6;}
+   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 fi
 
+#### Platform hacks ####
 
+case $host in
+   *-*-solaris* )
 
-if test "x$STOW" = "xyes" && test -d /usr/local/stow; then :
+$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&5
-$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&6;}
-   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 
-fi
+$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+      ;;
+   *-*-darwin* )
+
+$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
+
+
+$as_echo "#define _DARWIN_C_SOURCE 200112L" >>confdefs.h
+
+      ;;
+esac
 
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
@@ -5461,27 +5416,6 @@
 
 
 
-#### Platform hacks ####
-
-case $host in
-   *-*-solaris* )
-
-$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
-
-
-$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-      ;;
-   *-*-darwin* )
-
-$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
-
-
-$as_echo "#define _DARWIN_C_SOURCE 200112L" >>confdefs.h
-
-      ;;
-esac
-
 # M4
 
 for ac_prog in gm4 m4
@@ -5764,6 +5698,20 @@
 fi
 
 
+# Check whether --enable-netbsd-atomic-ops was given.
+if test "${enable_netbsd_atomic_ops+set}" = set; then :
+  enableval=$enable_netbsd_atomic_ops;
+            case "${enableval}" in
+                yes) atomic_netbsd_helpers=yes ;;
+                no) atomic_netbsd_helpers=no ;;
+                *) as_fn_error "bad value ${enableval} for --enable-netbsd-atomic-ops" "$LINENO" 5 ;;
+            esac
+
+else
+  atomic_netbsd_helpers=auto
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target operating system" >&5
 $as_echo_n "checking target operating system... " >&6; }
 case $host in
@@ -5772,10 +5720,10 @@
 $as_echo "linux" >&6; }
             pulse_target_os=linux
         ;;
-        *-*-darwin*)
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: darwin" >&5
-$as_echo "darwin" >&6; }
-            pulse_target_os=darwin
+        *-*-netbsd*)
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: netbsd" >&5
+$as_echo "netbsd" >&6; }
+            pulse_target_os=netbsd
         ;;
         *)
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
@@ -5824,7 +5772,7 @@
     # HW specific atomic ops stuff
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking architecture for native atomic operations" >&5
 $as_echo_n "checking architecture for native atomic operations... " >&6; }
-    case $host in
+    case $host_cpu in
         arm*)
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: arm" >&5
 $as_echo "arm" >&6; }
@@ -5890,19 +5838,20 @@
 fi
            fi
         ;;
-	*-netbsdelf5*)
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            need_libatomic_ops=no
-	;;
-	*-freebsd*)
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            need_libatomic_ops=no
-	;;
         *)
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+            if test "x$pulse_target_os" = "xnetbsd" && test "x$atomic_netbsd_helpers" = "xyes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define NETBSD_ATOMIC_OPS 1
+_ACEOF
+
+                need_libatomic_ops=no
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
+            fi
         ;;
     esac
 fi
@@ -6459,13 +6408,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6462: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6411: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6465: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6414: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6468: output\"" >&5)
+  (eval echo "\"\$as_me:6417: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7667,7 +7616,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7670 "configure"' > conftest.$ac_ext
+  echo '#line 7619 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9225,11 +9174,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9177: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9232: \$? = $ac_status" >&5
+   echo "$as_me:9181: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9564,11 +9513,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9567: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9516: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9571: \$? = $ac_status" >&5
+   echo "$as_me:9520: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9669,11 +9618,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9672: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9621: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9676: \$? = $ac_status" >&5
+   echo "$as_me:9625: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9724,11 +9673,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9676: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9731: \$? = $ac_status" >&5
+   echo "$as_me:9680: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12108,7 +12057,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12111 "configure"
+#line 12060 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12204,7 +12153,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12207 "configure"
+#line 12156 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12491,7 +12440,6 @@
 #### Determine build environment ####
 
 os_is_win32=0
-os_is_darwin=0
 
 case "$host_os" in
         mingw*)
@@ -12500,12 +12448,6 @@
 
         os_is_win32=1
                 ;;
-        darwin*)
-
-$as_echo "#define OS_IS_DARWIN 1" >>confdefs.h
-
-        os_is_darwin=1
-                ;;
         esac
 
  if test "x$os_is_win32" = "x1"; then
@@ -12516,14 +12458,6 @@
   OS_IS_WIN32_FALSE=
 fi
 
- if test "x$os_is_darwin" = "x1"; then
-  OS_IS_DARWIN_TRUE=
-  OS_IS_DARWIN_FALSE='#'
-else
-  OS_IS_DARWIN_TRUE='#'
-  OS_IS_DARWIN_FALSE=
-fi
-
 
 ###################################
 #   Basic environment checks      #
@@ -14381,38 +14315,6 @@
 done
 
 
-# Darwin/OS X
-if test "x$os_is_darwin" = "x1" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking looking for Apple CoreService Framework" >&5
-$as_echo_n "checking looking for Apple CoreService Framework... " >&6; }
-    # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
-    ac_fn_c_check_header_mongrel "$LINENO" "/Developer/Headers/FlatCarbon/CoreServices.h" "ac_cv_header__Developer_Headers_FlatCarbon_CoreServices_h" "$ac_includes_default"
-if test "x$ac_cv_header__Developer_Headers_FlatCarbon_CoreServices_h" = x""yes; then :
-  LIBS="$LIBS -framework CoreServices"
-else
-  as_fn_error "CoreServices.h header file not found" "$LINENO" 5
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
-
-    HAVE_BONJOUR=1
-fi
-
-
- if test "x$HAVE_BONJOUR" = x1; then
-  HAVE_BONJOUR_TRUE=
-  HAVE_BONJOUR_FALSE='#'
-else
-  HAVE_BONJOUR_TRUE='#'
-  HAVE_BONJOUR_FALSE=
-fi
-
-
 #### Check for functions ####
 
 # ISO
@@ -15014,10 +14916,6 @@
 
 
 
-
-
-
-
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
@@ -18618,49 +18516,6 @@
 fi
 
 
-#### CoreAudio support (optional) ####
-
-# Check whether --enable-coreaudio-output was given.
-if test "${enable_coreaudio_output+set}" = set; then :
-  enableval=$enable_coreaudio_output;
-            case "${enableval}" in
-                yes) coreaudio_enabled=yes ;;
-                no) coreaudio_enabled=no ;;
-                *) as_fn_error "bad value ${enableval} for --disable-coreaudio-output" "$LINENO" 5 ;;
-            esac
-
-else
-  coreaudio_enabled=auto
-fi
-
-
-if test "x${coreaudio_enabled}" != xno ; then
-    for ac_header in CoreAudio/CoreAudio.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "CoreAudio/CoreAudio.h" "ac_cv_header_CoreAudio_CoreAudio_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_COREAUDIO_COREAUDIO_H 1
-_ACEOF
- HAVE_COREAUDIO=1
-fi
-
-done
-
-else
-    HAVE_COREAUDIO=0
-fi
-
-
- if test "x$HAVE_COREAUDIO" = x1 && test "x${coreaudio_enabled}" != "xno"; then
-  HAVE_COREAUDIO_TRUE=
-  HAVE_COREAUDIO_FALSE='#'
-else
-  HAVE_COREAUDIO_TRUE='#'
-  HAVE_COREAUDIO_FALSE=
-fi
-
-
 #### ALSA support (optional) ####
 
 # Check whether --enable-alsa was given.
@@ -20176,7 +20031,6 @@
             HAVE_DBUS=1
             saved_LIBS="$LIBS"
             LIBS="$LIBS $DBUS_LIBS"
-            CFLAGS="$CFLAGS $DBUS_CFLAGS"
             for ac_func in dbus_watch_get_unix_fd
 do :
   ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd"
@@ -20355,96 +20209,6 @@
 fi
 
 
-#### FFTW (optional) ####
-
-# Check whether --with-fftw was given.
-if test "${with_fftw+set}" = set; then :
-  withval=$with_fftw;
-fi
-
-
-if test "x${with_fftw}" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW" >&5
-$as_echo_n "checking for FFTW... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$FFTW_CFLAGS"; then
-        pkg_cv_FFTW_CFLAGS="$FFTW_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "fftw3f") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FFTW_CFLAGS=`$PKG_CONFIG --cflags "fftw3f" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$FFTW_LIBS"; then
-        pkg_cv_FFTW_LIBS="$FFTW_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "fftw3f") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_FFTW_LIBS=`$PKG_CONFIG --libs "fftw3f" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        FFTW_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fftw3f"`
-        else
-	        FFTW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fftw3f"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FFTW_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                HAVE_FFTW=0
-elif test $pkg_failed = untried; then
-	HAVE_FFTW=0
-else
-	FFTW_CFLAGS=$pkg_cv_FFTW_CFLAGS
-	FFTW_LIBS=$pkg_cv_FFTW_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_FFTW=1
-fi
-fi
- if test "x$HAVE_FFTW" = "x1"; then
-  HAVE_FFTW_TRUE=
-  HAVE_FFTW_FALSE='#'
-else
-  HAVE_FFTW_TRUE='#'
-  HAVE_FFTW_FALSE=
-fi
-
-
 ### Build and Install man pages ###
 # Check whether --enable-manpages was given.
 if test "${enable_manpages+set}" = set; then :
@@ -20618,17 +20382,6 @@
 
 
 
-
-# Check whether --with-udev-rules-dir was given.
-if test "${with_udev_rules_dir+set}" = set; then :
-  withval=$with_udev_rules_dir; udevrulesdir=$withval
-else
-  udevrulesdir="/lib/udev/rules.d"
-fi
-
-
-
-
 # Check whether --enable-force-preopen was given.
 if test "${enable_force_preopen+set}" = set; then :
   enableval=$enable_force_preopen; FORCE_PREOPEN=$enableval
@@ -20769,10 +20522,6 @@
   as_fn_error "conditional \"OS_IS_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${OS_IS_DARWIN_TRUE}" && test -z "${OS_IS_DARWIN_FALSE}"; then
-  as_fn_error "conditional \"OS_IS_DARWIN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_REGEX_TRUE}" && test -z "${HAVE_REGEX_FALSE}"; then
   as_fn_error "conditional \"HAVE_REGEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20790,10 +20539,6 @@
   as_fn_error "conditional \"HAVE_SIGXCPU\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_BONJOUR_TRUE}" && test -z "${HAVE_BONJOUR_FALSE}"; then
-  as_fn_error "conditional \"HAVE_BONJOUR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_MKFIFO_TRUE}" && test -z "${HAVE_MKFIFO_FALSE}"; then
   as_fn_error "conditional \"HAVE_MKFIFO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20830,10 +20575,6 @@
   as_fn_error "conditional \"HAVE_OSS_WRAPPER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_COREAUDIO_TRUE}" && test -z "${HAVE_COREAUDIO_FALSE}"; then
-  as_fn_error "conditional \"HAVE_COREAUDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
   as_fn_error "conditional \"HAVE_ALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20894,10 +20635,6 @@
   as_fn_error "conditional \"HAVE_OPENSSL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_FFTW_TRUE}" && test -z "${HAVE_FFTW_FALSE}"; then
-  as_fn_error "conditional \"HAVE_FFTW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
   as_fn_error "conditional \"BUILD_MANPAGES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21322,7 +21059,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pulseaudio $as_me 0.9.19-341-g62bf, which was
+This file was extended by pulseaudio $as_me 0.9.21-24-gfa64, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21388,7 +21125,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pulseaudio config.status 0.9.19-341-g62bf
+pulseaudio config.status 0.9.21-24-gfa64
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
@@ -23183,11 +22920,6 @@
    fi
 fi
 
-ENABLE_COREAUDIO=no
-if test "x$HAVE_COREAUDIO" = "x1" ; then
-   ENABLE_COREAUDIO=yes
-fi
-
 ENABLE_ALSA=no
 if test "x$HAVE_ALSA" = "x1" ; then
    ENABLE_ALSA=yes
@@ -23278,11 +23010,6 @@
     ENABLE_SIMPLEDB=yes
 fi
 
-ENABLE_FFTW=no
-if test "x${HAVE_FFTW}" = "x1" ; then
-   ENABLE_FFTW=yes
-fi
-
 ENABLE_OPENSSL=no
 if test "x${HAVE_OPENSSL}" = "x1" ; then
    ENABLE_OPENSSL=yes
@@ -23313,7 +23040,6 @@
     Have X11:                      ${ENABLE_X11}
     Enable OSS Output:             ${ENABLE_OSS_OUTPUT}
     Enable OSS Wrapper:            ${ENABLE_OSS_WRAPPER}
-    Enable CoreAudio:              ${ENABLE_COREAUDIO}
     Enable Alsa:                   ${ENABLE_ALSA}
     Enable Solaris:                ${ENABLE_SOLARIS}
     Enable GLib 2.0:               ${ENABLE_GLIB20}
@@ -23334,7 +23060,6 @@
     Enable tdb:                    ${ENABLE_TDB}
     Enable gdbm:                   ${ENABLE_GDBM}
     Enable simple database:        ${ENABLE_SIMPLEDB}
-    Enable fftw:                   ${ENABLE_FFTW}
 
     System User:                   ${PA_SYSTEM_USER}
     System Group:                  ${PA_SYSTEM_GROUP}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/configure.ac pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/configure.ac
--- pulseaudio-0.9.22~0.9.21+341-g62bf/configure.ac	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/configure.ac	2010-01-15 23:21:18.000000000 +0000
@@ -22,7 +22,8 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[mzchyfrnhqvb (at) 0pointer (dot) net])
+AC_INIT([pulseaudio], m4_esyscmd([./git-version-gen .tarball-version]),
+	[mzchyfrnhqvb (at) 0pointer (dot) net])
 AC_CONFIG_SRCDIR([src/daemon/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -40,11 +41,11 @@
 AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/])
 
 AC_SUBST(PA_API_VERSION, 12)
-AC_SUBST(PA_PROTOCOL_VERSION, 17)
+AC_SUBST(PA_PROTOCOL_VERSION, 16)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [12:0:12])
+AC_SUBST(LIBPULSE_VERSION_INFO, [12:2:12])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z
@@ -61,12 +62,23 @@
 AC_CANONICAL_HOST
 AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
 
-AC_CHECK_PROG([STOW], [stow], [yes], [no])
-
-AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
+if type -p stow > /dev/null && test -d /usr/local/stow ; then
    AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
    ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
-])
+fi
+
+#### Platform hacks ####
+
+case $host in
+   *-*-solaris* )
+      AC_DEFINE(_XOPEN_SOURCE,        600, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      ;;
+   *-*-darwin* )
+      AC_DEFINE([_POSIX_C_SOURCE], [200112L], [Needed to get clock_gettime on Mac OS X])
+      AC_DEFINE([_DARWIN_C_SOURCE], [200112L], [Needed to get NSIG on Mac OS X])
+      ;;
+esac
 
 AM_SILENT_RULES([yes])
 
@@ -84,19 +96,6 @@
 AC_PROG_GCC_TRADITIONAL
 AC_USE_SYSTEM_EXTENSIONS
 
-#### Platform hacks ####
-
-case $host in
-   *-*-solaris* )
-      AC_DEFINE(_XOPEN_SOURCE,        600, Needed to get declarations for msg_control and msg_controllen on Solaris)
-      AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-      ;;
-   *-*-darwin* )
-      AC_DEFINE([_POSIX_C_SOURCE], [200112L], [Needed to get clock_gettime on Mac OS X])
-      AC_DEFINE([_DARWIN_C_SOURCE], [200112L], [Needed to get NSIG on Mac OS X])
-      ;;
-esac
-
 # M4
 
 AC_CHECK_PROGS([M4], gm4 m4, no)
@@ -166,15 +165,26 @@
             esac
         ],)
 
+AC_ARG_ENABLE([netbsd-atomic-ops],
+    AS_HELP_STRING([--enable-netbsd-atomic-ops],[Use the native NetBSD atomic_ops implementation]),
+        [
+            case "${enableval}" in
+                yes) atomic_netbsd_helpers=yes ;;
+                no) atomic_netbsd_helpers=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-netbsd-atomic-ops) ;;
+            esac
+        ],
+        [atomic_netbsd_helpers=auto])
+
 AC_MSG_CHECKING([target operating system])
 case $host in
         *-*-linux*)
             AC_MSG_RESULT([linux])
             pulse_target_os=linux
         ;;
-        *-*-darwin*)
-            AC_MSG_RESULT([darwin])
-            pulse_target_os=darwin
+        *-*-netbsd*)
+            AC_MSG_RESULT([netbsd])
+            pulse_target_os=netbsd
         ;;
         *)
             AC_MSG_RESULT([unknown])
@@ -199,7 +209,7 @@
 else
     # HW specific atomic ops stuff
     AC_MSG_CHECKING([architecture for native atomic operations])
-    case $host in
+    case $host_cpu in
         arm*)
             AC_MSG_RESULT([arm])
             AC_MSG_CHECKING([whether we can use Linux kernel helpers])
@@ -235,16 +245,14 @@
                  ])
            fi
         ;;
-	*-netbsdelf5*)
-            AC_MSG_RESULT([yes])
-            need_libatomic_ops=no
-	;;
-	*-freebsd*)
-            AC_MSG_RESULT([yes])
-            need_libatomic_ops=no
-	;;
         *)
-            AC_MSG_RESULT([unknown])
+            if test "x$pulse_target_os" = "xnetbsd" && test "x$atomic_netbsd_helpers" = "xyes"; then
+                AC_MSG_RESULT([yes])
+                AC_DEFINE_UNQUOTED(NETBSD_ATOMIC_OPS, 1, [netbsd implementation])
+                need_libatomic_ops=no
+            else
+                AC_MSG_RESULT([unknown])
+            fi
         ;;
     esac
 fi
@@ -295,21 +303,15 @@
 #### Determine build environment ####
 
 os_is_win32=0
-os_is_darwin=0
 
 case "$host_os" in
         mingw*)
         AC_DEFINE([OS_IS_WIN32], 1, [Build target is Windows.])
         os_is_win32=1
                 ;;
-        darwin*)
-        AC_DEFINE([OS_IS_DARWIN], 1, [Build target is Darwin.])
-        os_is_darwin=1
-                ;;
         esac
 
 AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1")
-AM_CONDITIONAL(OS_IS_DARWIN, test "x$os_is_darwin" = "x1")
 
 ###################################
 #   Basic environment checks      #
@@ -413,22 +415,6 @@
 # build, disabling its ability to make dlls.
 AC_CHECK_FUNCS([getopt_long], [], [AC_CHECK_LIB([iberty], [getopt_long])])
 
-# Darwin/OS X
-if test "x$os_is_darwin" = "x1" ; then
-    AC_MSG_CHECKING([looking for Apple CoreService Framework])
-    # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
-    AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h],
-    [LIBS="$LIBS -framework CoreServices"],
-    [AC_MSG_ERROR([CoreServices.h header file not found]) ])
-
-    AC_MSG_RESULT([ok])
-    AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
-    HAVE_BONJOUR=1
-fi
-
-AC_SUBST(HAVE_BONJOUR)
-AM_CONDITIONAL([HAVE_BONJOUR], [test "x$HAVE_BONJOUR" = x1])
-
 #### Check for functions ####
 
 # ISO
@@ -460,7 +446,7 @@
 
 # Non-standard
 
-AC_CHECK_FUNCS_ONCE([setresuid setresgid setreuid setregid seteuid setegid ppoll strsignal sig2str strtof_l pipe2 accept4])
+AC_CHECK_FUNCS_ONCE([setresuid setresgid setreuid setregid seteuid setegid ppoll strsignal sig2str strtof_l])
 
 AC_FUNC_ALLOCA
 
@@ -757,28 +743,6 @@
 AM_CONDITIONAL([HAVE_OSS_OUTPUT], [test "x$HAVE_OSS" = x1 && test "x${oss_output}" != "xno"])
 AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test "x$HAVE_OSS" = x1 && test "x${oss_wrapper}" != "xno"])
 
-#### CoreAudio support (optional) ####
-
-AC_ARG_ENABLE([coreaudio-output],
-    AS_HELP_STRING([--disable-coreaudio-output],[Disable optional CoreAudio output support]),
-        [
-            case "${enableval}" in
-                yes) coreaudio_enabled=yes ;;
-                no) coreaudio_enabled=no ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --disable-coreaudio-output) ;;
-            esac
-        ],
-        [coreaudio_enabled=auto])
-
-if test "x${coreaudio_enabled}" != xno ; then
-    AC_CHECK_HEADERS([CoreAudio/CoreAudio.h], HAVE_COREAUDIO=1)
-else
-    HAVE_COREAUDIO=0
-fi
-
-AC_SUBST(HAVE_COREAUDIO)
-AM_CONDITIONAL([HAVE_COREAUDIO], [test "x$HAVE_COREAUDIO" = x1 && test "x${coreaudio_enabled}" != "xno"])
-
 #### ALSA support (optional) ####
 
 AC_ARG_ENABLE([alsa],
@@ -1235,7 +1199,6 @@
             HAVE_DBUS=1
             saved_LIBS="$LIBS"
             LIBS="$LIBS $DBUS_LIBS"
-            CFLAGS="$CFLAGS $DBUS_CFLAGS"
             AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
             LIBS="$saved_LIBS"
             AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.])
@@ -1310,16 +1273,6 @@
 AC_SUBST(HAVE_OPENSSL)
 AM_CONDITIONAL([HAVE_OPENSSL], [test "x$HAVE_OPENSSL" = x1])
 
-#### FFTW (optional) ####
-AC_ARG_WITH(
-	[fftw],
-	AS_HELP_STRING([--without-fftw], [Omit FFTW-using modules (equalizer)]))
-
-if test "x${with_fftw}" != "xno"; then
-    PKG_CHECK_MODULES([FFTW], [fftw3f], [HAVE_FFTW=1], [HAVE_FFTW=0])
-fi
-AM_CONDITIONAL([HAVE_FFTW], [test "x$HAVE_FFTW" = "x1"])
-
 ### Build and Install man pages ###
 AC_ARG_ENABLE(manpages,
         AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]),
@@ -1421,13 +1374,6 @@
 
 AC_SUBST(modlibexecdir)
 
-AC_ARG_WITH(
-        [udev-rules-dir],
-        AS_HELP_STRING([--with-udev-rules-dir],[Directory where to install udev rules to (defaults to /lib/udev/rules.d)]),
-        [udevrulesdir=$withval], [udevrulesdir="/lib/udev/rules.d"])
-
-AC_SUBST(udevrulesdir)
-
 AC_ARG_ENABLE(
         [force-preopen],
         AS_HELP_STRING([--enable-force-preopen],[Preopen modules, even when dlopen() is supported.]),
@@ -1467,11 +1413,6 @@
    fi
 fi
 
-ENABLE_COREAUDIO=no
-if test "x$HAVE_COREAUDIO" = "x1" ; then
-   ENABLE_COREAUDIO=yes
-fi
-
 ENABLE_ALSA=no
 if test "x$HAVE_ALSA" = "x1" ; then
    ENABLE_ALSA=yes
@@ -1562,11 +1503,6 @@
     ENABLE_SIMPLEDB=yes
 fi
 
-ENABLE_FFTW=no
-if test "x${HAVE_FFTW}" = "x1" ; then
-   ENABLE_FFTW=yes
-fi
-
 ENABLE_OPENSSL=no
 if test "x${HAVE_OPENSSL}" = "x1" ; then
    ENABLE_OPENSSL=yes
@@ -1597,7 +1533,6 @@
     Have X11:                      ${ENABLE_X11}
     Enable OSS Output:             ${ENABLE_OSS_OUTPUT}
     Enable OSS Wrapper:            ${ENABLE_OSS_WRAPPER}
-    Enable CoreAudio:              ${ENABLE_COREAUDIO}
     Enable Alsa:                   ${ENABLE_ALSA}
     Enable Solaris:                ${ENABLE_SOLARIS}
     Enable GLib 2.0:               ${ENABLE_GLIB20}
@@ -1618,7 +1553,6 @@
     Enable tdb:                    ${ENABLE_TDB}
     Enable gdbm:                   ${ENABLE_GDBM}
     Enable simple database:        ${ENABLE_SIMPLEDB}
-    Enable fftw:                   ${ENABLE_FFTW}
 
     System User:                   ${PA_SYSTEM_USER}
     System Group:                  ${PA_SYSTEM_GROUP}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/01PulseAudio pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/01PulseAudio
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/01PulseAudio	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/01PulseAudio	2010-01-16 03:12:14.000000000 +0000
@@ -15,14 +15,10 @@
     fi
 }
 
-call_pacmd() {
-    sudo -H -u \#$1 pacmd
-}
-
 # $1 = sink|source
 # $2 = uid
 save_pulse_state_and_mute() {
-    echo list-${1}s | call_pacmd $2 | \
+    sudo -H -u \#$2 pacmd list-${1}s | \
         sed -n 's/^[[:space:]*]*//; /\(index\|mute\)/p' | \
         (index="";
             while read field value; do
@@ -30,7 +26,7 @@
                     index=$value
                 else
                     savestate pulse:$2:$1$index $value
-                    echo set-$1-mute $index yes | call_pacmd $2
+                    sudo -H -u \#$2 pacmd set-$1-mute $index yes
                 fi
             done)
 }
@@ -38,31 +34,31 @@
 # $1 = sink|source
 # $2 = uid
 restore_pulse_state() {
-    echo list-${1}s | call_pacmd $2 | \
+    sudo -H -u \#$2 pacmd list-${1}s | \
         sed -n 's/^[[:space:]*]*index: //p' | \
         while read index; do
             if state_exists pulse:$2:$1$index; then
-                echo set-$1-mute \
+                sudo -H -u \#$2 pacmd \
+                    set-$1-mute \
                     $index \
-                    $(restorestate pulse:$2:$1$index) | \
-                    call_pacmd $2;
+                    $(restorestate pulse:$2:$1$index);
             fi
         done
 }
 
 suspend_pulse() {
     for i in $(get_pulse_users); do
-        save_pulse_state_and_mute sink $i > /dev/null 2>&1
-        save_pulse_state_and_mute source $i > /dev/null 2>&1
-        echo suspend true | call_pacmd $i > /dev/null 2>&1
+        save_pulse_state_and_mute sink $i
+        save_pulse_state_and_mute source $i
+        sudo -H -u \#$i pacmd suspend true
     done
 }
 
 resume_pulse() {
     for i in $(get_pulse_users); do
-        restore_pulse_state sink $i > /dev/null 2>&1
-        restore_pulse_state source $i > /dev/null 2>&1
-        echo suspend false | call_pacmd $i > /dev/null 2>&1
+        restore_pulse_state sink $i
+        restore_pulse_state source $i
+        sudo -H -u \#$i pacmd suspend false
     done
 }
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/changelog pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/changelog
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/changelog	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/changelog	2010-01-16 03:12:14.000000000 +0000
@@ -1,3 +1,20 @@
+pulseaudio (1:0.9.22~0.9.21+stable-queue-24-gfa64-0ubuntu1) lucid; urgency=low
+
+  * Reroll actual stable-queue tarball (arrrg!)
+  * debian/01PulseAudio: Rework pacmd bits (LP: #507941)
+  * debian/patches/:
+    + add:  0099-back-out-8d3566.patch (upstream says this commit causes
+            regressions)
+    - drop: 0099-change-configure-git-version-tag.patch (no longer
+            relevant)
+    + refresh: 0001-change-resample-and-buffering.patch
+               0054-mute-iec958-optical-raw-for-audigyX.patch
+               0090-disable-flat-volumes.patch
+               0091-dont-load-cork-music-on-phone.patch
+               0057-load-module-x11-bell.patch
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Fri, 15 Jan 2010 19:06:15 -0500
+
 pulseaudio (1:0.9.22~0.9.21+341-g62bf-0ubuntu1) lucid; urgency=low
 
   * New snapshot based on stable-queue git branch (testing requested
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0001-change-resample-and-buffering.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0001-change-resample-and-buffering.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0001-change-resample-and-buffering.patch	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0001-change-resample-and-buffering.patch	2010-01-16 03:12:14.000000000 +0000
@@ -1,8 +1,8 @@
-Index: pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon.conf.in
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in
 ===================================================================
---- pulseaudio-0.9.22~0.9.21+341-g62bf.orig/src/daemon/daemon.conf.in	2010-01-14 20:20:45.000000000 -0500
-+++ pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon.conf.in	2010-01-14 20:39:02.000000000 -0500
-@@ -51,7 +51,7 @@
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/daemon/daemon.conf.in	2010-01-15 18:21:18.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in	2010-01-15 19:16:30.000000000 -0500
+@@ -50,7 +50,7 @@
  ; log-time = no
  ; log-backtrace = 0
  
@@ -11,7 +11,7 @@
  ; enable-remixing = yes
  ; enable-lfe-remixing = no
  
-@@ -78,5 +78,5 @@
+@@ -77,5 +77,5 @@
  ; default-sample-channels = 2
  ; default-channel-map = front-left,front-right
  
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch	2010-01-16 03:12:14.000000000 +0000
@@ -1,10 +1,10 @@
-Index: pulseaudio-0.9.19-237-g721e/src/modules/alsa/mixer/paths/analog-output.conf.common
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-output.conf.common
 ===================================================================
---- pulseaudio-0.9.19-237-g721e.orig/src/modules/alsa/mixer/paths/analog-output.conf.common	2009-11-06 19:20:10.000000000 -0500
-+++ pulseaudio-0.9.19-237-g721e/src/modules/alsa/mixer/paths/analog-output.conf.common	2009-11-06 19:22:01.000000000 -0500
-@@ -110,6 +110,9 @@
- name = output-amplifier-off
- priority = 0
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/modules/alsa/mixer/paths/analog-output.conf.common	2010-01-15 18:21:18.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-output.conf.common	2010-01-15 19:17:12.000000000 -0500
+@@ -121,6 +121,9 @@
+ name = output-bass-boost-off
+ priority = 10
  
 +[Element IEC958 Optical Raw]
 +switch = off
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0057-load-module-x11-bell.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0057-load-module-x11-bell.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0057-load-module-x11-bell.patch	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0057-load-module-x11-bell.patch	2010-01-16 03:12:14.000000000 +0000
@@ -1,8 +1,8 @@
-Index: pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/start-pulseaudio-x11.in
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/start-pulseaudio-x11.in
 ===================================================================
---- pulseaudio-0.9.22~0.9.21+341-g62bf.orig/src/daemon/start-pulseaudio-x11.in	2010-01-14 20:20:45.000000000 -0500
-+++ pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/start-pulseaudio-x11.in	2010-01-14 20:45:22.000000000 -0500
-@@ -24,6 +24,7 @@
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/daemon/start-pulseaudio-x11.in	2010-01-15 18:21:18.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/start-pulseaudio-x11.in	2010-01-15 19:18:04.000000000 -0500
+@@ -26,6 +26,7 @@
  if [ x"$DISPLAY" != x ] ; then
  
      @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0090-disable-flat-volumes.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0090-disable-flat-volumes.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0090-disable-flat-volumes.patch	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0090-disable-flat-volumes.patch	2010-01-16 03:12:14.000000000 +0000
@@ -1,8 +1,8 @@
-Index: pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon.conf.in
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in
 ===================================================================
---- pulseaudio-0.9.22~0.9.21+341-g62bf.orig/src/daemon/daemon.conf.in	2010-01-14 20:44:39.000000000 -0500
-+++ pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon.conf.in	2010-01-14 20:44:44.000000000 -0500
-@@ -55,7 +55,7 @@
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/daemon/daemon.conf.in	2010-01-15 19:16:30.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in	2010-01-15 19:17:37.000000000 -0500
+@@ -54,7 +54,7 @@
  ; enable-remixing = yes
  ; enable-lfe-remixing = no
  
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0091-dont-load-cork-music-on-phone.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0091-dont-load-cork-music-on-phone.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0091-dont-load-cork-music-on-phone.patch	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0091-dont-load-cork-music-on-phone.patch	2010-01-16 03:12:14.000000000 +0000
@@ -1,8 +1,8 @@
-Index: pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/default.pa.in
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/default.pa.in
 ===================================================================
---- pulseaudio-0.9.22~0.9.21+341-g62bf.orig/src/daemon/default.pa.in	2010-01-14 20:44:41.000000000 -0500
-+++ pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/default.pa.in	2010-01-14 20:45:02.000000000 -0500
-@@ -118,7 +118,7 @@
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/daemon/default.pa.in	2010-01-15 19:17:06.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/default.pa.in	2010-01-15 19:17:51.000000000 -0500
+@@ -115,7 +115,7 @@
  load-module module-position-event-sounds
  
  ### Cork music streams when a phone stream is active
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0099-back-out-8d3566.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0099-back-out-8d3566.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0099-back-out-8d3566.patch	1970-01-01 01:00:00.000000000 +0100
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0099-back-out-8d3566.patch	2010-01-16 03:12:14.000000000 +0000
@@ -0,0 +1,251 @@
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/stream.c
+===================================================================
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/pulse/stream.c	2010-01-15 18:21:18.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/stream.c	2010-01-15 19:18:19.000000000 -0500
+@@ -743,8 +743,6 @@
+ 
+     s->requested_bytes += bytes;
+ 
+-    /* pa_log("got request for %lli, now at %lli", (long long) bytes, (long long) s->requested_bytes); */
+-
+     if (s->requested_bytes > 0 && s->write_callback)
+         s->write_callback(s, (size_t) s->requested_bytes, s->write_userdata);
+ 
+@@ -1377,8 +1375,6 @@
+      * that's OK, the server side applies the same error */
+     s->requested_bytes -= (seek == PA_SEEK_RELATIVE ? offset : 0) + (int64_t) length;
+ 
+-    /* pa_log("wrote %lli, now at %lli", (long long) length, (long long) s->requested_bytes); */
+-
+     if (s->direction == PA_STREAM_PLAYBACK) {
+ 
+         /* Update latency request correction */
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/memblockq.c
+===================================================================
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/pulsecore/memblockq.c	2010-01-15 18:21:19.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/memblockq.c	2010-01-15 19:18:19.000000000 -0500
+@@ -55,7 +55,8 @@
+     pa_bool_t in_prebuf;
+     pa_memchunk silence;
+     pa_mcalign *mcalign;
+-    int64_t missing, requested;
++    int64_t missing;
++    size_t requested;
+ };
+ 
+ pa_memblockq* pa_memblockq_new(
+@@ -83,8 +84,8 @@
+     pa_log_debug("memblockq requested: maxlength=%lu, tlength=%lu, base=%lu, prebuf=%lu, minreq=%lu maxrewind=%lu",
+                  (unsigned long) maxlength, (unsigned long) tlength, (unsigned long) base, (unsigned long) prebuf, (unsigned long) minreq, (unsigned long) maxrewind);
+ 
+-    bq->missing = bq->requested = 0;
+-    bq->maxlength = bq->tlength = bq->prebuf = bq->minreq = bq->maxrewind = 0;
++    bq->missing = 0;
++    bq->requested = bq->maxlength = bq->tlength = bq->prebuf = bq->minreq = bq->maxrewind = 0;
+     bq->in_prebuf = TRUE;
+ 
+     pa_memblockq_set_maxlength(bq, maxlength);
+@@ -245,34 +246,10 @@
+     return TRUE;
+ }
+ 
+-static void write_index_changed(pa_memblockq *bq, int64_t old_write_index, pa_bool_t account) {
+-    int64_t delta;
+-
+-    pa_assert(bq);
+-
+-    delta = bq->write_index - old_write_index;
+-
+-    if (account)
+-        bq->requested -= delta;
+-
+-    /* pa_log("pushed/seeked %lli: requested counter at %lli, account=%i", (long long) delta, (long long) bq->requested, account); */
+-}
+-
+-static void read_index_changed(pa_memblockq *bq, int64_t old_read_index) {
+-    int64_t delta;
+-
+-    pa_assert(bq);
+-
+-    delta = bq->read_index - old_read_index;
+-    bq->missing += delta;
+-
+-    /* pa_log("popped %lli: missing counter at %lli", (long long) delta, (long long) bq->missing); */
+-}
+-
+ int pa_memblockq_push(pa_memblockq* bq, const pa_memchunk *uchunk) {
+     struct list_item *q, *n;
+     pa_memchunk chunk;
+-    int64_t old;
++    int64_t old, delta;
+ 
+     pa_assert(bq);
+     pa_assert(uchunk);
+@@ -432,7 +409,18 @@
+ 
+ finish:
+ 
+-    write_index_changed(bq, old, TRUE);
++    delta = bq->write_index - old;
++
++    if (delta >= (int64_t) bq->requested) {
++        delta -= (int64_t) bq->requested;
++        bq->requested = 0;
++    } else {
++        bq->requested -= (size_t) delta;
++        delta = 0;
++    }
++
++    bq->missing -= delta;
++
+     return 0;
+ }
+ 
+@@ -526,7 +514,7 @@
+ }
+ 
+ void pa_memblockq_drop(pa_memblockq *bq, size_t length) {
+-    int64_t old;
++    int64_t old, delta;
+     pa_assert(bq);
+     pa_assert(length % bq->base == 0);
+ 
+@@ -565,21 +553,19 @@
+     }
+ 
+     drop_backlog(bq);
+-    read_index_changed(bq, old);
++
++    delta = bq->read_index - old;
++    bq->missing += delta;
+ }
+ 
+ void pa_memblockq_rewind(pa_memblockq *bq, size_t length) {
+-    int64_t old;
+     pa_assert(bq);
+     pa_assert(length % bq->base == 0);
+ 
+-    old = bq->read_index;
+-
+     /* This is kind of the inverse of pa_memblockq_drop() */
+ 
+     bq->read_index -= (int64_t) length;
+-
+-    read_index_changed(bq, old);
++    bq->missing -= (int64_t) length;
+ }
+ 
+ pa_bool_t pa_memblockq_is_readable(pa_memblockq *bq) {
+@@ -616,7 +602,7 @@
+ }
+ 
+ void pa_memblockq_seek(pa_memblockq *bq, int64_t offset, pa_seek_mode_t seek, pa_bool_t account) {
+-    int64_t old;
++    int64_t old, delta;
+     pa_assert(bq);
+ 
+     old = bq->write_index;
+@@ -639,11 +625,24 @@
+     }
+ 
+     drop_backlog(bq);
+-    write_index_changed(bq, old, account);
++
++    delta = bq->write_index - old;
++
++    if (account) {
++        if (delta >= (int64_t) bq->requested) {
++            delta -= (int64_t) bq->requested;
++            bq->requested = 0;
++        } else if (delta >= 0) {
++            bq->requested -= (size_t) delta;
++            delta = 0;
++        }
++    }
++
++    bq->missing -= delta;
+ }
+ 
+ void pa_memblockq_flush_write(pa_memblockq *bq) {
+-    int64_t old;
++    int64_t old, delta;
+     pa_assert(bq);
+ 
+     pa_memblockq_silence(bq);
+@@ -652,11 +651,22 @@
+     bq->write_index = bq->read_index;
+ 
+     pa_memblockq_prebuf_force(bq);
+-    write_index_changed(bq, old, TRUE);
++
++    delta = bq->write_index - old;
++
++    if (delta >= (int64_t) bq->requested) {
++        delta -= (int64_t) bq->requested;
++        bq->requested = 0;
++    } else if (delta >= 0) {
++        bq->requested -= (size_t) delta;
++        delta = 0;
++    }
++
++    bq->missing -= delta;
+ }
+ 
+ void pa_memblockq_flush_read(pa_memblockq *bq) {
+-    int64_t old;
++    int64_t old, delta;
+     pa_assert(bq);
+ 
+     pa_memblockq_silence(bq);
+@@ -665,7 +675,9 @@
+     bq->read_index = bq->write_index;
+ 
+     pa_memblockq_prebuf_force(bq);
+-    read_index_changed(bq, old);
++
++    delta = bq->read_index - old;
++    bq->missing += delta;
+ }
+ 
+ size_t pa_memblockq_get_tlength(pa_memblockq *bq) {
+@@ -762,11 +774,8 @@
+         return 0;
+ 
+     l = (size_t) bq->missing;
+-
+-    bq->requested += bq->missing;
+     bq->missing = 0;
+-
+-    /* pa_log("sent %lli: request counter is at %lli", (long long) l, (long long) bq->requested); */
++    bq->requested += l;
+ 
+     return l;
+ }
+Index: pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-native.c
+===================================================================
+--- pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64.orig/src/pulsecore/protocol-native.c	2010-01-15 18:21:19.000000000 -0500
++++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-native.c	2010-01-15 19:18:19.000000000 -0500
+@@ -1113,8 +1113,6 @@
+ 
+     *missing = (uint32_t) pa_memblockq_pop_missing(s->memblockq);
+ 
+-    /* pa_log("missing original: %li", (long int) *missing); */
+-
+     *ss = s->sink_input->sample_spec;
+     *map = s->sink_input->channel_map;
+ 
+@@ -1139,12 +1137,11 @@
+ 
+     m = pa_memblockq_pop_missing(s->memblockq);
+ 
+-    /* pa_log("request_bytes(%lu) (tlength=%lu minreq=%lu length=%lu really missing=%lli)", */
++    /* pa_log("request_bytes(%lu) (tlength=%lu minreq=%lu length=%lu)", */
+     /*        (unsigned long) m, */
+     /*        pa_memblockq_get_tlength(s->memblockq), */
+     /*        pa_memblockq_get_minreq(s->memblockq), */
+-    /*        pa_memblockq_get_length(s->memblockq), */
+-    /*        (long long) pa_memblockq_get_tlength(s->memblockq) - (long long) pa_memblockq_get_length(s->memblockq)); */
++    /*        pa_memblockq_get_length(s->memblockq)); */
+ 
+     if (m <= 0)
+         return;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0099-change-configure-git-version-tag.patch pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0099-change-configure-git-version-tag.patch
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/0099-change-configure-git-version-tag.patch	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/0099-change-configure-git-version-tag.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-Index: pulseaudio-0.9.22~0.9.21+341-g62bf/configure
-===================================================================
---- pulseaudio-0.9.22~0.9.21+341-g62bf.orig/configure	2010-01-14 21:47:57.000000000 -0500
-+++ pulseaudio-0.9.22~0.9.21+341-g62bf/configure	2010-01-14 22:17:03.000000000 -0500
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.19-341-g62bf.
-+# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.21-341-g62bf.
- #
- # Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
- #
-@@ -701,8 +701,8 @@
- # Identity of this package.
- PACKAGE_NAME='pulseaudio'
- PACKAGE_TARNAME='pulseaudio'
--PACKAGE_VERSION='0.9.19-341-g62bf'
--PACKAGE_STRING='pulseaudio 0.9.19-341-g62bf'
-+PACKAGE_VERSION='0.9.21-341-g62bf'
-+PACKAGE_STRING='pulseaudio 0.9.21-341-g62bf'
- PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net'
- PACKAGE_URL=''
- 
-@@ -1715,7 +1715,7 @@
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures pulseaudio 0.9.19-341-g62bf to adapt to many kinds of systems.
-+\`configure' configures pulseaudio 0.9.21-341-g62bf to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1785,7 +1785,7 @@
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of pulseaudio 0.9.19-341-g62bf:";;
-+     short | recursive ) echo "Configuration of pulseaudio 0.9.21-341-g62bf:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -2001,7 +2001,7 @@
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
--pulseaudio configure 0.9.19-341-g62bf
-+pulseaudio configure 0.9.21-341-g62bf
- generated by GNU Autoconf 2.65
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
-@@ -2465,7 +2465,7 @@
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by pulseaudio $as_me 0.9.19-341-g62bf, which was
-+It was created by pulseaudio $as_me 0.9.21-341-g62bf, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
-@@ -3366,7 +3366,7 @@
- 
- # Define the identity of the package.
-  PACKAGE='pulseaudio'
-- VERSION='0.9.19-341-g62bf'
-+ VERSION='0.9.21-341-g62bf'
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -3512,7 +3512,7 @@
- 
- # The stable ABI for client applications, for the version info x:y:z
- # always will hold y=z
--LIBPULSE_VERSION_INFO=12:0:12
-+LIBPULSE_VERSION_INFO=12:2:12
- 
- 
- # A simplified, synchronous, ABI-stable interface for client
-@@ -21322,7 +21322,7 @@
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by pulseaudio $as_me 0.9.19-341-g62bf, which was
-+This file was extended by pulseaudio $as_me 0.9.21-341-g62bf, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -21388,7 +21388,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--pulseaudio config.status 0.9.19-341-g62bf
-+pulseaudio config.status 0.9.21-341-g62bf
- configured by $0, generated by GNU Autoconf 2.65,
-   with options \\"\$ac_cs_config\\"
- 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/series pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/series
--- pulseaudio-0.9.22~0.9.21+341-g62bf/debian/patches/series	2010-01-16 03:12:14.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/debian/patches/series	2010-01-16 03:12:14.000000000 +0000
@@ -8,4 +8,4 @@
 0091-dont-load-cork-music-on-phone.patch
 0057-load-module-x11-bell.patch
 0055-handle-Master-Front.patch
-0099-change-configure-git-version-tag.patch
+0099-back-out-8d3566.patch
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/doxygen/Makefile.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/doxygen/Makefile.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/doxygen/Makefile.in	2010-01-15 01:27:32.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/doxygen/Makefile.in	2010-01-15 23:52:32.000000000 +0000
@@ -117,8 +117,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFTW_CFLAGS = @FFTW_CFLAGS@
-FFTW_LIBS = @FFTW_LIBS@
 FGREP = @FGREP@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
@@ -137,8 +135,6 @@
 HAVE_ALSA = @HAVE_ALSA@
 HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
-HAVE_BONJOUR = @HAVE_BONJOUR@
-HAVE_COREAUDIO = @HAVE_COREAUDIO@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GCONF = @HAVE_GCONF@
 HAVE_GDBM = @HAVE_GDBM@
@@ -247,7 +243,6 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STOW = @STOW@
 STRIP = @STRIP@
 TDB_CFLAGS = @TDB_CFLAGS@
 TDB_LIBS = @TDB_LIBS@
@@ -314,7 +309,6 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-udevrulesdir = @udevrulesdir@
 all: all-am
 
 .SUFFIXES:
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/m4/ChangeLog pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/m4/ChangeLog
--- pulseaudio-0.9.22~0.9.21+341-g62bf/m4/ChangeLog	2010-01-15 01:27:18.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/m4/ChangeLog	2010-01-15 23:52:17.000000000 +0000
@@ -1,4 +1,4 @@
-2010-01-14  gettextize  <bug-gnu-gettext@gnu.org>
+2010-01-15  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* gettext.m4: New file, from gettext-0.17.
 	* iconv.m4: New file, from gettext-0.17.
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/Makefile.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/Makefile.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/Makefile.in	2010-01-15 01:27:35.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/Makefile.in	2010-01-15 23:52:35.000000000 +0000
@@ -206,8 +206,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFTW_CFLAGS = @FFTW_CFLAGS@
-FFTW_LIBS = @FFTW_LIBS@
 FGREP = @FGREP@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
@@ -226,8 +224,6 @@
 HAVE_ALSA = @HAVE_ALSA@
 HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
-HAVE_BONJOUR = @HAVE_BONJOUR@
-HAVE_COREAUDIO = @HAVE_COREAUDIO@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GCONF = @HAVE_GCONF@
 HAVE_GDBM = @HAVE_GDBM@
@@ -336,7 +332,6 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STOW = @STOW@
 STRIP = @STRIP@
 TDB_CFLAGS = @TDB_CFLAGS@
 TDB_LIBS = @TDB_LIBS@
@@ -403,7 +398,6 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-udevrulesdir = @udevrulesdir@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = \
 	bootstrap.sh \
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/man/Makefile.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/man/Makefile.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/man/Makefile.in	2010-01-15 01:27:32.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/man/Makefile.in	2010-01-15 23:52:32.000000000 +0000
@@ -148,8 +148,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFTW_CFLAGS = @FFTW_CFLAGS@
-FFTW_LIBS = @FFTW_LIBS@
 FGREP = @FGREP@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
@@ -168,8 +166,6 @@
 HAVE_ALSA = @HAVE_ALSA@
 HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
-HAVE_BONJOUR = @HAVE_BONJOUR@
-HAVE_COREAUDIO = @HAVE_COREAUDIO@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GCONF = @HAVE_GCONF@
 HAVE_GDBM = @HAVE_GDBM@
@@ -278,7 +274,6 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STOW = @STOW@
 STRIP = @STRIP@
 TDB_CFLAGS = @TDB_CFLAGS@
 TDB_LIBS = @TDB_LIBS@
@@ -345,7 +340,6 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-udevrulesdir = @udevrulesdir@
 pulseconfdir = $(sysconfdir)/pulse
 CLEANFILES = $(noinst_DATA) $(am__append_1)
 noinst_DATA = \
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/man/pacat.1.xml.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/man/pacat.1.xml.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/man/pacat.1.xml.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/man/pacat.1.xml.in	2010-01-15 23:21:18.000000000 +0000
@@ -21,18 +21,22 @@
 USA.
 -->
 
-<manpage name="pacat" section="1" desc="Play back or record raw audio streams on a PulseAudio sound server">
+<manpage name="pacat" section="1" desc="Play back or record raw or encoded audio streams on a PulseAudio sound server">
 
   <synopsis>
+    <cmd>paplay [<arg>options</arg>] [<arg>FILE</arg>]</cmd>
+    <cmd>parecord [<arg>options</arg>] [<arg>FILE</arg>]</cmd>
     <cmd>pacat [<arg>options</arg>] [<arg>FILE</arg>]</cmd>
     <cmd>parec [<arg>options</arg>] [<arg>FILE</arg>]</cmd>
-    <cmd>paplay <opt>--help</opt></cmd>
-    <cmd>paplay <opt>--version</opt></cmd>
+    <cmd>pamon [<arg>options</arg>] [<arg>FILE</arg>]</cmd>
+    <cmd>pacat <opt>--help</opt></cmd>
+    <cmd>pacat <opt>--version</opt></cmd>
   </synopsis>
 
   <description>
     <p><file>pacat</file> is a simple tool for playing back or
-    capturing raw audio files on a PulseAudio sound server.</p>
+    capturing raw or encoded audio files on a PulseAudio sound
+    server.</p>
   </description>
 
   <options>
@@ -52,13 +56,13 @@
     <option>
       <p><opt>-r | --record</opt></p>
 
-      <optdesc><p>Capture raw audio data and write it to the specified file or to STDOUT if none is specified. If the tool is called under the name <file>parec</file> this is the default.</p></optdesc>
+      <optdesc><p>Capture audio data and write it to the specified file or to STDOUT if none is specified. If the tool is called under the name <file>parec</file> this is the default.</p></optdesc>
     </option>
 
     <option>
       <p><opt>-p | --playback</opt></p>
 
-      <optdesc><p>Read raw audio data from the specified file or STDIN if none is specified, and play it back. If the tool is called under the name <file>pacat</file> this is the default.</p></optdesc>
+      <optdesc><p>Read audio data from the specified file or STDIN if none is specified, and play it back. If the tool is called under the name <file>pacat</file> this is the default.</p></optdesc>
     </option>
 
     <option>
@@ -108,14 +112,17 @@
 
       <optdesc><p>Capture or play back audio with the specified sample
       format. Specify one of <opt>u8</opt>, <opt>s16le</opt>,
-      <opt>s16be</opt>, <opt>s32le</opt>,
-      <opt>s32be</opt>, <opt>float32le</opt>, <opt>float32be</opt>,
-      <opt>ulaw</opt>, <opt>alaw</opt>. Depending on the endianess of
-      the CPU the
-      formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>, <opt>s32re</opt>,
-      <opt>float32ne</opt>, <opt>float32re</opt> (for native,
-      resp. reverse endian) are available as aliases. Defaults to
-      s16ne.</p></optdesc>
+      <opt>s16be</opt>, <opt>s32le</opt>, <opt>s32be</opt>,
+      <opt>float32le</opt>, <opt>float32be</opt>, <opt>ulaw</opt>,
+      <opt>alaw</opt>, <opt>s32le</opt>, <opt>s32be</opt>,
+      <opt>s24le</opt>, <opt>s24be</opt>, <opt>s24-32le</opt>,
+      <opt>s24-32be</opt>. Depending on the endianess of the CPU the
+      formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>,
+      <opt>s32re</opt>, <opt>float32ne</opt>, <opt>float32re</opt>,
+      <opt>s32ne</opt>, <opt>s32re</opt>, <opt>s24ne</opt>,
+      <opt>s24re</opt>, <opt>s24-32ne</opt>, <opt>s24-32re</opt> (for
+      native, resp. reverse endian) are available as aliases. Defaults
+      to s16ne.</p></optdesc>
     </option>
 
     <option>
@@ -170,6 +177,65 @@
       <optdesc><p>Never remap channels. Instead of mapping channels by their name this will match them solely by their index/order.</p></optdesc>
     </option>
 
+    <option>
+      <p><opt>--latency</opt><arg>=BYTES</arg></p>
+      <optdesc><p>Explicitly configure the latency, with a time
+      specified in bytes in the selected sample format. If left out
+      the server will pick the latency, usually relatively high for
+      power saving reasons. Use either this option or
+      <opt>--latency-msec</opt>, but not both.</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--latency-msec</opt><arg>=MSEC</arg></p>
+      <optdesc><p>Explicitly configure the latency, with a time
+      specified in miliseconds. If left out the server will pick the
+      latency, usually relatively high for power saving reasons. Use
+      either this option or <opt>--latency</opt>, but not
+      both.</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--process-time</opt><arg>=BYTES</arg></p>
+      <optdesc><p>Explicitly configure the process time, with a time
+      specified in bytes in the selected sample format. If left out
+      the server will pick the process time. Use either this option or
+      <opt>--process-time-msec</opt>, but not both.</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--process-time-msec</opt><arg>=MSEC</arg></p>
+      <optdesc><p>Explicitly configure the process time, with a time
+      specified in miliseconds. If left out the server will pick the
+      process time. Use either this option or <opt>--process-time</opt>,
+      but not both.</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--property</opt><arg>=PROPERTY=VALUE</arg></p>
+      <optdesc><p>Attach a property to the client and stream. May be
+      used multiple times</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--raw</opt></p>
+      <optdesc><p>Play/record raw audio data. This is the default if
+      this program is invoked as <cmd>pacat</cmd>, <cmd>parec</cmd> or
+      <cmd>pamon</cmd>.</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--file-format</opt><arg>[=FFORMAT]</arg></p>
+      <optdesc><p>Play/record encoded audio data in the file format
+      specified. This is the default if this program is invoked as
+      <cmd>paplay</cmd> and <cmd>parecord</cmd>.</p></optdesc>
+    </option>
+
+    <option>
+      <p><opt>--list-file-formats</opt></p>
+      <optdesc><p>List supported file formats.</p></optdesc>
+    </option>
+
   </options>
 
   <section name="Authors">
@@ -178,7 +244,7 @@
 
   <section name="See also">
     <p>
-      <manref name="pulseaudio" section="1"/>, <manref name="paplay" section="1"/>
+      <manref name="pulseaudio" section="1"/>, <manref name="pactl" section="1"/>
     </p>
   </section>
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/man/pulse-client.conf.5.xml.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/man/pulse-client.conf.5.xml.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/man/pulse-client.conf.5.xml.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/man/pulse-client.conf.5.xml.in	2010-01-15 23:21:18.000000000 +0000
@@ -106,23 +106,6 @@
       memory overcommit.</p>
     </option>
 
-    <option>
-      <p><opt>auto-connect-localhost=</opt> Automatically try to
-      connect to localhost via IP. Enabling this is a potential
-      security hole since connections are only authenticated one-way
-      and a rogue server might hence fool a client into sending it its
-      private (e.g. VoIP call) data. This was enabled by default on
-      PulseAudio version 0.9.21 and older. Defaults to
-      <opt>no</opt>.</p>
-    </option>
-
-    <option>
-      <p><opt>auto-connect-display=</opt> Automatically try to connect
-      to the host X11's $DISPLAY variable is set to. The same security
-      issues apply as to <opt>auto-connect-localhost=</opt>. Defaults
-      to <opt>no</opt>.</p>
-    </option>
-
   </section>
 
   <section name="Authors">
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/ChangeLog pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/ChangeLog
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/ChangeLog	2010-01-15 01:27:18.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/ChangeLog	2010-01-15 23:52:16.000000000 +0000
@@ -1,4 +1,4 @@
-2010-01-14  gettextize  <bug-gnu-gettext@gnu.org>
+2010-01-15  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.in.in: New file, from gettext-0.17.
 	* boldquot.sed: New file, from gettext-0.17.
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/cs.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/cs.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/cs.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/cs.po	2010-01-15 23:21:18.000000000 +0000
@@ -6,14 +6,15 @@
 msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-09 02:43+0100\n"
+"POT-Creation-Date: 2009-10-17 09:51+0000\n"
+"PO-Revision-Date: 2009-10-17 17:08+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../src/modules/alsa/alsa-util.c:858 ../src/pulsecore/sink.c:2629
 #, c-format
@@ -61,11 +62,11 @@
 
 #: ../src/modules/module-always-sink.c:39
 msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr ""
+msgstr "Udržuje nahraný vždy alespoň jeden cíl, i když se jedná o \"null\""
 
 #: ../src/modules/module-always-sink.c:83
 msgid "Dummy Output"
-msgstr ""
+msgstr "Prázdný výstup"
 
 #: ../src/modules/module-ladspa-sink.c:49
 msgid "Virtual LADSPA sink"
@@ -87,12 +88,11 @@
 
 #: ../src/modules/module-null-sink.c:55
 msgid "Clocked NULL sink"
-msgstr ""
+msgstr "Taktovaný cíl NULL"
 
 #: ../src/modules/module-null-sink.c:291
-#, fuzzy
 msgid "Null Output"
-msgstr "Výstup %s"
+msgstr "Výstup \"null\""
 
 #: ../src/pulsecore/sink.c:2613
 msgid "Internal Audio"
@@ -1095,11 +1095,11 @@
 
 #: ../src/pulse/error.c:68
 msgid "Input/Output error"
-msgstr ""
+msgstr "Chyba vstupu/výstupu"
 
 #: ../src/pulse/error.c:69
 msgid "Device or resource busy"
-msgstr ""
+msgstr "Zařízení nebo zdroj se používá"
 
 #: ../src/pulse/sample.c:172
 #, c-format
@@ -1309,9 +1309,9 @@
 msgstr "Nezdařilo se získat latenci: %s"
 
 #: ../src/utils/pacat.c:580
-#, fuzzy, c-format
+#, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Čas: %0.3f sekund; latence: %0.0f μs.  \r"
+msgstr "Čas: %0.3f sekund; latence: %0.0f μs"
 
 #: ../src/utils/pacat.c:599
 #, c-format
@@ -1733,7 +1733,7 @@
 "\tHlasitost: %s%s%s\n"
 "\t        vyvážení %0.2f\n"
 "\tZákladní hlasitost %s%s%s\n"
-"\tZdroj monitoru: %s\n"
+"\tZdroj sledování: %s\n"
 "\tLatence: %0.0f μs, konfigurováno %0.0f μs\n"
 "\tPříznaky: %s%s%s%s%s%s\n"
 "\tVlastnosti:\n"
@@ -1787,7 +1787,7 @@
 "\tHlasitost: %s%s%s\n"
 "\t        vyvážení %0.2f\n"
 "\tZákladní hlasitost %s%s%s\n"
-"\tMonitor zdroje: %s\n"
+"\tSledování zdroje: %s\n"
 "\tLatence: %0.0f μs, konfigurováno %0.0f μs\n"
 "\tPříznaky: %s%s%s%s%s%s\n"
 "\tVlastnosti:\n"
@@ -2358,133 +2358,122 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Výstupní zařízení"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
-#, fuzzy
 msgid "Input Devices"
-msgstr "Vstup %s"
+msgstr "Vstupní zařízení"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Zvuk na @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
-#, fuzzy
 msgid "Input"
-msgstr "Vstup %s"
+msgstr "Vstup"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Vstup dokovací stanice"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Mikrofon dokovací stanice"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Linkový vstup"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Externí mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Vnitřní zvukový systém"
+msgstr "Interní mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Rádio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Obraz"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Automatické ovládání zesílení"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Bez automatického ovládání zesílení"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Zesílení"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Bez zesílení"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Zesilovač"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Bez zesilovače"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
-#, fuzzy
 msgid "Analog Input"
-msgstr "Analogové mono"
+msgstr "Analogový vstup"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
-#, fuzzy
 msgid "Analog Microphone"
-msgstr "Analogové mono"
+msgstr "Analogový mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
-#, fuzzy
 msgid "Analog Line-In"
-msgstr "Analogové mono"
+msgstr "Analogový linkový vstup"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
-#, fuzzy
 msgid "Analog Radio"
-msgstr "Analogové mono"
+msgstr "Analogové rádio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
-#, fuzzy
 msgid "Analog Video"
-msgstr "Analogové stereo"
+msgstr "Analogový obraz"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Výstup %s"
+msgstr "Analogový výstup"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
-#, fuzzy
 msgid "Analog Headphones"
-msgstr "Analogové mono"
+msgstr "Analogová sluchátka"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Analogový výstup (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
-#, fuzzy
 msgid "Analog Mono Output"
-msgstr "Analogové mono"
+msgstr "Analogový výstup mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
@@ -2495,19 +2484,16 @@
 msgstr "Analogové stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Analogový Surround 4.1"
+msgstr "Analogový Surround 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Analogový Surround 4.0"
+msgstr "Analogový Surround 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Analogový Surround 4.1"
+msgstr "Analogový Surround 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
 msgid "Analog Surround 4.0"
@@ -2526,19 +2512,16 @@
 msgstr "Analogový Surround 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Analogový Surround 4.0"
+msgstr "Analogový Surround 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Analogový Surround 4.1"
+msgstr "Analogový Surround 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Analogový Surround 4.0"
+msgstr "Analogový Surround 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
 msgid "Analog Surround 7.1"
@@ -2549,9 +2532,8 @@
 msgstr "Digitální stereo (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
-#, fuzzy
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr "Digitální Surround 4.0 (IEC958/AC3)"
+msgstr "Digitální Surround 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
@@ -2566,19 +2548,16 @@
 msgstr "Digitální stereo (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
-#, fuzzy
 msgid "Analog Mono Duplex"
-msgstr "Analogové mono"
+msgstr "Analogové duplexní mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
-#, fuzzy
 msgid "Analog Stereo Duplex"
-msgstr "Analogové stereo"
+msgstr "Analogové duplexní stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
-#, fuzzy
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Digitální stereo (IEC958)"
+msgstr "Digitální duplexní stereo (IEC958)"
 
 #~ msgid "Invalid client name '%s'\n"
 #~ msgstr "Neplatný název klienta \"%s\"\n"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/el.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/el.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/el.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/el.po	2010-01-15 23:21:18.000000000 +0000
@@ -2,13 +2,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Dimitris Glezos <dimitris@glezos.com>, 2008.
+# Thalia Papoutsaki <saliyath@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2008-08-22 19:40+0300\n"
-"Last-Translator: Dimitris Glezos <dimitris@glezos.com>\n"
+"POT-Creation-Date: 2009-10-26 09:45+0000\n"
+"PO-Revision-Date: 2009-10-26 17:15+0200\n"
+"Last-Translator: Thalia Papoutsaki <saliyath@gmail.com>\n"
 "Language-Team: Greek <fedora-trans-el@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,36 +17,31 @@
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/modules/alsa/alsa-util.c:858 ../src/pulsecore/sink.c:2629
+#: ../src/modules/alsa/alsa-util.c:858
+#: ../src/pulsecore/sink.c:2629
 #, c-format
 msgid "%s %s"
-msgstr ""
+msgstr "%s %s"
 
 #: ../src/modules/alsa/alsa-util.c:1106
 #, c-format
 msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr ""
 
 #: ../src/modules/alsa/alsa-util.c:1147
 #, c-format
 msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%"
-"lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr ""
 
 #: ../src/modules/alsa/alsa-util.c:1194
 #, c-format
 msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
 msgstr ""
 
 #: ../src/modules/module-always-sink.c:39
@@ -61,12 +57,7 @@
 msgstr ""
 
 #: ../src/modules/module-ladspa-sink.c:53
-msgid ""
-"sink_name=<name for the sink> sink_properties=<properties for the sink> "
-"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<channel map> plugin=<ladspa "
-"plugin name> label=<ladspa plugin label> control=<comma seperated list of "
-"input control values>"
+msgid "sink_name=<name for the sink> sink_properties=<properties for the sink> master=<name of sink to filter> format=<sample format> rate=<sample rate> channels=<number of channels> channel_map=<channel map> plugin=<ladspa plugin name> label=<ladspa plugin label> control=<comma seperated list of input control values>"
 msgstr ""
 
 #: ../src/modules/module-null-sink.c:55
@@ -83,7 +74,7 @@
 
 #: ../src/pulsecore/sink.c:2618
 msgid "Modem"
-msgstr ""
+msgstr "Modem"
 
 #: ../src/daemon/ltdl-bind-now.c:124
 msgid "Failed to find original lt_dlopen loader."
@@ -131,7 +122,8 @@
 msgid "Home directory of user '%s' is not '%s', ignoring."
 msgstr ""
 
-#: ../src/daemon/main.c:208 ../src/daemon/main.c:213
+#: ../src/daemon/main.c:208
+#: ../src/daemon/main.c:213
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr ""
@@ -183,9 +175,7 @@
 msgstr ""
 
 #: ../src/daemon/main.c:571
-msgid ""
-"This program is not intended to be run as root (unless --system is "
-"specified)."
+msgid "This program is not intended to be run as root (unless --system is specified)."
 msgstr ""
 
 #: ../src/daemon/main.c:573
@@ -226,7 +216,8 @@
 msgid "fork() failed: %s"
 msgstr ""
 
-#: ../src/daemon/main.c:646 ../src/utils/pacat.c:508
+#: ../src/daemon/main.c:646
+#: ../src/utils/pacat.c:508
 #, c-format
 msgid "read() failed: %s"
 msgstr ""
@@ -338,12 +329,9 @@
 
 #: ../src/daemon/main.c:792
 msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
+"OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
+"If you do it nonetheless then it's your own fault if things don't work as expected.\n"
+"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an explanation why system mode is usually a bad idea."
 msgstr ""
 
 #: ../src/daemon/main.c:809
@@ -355,12 +343,8 @@
 msgstr ""
 
 #: ../src/daemon/main.c:821
-msgid ""
-"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
-"resolution timers enabled!"
-msgstr ""
-"Δικέ μου, ο πυρήνας σου είναι για τα μπάζα! Η πρόταση του σεφ σήμερα είναι "
-"Linux με ενεργοποιημένα τα high-resolution timers!"
+msgid "Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"
+msgstr "Δικέ μου, ο πυρήνας σου είναι για τα μπάζα! Η πρόταση του σεφ σήμερα είναι Linux με ενεργοποιημένα τα high-resolution timers!"
 
 #: ../src/daemon/main.c:844
 msgid "pa_core_new() failed."
@@ -397,48 +381,37 @@
 "      --dump-conf                       Dump default configuration\n"
 "      --dump-modules                    Dump list of available modules\n"
 "      --dump-resample-methods           Dump available resample methods\n"
-"      --cleanup-shm                     Cleanup stale shared memory "
-"segments\n"
-"      --start                           Start the daemon if it is not "
-"running\n"
+"      --cleanup-shm                     Cleanup stale shared memory segments\n"
+"      --start                           Start the daemon if it is not running\n"
 "  -k  --kill                            Kill a running daemon\n"
-"      --check                           Check for a running daemon (only "
-"returns exit code)\n"
+"      --check                           Check for a running daemon (only returns exit code)\n"
 "\n"
 "OPTIONS:\n"
 "      --system[=BOOL]                   Run as system-wide instance\n"
 "  -D, --daemonize[=BOOL]                Daemonize after startup\n"
 "      --fail[=BOOL]                     Quit when startup fails\n"
 "      --high-priority[=BOOL]            Try to set high nice level\n"
-"                                        (only available as root, when SUID "
-"or\n"
+"                                        (only available as root, when SUID or\n"
 "                                        with elevated RLIMIT_NICE)\n"
 "      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
-"                                        (only available as root, when SUID "
-"or\n"
+"                                        (only available as root, when SUID or\n"
 "                                        with elevated RLIMIT_RTPRIO)\n"
-"      --disallow-module-loading[=BOOL]  Disallow module user requested "
-"module\n"
+"      --disallow-module-loading[=BOOL]  Disallow module user requested module\n"
 "                                        loading/unloading after startup\n"
 "      --disallow-exit[=BOOL]            Disallow user requested exit\n"
-"      --exit-idle-time=SECS             Terminate the daemon when idle and "
-"this\n"
+"      --exit-idle-time=SECS             Terminate the daemon when idle and this\n"
 "                                        time passed\n"
-"      --module-idle-time=SECS           Unload autoloaded modules when idle "
-"and\n"
+"      --module-idle-time=SECS           Unload autoloaded modules when idle and\n"
 "                                        this time passed\n"
-"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
-"and\n"
+"      --scache-idle-time=SECS           Unload autoloaded samples when idle and\n"
 "                                        this time passed\n"
 "      --log-level[=LEVEL]               Increase or set verbosity level\n"
 "  -v                                    Increase the verbosity level\n"
 "      --log-target={auto,syslog,stderr} Specify the log target\n"
-"      --log-meta[=BOOL]                 Include code location in log "
-"messages\n"
+"      --log-meta[=BOOL]                 Include code location in log messages\n"
 "      --log-time[=BOOL]                 Include timestamps in log messages\n"
 "      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
-"  -p, --dl-search-path=PATH             Set the search path for dynamic "
-"shared\n"
+"  -p, --dl-search-path=PATH             Set the search path for dynamic shared\n"
 "                                        objects (plugins)\n"
 "      --resample-method=METHOD          Use the specified resampling method\n"
 "                                        (See --dump-resample-methods for\n"
@@ -449,12 +422,10 @@
 "      --disable-shm[=BOOL]              Disable shared memory support.\n"
 "\n"
 "STARTUP SCRIPT:\n"
-"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
-"with\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module with\n"
 "                                        the specified argument\n"
 "  -F, --file=FILENAME                   Run the specified script\n"
-"  -C                                    Open a command line on the running "
-"TTY\n"
+"  -C                                    Open a command line on the running TTY\n"
 "                                        after startup\n"
 "\n"
 "  -n                                    Don't load default script file\n"
@@ -469,9 +440,7 @@
 msgstr ""
 
 #: ../src/daemon/cmdline.c:264
-msgid ""
-"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
+msgid "--log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error)."
 msgstr ""
 
 #: ../src/daemon/cmdline.c:276
@@ -536,22 +505,22 @@
 #: ../src/daemon/dumpmodules.c:66
 #, c-format
 msgid "Version: %s\n"
-msgstr ""
+msgstr "Έκδοση: %s\n"
 
 #: ../src/daemon/dumpmodules.c:68
 #, c-format
 msgid "Description: %s\n"
-msgstr ""
+msgstr "Περιγραφή: %s\n"
 
 #: ../src/daemon/dumpmodules.c:70
 #, c-format
 msgid "Author: %s\n"
-msgstr ""
+msgstr "Συγγραφέας: %s\n"
 
 #: ../src/daemon/dumpmodules.c:72
 #, c-format
 msgid "Usage: %s\n"
-msgstr ""
+msgstr "Χρήση: %s\n"
 
 #: ../src/daemon/dumpmodules.c:73
 #, c-format
@@ -634,9 +603,7 @@
 msgstr ""
 
 #: ../src/daemon/daemon-conf.c:562
-msgid ""
-"The specified default channel map has a different number of channels than "
-"the specified default number of channels."
+msgid "The specified default channel map has a different number of channels than the specified default number of channels."
 msgstr ""
 
 #: ../src/daemon/daemon-conf.c:638
@@ -656,9 +623,10 @@
 msgid "Start the PulseAudio Sound System"
 msgstr ""
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
+#: ../src/pulse/channelmap.c:105
+#: ../src/pulse/channelmap.c:757
 msgid "Mono"
-msgstr ""
+msgstr "Mono"
 
 #: ../src/pulse/channelmap.c:107
 msgid "Front Center"
@@ -706,131 +674,131 @@
 
 #: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 0"
-msgstr ""
+msgstr "Auxiliary 0"
 
 #: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 1"
-msgstr ""
+msgstr "Auxiliary 1"
 
 #: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 2"
-msgstr ""
+msgstr "Auxiliary 2"
 
 #: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 3"
-msgstr ""
+msgstr "Auxiliary 3"
 
 #: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 4"
-msgstr ""
+msgstr "Auxiliary 4"
 
 #: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 5"
-msgstr ""
+msgstr "Auxiliary 5"
 
 #: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 6"
-msgstr ""
+msgstr "Auxiliary 6"
 
 #: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 7"
-msgstr ""
+msgstr "Auxiliary 7"
 
 #: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 8"
-msgstr ""
+msgstr "Auxiliary 8"
 
 #: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 9"
-msgstr ""
+msgstr "Auxiliary 9"
 
 #: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 10"
-msgstr ""
+msgstr "Auxiliary 10"
 
 #: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 11"
-msgstr ""
+msgstr "Auxiliary 11"
 
 #: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 12"
-msgstr ""
+msgstr "Auxiliary 12"
 
 #: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 13"
-msgstr ""
+msgstr "Auxiliary 13"
 
 #: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 14"
-msgstr ""
+msgstr "Auxiliary 14"
 
 #: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 15"
-msgstr ""
+msgstr "Auxiliary 15"
 
 #: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 16"
-msgstr ""
+msgstr "Auxiliary 16"
 
 #: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 17"
-msgstr ""
+msgstr "Auxiliary 17"
 
 #: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 18"
-msgstr ""
+msgstr "Auxiliary 18"
 
 #: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 19"
-msgstr ""
+msgstr "Auxiliary 19"
 
 #: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 20"
-msgstr ""
+msgstr "Auxiliary 20"
 
 #: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 21"
-msgstr ""
+msgstr "Auxiliary 21"
 
 #: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 22"
-msgstr ""
+msgstr "Auxiliary 22"
 
 #: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 23"
-msgstr ""
+msgstr "Auxiliary 23"
 
 #: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 24"
-msgstr ""
+msgstr "Auxiliary 24"
 
 #: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 25"
-msgstr ""
+msgstr "Auxiliary 25"
 
 #: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 26"
-msgstr ""
+msgstr "Auxiliary 26"
 
 #: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 27"
-msgstr ""
+msgstr "Auxiliary 27"
 
 #: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 28"
-msgstr ""
+msgstr "Auxiliary 28"
 
 #: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 29"
-msgstr ""
+msgstr "Auxiliary 29"
 
 #: ../src/pulse/channelmap.c:153
 msgid "Auxiliary 30"
-msgstr ""
+msgstr "Auxiliary 30"
 
 #: ../src/pulse/channelmap.c:154
 msgid "Auxiliary 31"
-msgstr ""
+msgstr "Auxiliary 31"
 
 #: ../src/pulse/channelmap.c:156
 msgid "Top Center"
@@ -860,39 +828,42 @@
 msgid "Top Rear Right"
 msgstr ""
 
-#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:170
-#: ../src/pulse/volume.c:295 ../src/pulse/volume.c:321
-#: ../src/pulse/volume.c:341 ../src/pulse/volume.c:371
+#: ../src/pulse/channelmap.c:484
+#: ../src/pulse/sample.c:170
+#: ../src/pulse/volume.c:295
+#: ../src/pulse/volume.c:321
+#: ../src/pulse/volume.c:341
+#: ../src/pulse/volume.c:371
 msgid "(invalid)"
-msgstr ""
+msgstr "(μη έγκυρο)"
 
 #: ../src/pulse/channelmap.c:761
 msgid "Stereo"
-msgstr ""
+msgstr "Stereo"
 
 #: ../src/pulse/channelmap.c:766
 msgid "Surround 4.0"
-msgstr ""
+msgstr "Surround 4.0"
 
 #: ../src/pulse/channelmap.c:772
 msgid "Surround 4.1"
-msgstr ""
+msgstr "Surround 4.1"
 
 #: ../src/pulse/channelmap.c:778
 msgid "Surround 5.0"
-msgstr ""
+msgstr "Surround 5.0"
 
 #: ../src/pulse/channelmap.c:784
 msgid "Surround 5.1"
-msgstr ""
+msgstr "Surround 5.1"
 
 #: ../src/pulse/channelmap.c:791
 msgid "Surround 7.1"
-msgstr ""
+msgstr "Surround 7.1"
 
 #: ../src/pulse/error.c:43
 msgid "OK"
-msgstr ""
+msgstr "Εντάξει"
 
 #: ../src/pulse/error.c:44
 msgid "Access denied"
@@ -1001,29 +972,30 @@
 #: ../src/pulse/sample.c:172
 #, c-format
 msgid "%s %uch %uHz"
-msgstr ""
+msgstr "%s %uch %uHz"
 
 #: ../src/pulse/sample.c:184
 #, c-format
 msgid "%0.1f GiB"
-msgstr ""
+msgstr "%0.1f GiB"
 
 #: ../src/pulse/sample.c:186
 #, c-format
 msgid "%0.1f MiB"
-msgstr ""
+msgstr "%0.1f MiB"
 
 #: ../src/pulse/sample.c:188
 #, c-format
 msgid "%0.1f KiB"
-msgstr ""
+msgstr "%0.1f KiB"
 
 #: ../src/pulse/sample.c:190
 #, c-format
 msgid "%u B"
-msgstr ""
+msgstr "%u B"
 
-#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
+#: ../src/pulse/client-conf-x11.c:55
+#: ../src/utils/pax11publish.c:100
 msgid "XOpenDisplay() failed"
 msgstr ""
 
@@ -1041,14 +1013,14 @@
 msgstr ""
 
 #: ../src/pulse/context.c:693
-#, c-format
+#, fuzzy, c-format
 msgid "fork(): %s"
-msgstr ""
+msgstr "fork(): %s"
 
 #: ../src/pulse/context.c:748
-#, c-format
+#, fuzzy, c-format
 msgid "waitpid(): %s"
-msgstr ""
+msgstr "waitpid(): %s"
 
 #: ../src/pulse/context.c:1438
 #, c-format
@@ -1083,7 +1055,8 @@
 msgid "pa_stream_begin_write() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:237 ../src/utils/pacat.c:267
+#: ../src/utils/pacat.c:237
+#: ../src/utils/pacat.c:267
 #, c-format
 msgid "pa_stream_peek() failed: %s"
 msgstr ""
@@ -1181,10 +1154,11 @@
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:470 ../src/utils/pactl.c:857
+#: ../src/utils/pacat.c:470
+#: ../src/utils/pactl.c:857
 #, c-format
 msgid "Connection failure: %s"
-msgstr ""
+msgstr "Αποτυχία σύνδεσης: %s"
 
 #: ../src/utils/pacat.c:503
 msgid "Got EOF."
@@ -1227,48 +1201,29 @@
 "\n"
 "  -v, --verbose                         Enable verbose operations\n"
 "\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"  -d, --device=DEVICE                   The name of the sink/source to "
-"connect to\n"
-"  -n, --client-name=NAME                How to call this client on the "
-"server\n"
-"      --stream-name=NAME                How to call this stream on the "
-"server\n"
-"      --volume=VOLUME                   Specify the initial (linear) volume "
-"in range 0...65536\n"
-"      --rate=SAMPLERATE                 The sample rate in Hz (defaults to "
-"44100)\n"
-"      --format=SAMPLEFORMAT             The sample type, one of s16le, "
-"s16be, u8, float32le,\n"
-"                                        float32be, ulaw, alaw, s32le, s32be, "
-"s24le, s24be,\n"
-"                                        s24-32le, s24-32be (defaults to "
-"s16ne)\n"
-"      --channels=CHANNELS               The number of channels, 1 for mono, "
-"2 for stereo\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"  -d, --device=DEVICE                   The name of the sink/source to connect to\n"
+"  -n, --client-name=NAME                How to call this client on the server\n"
+"      --stream-name=NAME                How to call this stream on the server\n"
+"      --volume=VOLUME                   Specify the initial (linear) volume in range 0...65536\n"
+"      --rate=SAMPLERATE                 The sample rate in Hz (defaults to 44100)\n"
+"      --format=SAMPLEFORMAT             The sample type, one of s16le, s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, s24le, s24be,\n"
+"                                        s24-32le, s24-32be (defaults to s16ne)\n"
+"      --channels=CHANNELS               The number of channels, 1 for mono, 2 for stereo\n"
 "                                        (defaults to 2)\n"
-"      --channel-map=CHANNELMAP          Channel map to use instead of the "
-"default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --channel-map=CHANNELMAP          Channel map to use instead of the default\n"
+"      --fix-format                      Take the sample format from the sink the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink the stream is\n"
 "                                        being connected to.\n"
-"      --fix-channels                    Take the number of channels and the "
-"channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"      --fix-channels                    Take the number of channels and the channel map\n"
+"                                        from the sink the stream is being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
-"      --no-remap                        Map channels by index instead of "
-"name.\n"
-"      --latency=BYTES                   Request the specified latency in "
-"bytes.\n"
-"      --process-time=BYTES              Request the specified process time "
-"per request in bytes.\n"
-"      --property=PROPERTY=VALUE         Set the specified property to the "
-"specified value.\n"
+"      --no-remap                        Map channels by index instead of name.\n"
+"      --latency=BYTES                   Request the specified latency in bytes.\n"
+"      --process-time=BYTES              Request the specified process time per request in bytes.\n"
+"      --property=PROPERTY=VALUE         Set the specified property to the specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
 "      --file-format=FFORMAT             Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
@@ -1282,7 +1237,8 @@
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: ../src/utils/pacat.c:764 ../src/utils/pactl.c:953
+#: ../src/utils/pacat.c:764
+#: ../src/utils/pactl.c:953
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1344,12 +1300,11 @@
 msgstr ""
 
 #: ../src/utils/pacat.c:959
-msgid ""
-"Warning: specified sample specification will be overwritten with "
-"specification from file."
+msgid "Warning: specified sample specification will be overwritten with specification from file."
 msgstr ""
 
-#: ../src/utils/pacat.c:962 ../src/utils/pactl.c:997
+#: ../src/utils/pacat.c:962
+#: ../src/utils/pactl.c:997
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1367,8 +1322,7 @@
 
 #: ../src/utils/pacat.c:1008
 #, c-format
-msgid ""
-"Opening a %s stream with sample specification '%s' and channel map '%s'."
+msgid "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
 
 #: ../src/utils/pacat.c:1009
@@ -1379,7 +1333,8 @@
 msgid "playback"
 msgstr ""
 
-#: ../src/utils/pacat.c:1035 ../src/utils/pactl.c:1267
+#: ../src/utils/pacat.c:1035
+#: ../src/utils/pactl.c:1267
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1387,11 +1342,13 @@
 msgid "io_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1061 ../src/utils/pactl.c:1279
+#: ../src/utils/pacat.c:1061
+#: ../src/utils/pactl.c:1279
 msgid "pa_context_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1069 ../src/utils/pactl.c:1285
+#: ../src/utils/pacat.c:1069
+#: ../src/utils/pactl.c:1285
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1400,19 +1357,20 @@
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1082 ../src/utils/pactl.c:1290
+#: ../src/utils/pacat.c:1082
+#: ../src/utils/pactl.c:1290
 msgid "pa_mainloop_run() failed."
 msgstr ""
 
 #: ../src/utils/pasuspender.c:81
-#, c-format
+#, fuzzy, c-format
 msgid "fork(): %s\n"
-msgstr ""
+msgstr "fork(): %s\n"
 
 #: ../src/utils/pasuspender.c:92
-#, c-format
+#, fuzzy, c-format
 msgid "execvp(): %s\n"
-msgstr ""
+msgstr "execvp(): %s\n"
 
 #: ../src/utils/pasuspender.c:109
 #, c-format
@@ -1451,8 +1409,7 @@
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
 "\n"
 msgstr ""
 
@@ -1545,12 +1502,14 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:268 ../src/utils/pactl.c:360
+#: ../src/utils/pactl.c:268
+#: ../src/utils/pactl.c:360
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:274 ../src/utils/pactl.c:366
+#: ../src/utils/pactl.c:274
+#: ../src/utils/pactl.c:366
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
@@ -1582,10 +1541,18 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:345 ../src/utils/pactl.c:401 ../src/utils/pactl.c:436
-#: ../src/utils/pactl.c:473 ../src/utils/pactl.c:532 ../src/utils/pactl.c:533
-#: ../src/utils/pactl.c:543 ../src/utils/pactl.c:587 ../src/utils/pactl.c:588
-#: ../src/utils/pactl.c:594 ../src/utils/pactl.c:637 ../src/utils/pactl.c:638
+#: ../src/utils/pactl.c:345
+#: ../src/utils/pactl.c:401
+#: ../src/utils/pactl.c:436
+#: ../src/utils/pactl.c:473
+#: ../src/utils/pactl.c:532
+#: ../src/utils/pactl.c:533
+#: ../src/utils/pactl.c:543
+#: ../src/utils/pactl.c:587
+#: ../src/utils/pactl.c:588
+#: ../src/utils/pactl.c:594
+#: ../src/utils/pactl.c:637
+#: ../src/utils/pactl.c:638
 #: ../src/utils/pactl.c:645
 msgid "n/a"
 msgstr ""
@@ -1718,10 +1685,11 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:653 ../src/utils/pactl.c:663
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:653
+#: ../src/utils/pactl.c:663
+#, c-format
 msgid "Failure: %s"
-msgstr "Όνομα: %s\n"
+msgstr "Αποτυχία: %s"
 
 #: ../src/utils/pactl.c:687
 #, fuzzy, c-format
@@ -1764,10 +1732,8 @@
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"  -n, --client-name=NAME                How to call this client on the "
-"server\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"  -n, --client-name=NAME                How to call this client on the server\n"
 msgstr ""
 
 #: ../src/utils/pactl.c:933
@@ -1783,9 +1749,8 @@
 msgstr ""
 
 #: ../src/utils/pactl.c:992
-#, fuzzy
 msgid "Failed to open sound file."
-msgstr "Αποτυχία εύρεσης ομάδας χρηστών '%s'."
+msgstr "Αποτυχία ανοίγματος αρχείου ήχου."
 
 #: ../src/utils/pactl.c:1004
 msgid "Warning: Failed to determine sample specification from file."
@@ -1816,14 +1781,11 @@
 msgstr ""
 
 #: ../src/utils/pactl.c:1090
-msgid ""
-"You may not specify more than one sink. You have to specify a boolean value."
+msgid "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
 #: ../src/utils/pactl.c:1103
-msgid ""
-"You may not specify more than one source. You have to specify a boolean "
-"value."
+msgid "You may not specify more than one source. You have to specify a boolean value."
 msgstr ""
 
 #: ../src/utils/pactl.c:1115
@@ -1842,9 +1804,12 @@
 msgid "You have to specify a sink name/index and a volume"
 msgstr ""
 
-#: ../src/utils/pactl.c:1154 ../src/utils/pactl.c:1171
-#: ../src/utils/pactl.c:1193 ../src/utils/pactl.c:1209
-#: ../src/utils/pactl.c:1226 ../src/utils/pactl.c:1248
+#: ../src/utils/pactl.c:1154
+#: ../src/utils/pactl.c:1171
+#: ../src/utils/pactl.c:1193
+#: ../src/utils/pactl.c:1209
+#: ../src/utils/pactl.c:1226
+#: ../src/utils/pactl.c:1248
 msgid "Invalid volume specification"
 msgstr ""
 
@@ -1887,8 +1852,7 @@
 "\n"
 " -d    Show current PulseAudio data attached to X11 display (default)\n"
 " -e    Export local PulseAudio data to X11 display\n"
-" -i    Import PulseAudio data from X11 display to local environment "
-"variables and cookie file.\n"
+" -i    Import PulseAudio data from X11 display to local environment variables and cookie file.\n"
 " -r    Remove PulseAudio data from X11 display\n"
 msgstr ""
 
@@ -1964,7 +1928,7 @@
 #: ../src/utils/pacmd.c:91
 #, c-format
 msgid "connect(): %s"
-msgstr ""
+msgstr "σύνδεση(): %s"
 
 #: ../src/utils/pacmd.c:99
 msgid "Failed to kill PulseAudio daemon."
@@ -1979,40 +1943,39 @@
 msgid "poll(): %s"
 msgstr ""
 
-#: ../src/utils/pacmd.c:171 ../src/utils/pacmd.c:188
+#: ../src/utils/pacmd.c:171
+#: ../src/utils/pacmd.c:188
 #, c-format
 msgid "read(): %s"
 msgstr ""
 
-#: ../src/utils/pacmd.c:207 ../src/utils/pacmd.c:223
+#: ../src/utils/pacmd.c:207
+#: ../src/utils/pacmd.c:223
 #, c-format
 msgid "write(): %s"
 msgstr ""
 
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:219
+#: ../src/pulsecore/lock-autospawn.c:136
+#: ../src/pulsecore/lock-autospawn.c:219
 msgid "Cannot access autospawn lock."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-sink.c:530 ../src/modules/alsa/alsa-sink.c:689
+#: ../src/modules/alsa/alsa-sink.c:530
+#: ../src/modules/alsa/alsa-sink.c:689
 #, c-format
 msgid ""
-"ALSA woke us up to write new data to the device, but there was actually "
-"nothing to write!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
+"ALSA woke us up to write new data to the device, but there was actually nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-source.c:506 ../src/modules/alsa/alsa-source.c:656
+#: ../src/modules/alsa/alsa-source.c:506
+#: ../src/modules/alsa/alsa-source.c:656
 #, c-format
 msgid ""
-"ALSA woke us up to read new data from the device, but there was actually "
-"nothing to read!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
+"ALSA woke us up to read new data from the device, but there was actually nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail."
 msgstr ""
 
 #: ../src/modules/alsa/module-alsa-card.c:152
@@ -2081,11 +2044,11 @@
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
@@ -2125,11 +2088,11 @@
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
 msgid "Analog Radio"
-msgstr ""
+msgstr "Analog Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
 msgid "Analog Video"
-msgstr ""
+msgstr "Analog Video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
 msgid "Analog Output"
@@ -2141,102 +2104,104 @@
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Analog Output (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Analog Mono Output"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
 #, c-format
 msgid "%s+%s"
-msgstr ""
+msgstr "%s+%s"
 
-#: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
+#: ../src/modules/alsa/alsa-mixer.c:1984
+#: ../src/modules/alsa/alsa-mixer.c:3404
 #, c-format
 msgid "%s / %s"
-msgstr ""
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
-msgstr ""
+msgstr "Analog Mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:2791
 msgid "Analog Stereo"
-msgstr ""
+msgstr "Analog Stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
 msgid "Analog Surround 2.1"
-msgstr ""
+msgstr "Analog Surround 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
 msgid "Analog Surround 3.0"
-msgstr ""
+msgstr "Analog Surround 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
 msgid "Analog Surround 3.1"
-msgstr ""
+msgstr "Analog Surround 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
 msgid "Analog Surround 4.0"
-msgstr ""
+msgstr "Analog Surround 4.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2796
 msgid "Analog Surround 4.1"
-msgstr ""
+msgstr "Analog Surround 4.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2797
 msgid "Analog Surround 5.0"
-msgstr ""
+msgstr "Analog Surround 5.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2798
 msgid "Analog Surround 5.1"
-msgstr ""
+msgstr "Analog Surround 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
 msgid "Analog Surround 6.0"
-msgstr ""
+msgstr "Analog Surround 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
 msgid "Analog Surround 6.1"
-msgstr ""
+msgstr "Analog Surround 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
 msgid "Analog Surround 7.0"
-msgstr ""
+msgstr "Analog Surround 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
 msgid "Analog Surround 7.1"
-msgstr ""
+msgstr "Analog Surround 7.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2803
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Digital Stereo (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr ""
+msgstr "Digital Surround 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Digital Surround 4.0 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2806
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Digital Surround 5.1 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2807
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Digital Stereo (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Analog Mono Duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Analog Stereo Duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Digital Stereo Duplex (IEC958)"
+
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/es.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/es.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/es.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/es.po	2010-01-15 23:21:18.000000000 +0000
@@ -4,14 +4,15 @@
 # Domingo Becker <domingobecker@gmail.com>, 2009.
 # Héctor Daniel Cabrera <h.daniel.cabrera@gmail.com>, 2009.
 #
+# Fernando Gonzalez Blanco <fgonz@fedoraproject.org>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: PulseAudio\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-11 08:40-0300\n"
-"Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
-"Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
+"POT-Creation-Date: 2009-10-04 16:37+0000\n"
+"PO-Revision-Date: 2009-10-04 21:16+0200\n"
+"Last-Translator: Fernando Gonzalez Blanco <fgonz@fedoraproject.org>\n"
+"Language-Team: Spanish <fedora-trans-es@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2399,133 +2400,122 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Dispositivos de salida"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
-#, fuzzy
 msgid "Input Devices"
-msgstr "Entrada %s"
+msgstr "Dispositivos de entrada"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Audio en @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
-#, fuzzy
 msgid "Input"
-msgstr "Entrada %s"
+msgstr "Entrada"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Estación dock de entrada"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Micrófono de la estación Dock"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "En línea"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Micrófono"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Micrófono externo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Audio Interno"
+msgstr "Micrófono interno"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Control automático de ganancia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Sin control automático de ganancia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Incremento de ganancia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Sin incremento de ganancia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Amplificador"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Sin amplificador"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
-#, fuzzy
 msgid "Analog Input"
-msgstr "Mono Analógico"
+msgstr "Entrada analógica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
-#, fuzzy
 msgid "Analog Microphone"
-msgstr "Mono Analógico"
+msgstr "Micrófono analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
-#, fuzzy
 msgid "Analog Line-In"
-msgstr "Mono Analógico"
+msgstr "Entrada en línea analógica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
-#, fuzzy
 msgid "Analog Radio"
-msgstr "Mono Analógico"
+msgstr "Radio analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
-#, fuzzy
 msgid "Analog Video"
-msgstr "Estéreo Analógico"
+msgstr "Vídeo analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Salida Nula"
+msgstr "Salida analógica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
-#, fuzzy
 msgid "Analog Headphones"
-msgstr "Mono Analógico"
+msgstr "Auriculares analógicos"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Salida analógica (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
-#, fuzzy
 msgid "Analog Mono Output"
-msgstr "Mono Analógico"
+msgstr "Salida Mono analógica "
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
@@ -2536,19 +2526,16 @@
 msgstr "Estéreo Analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Análogo Envolvente 4.1"
+msgstr "Análogico Envolvente 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Análogo Envolvente 4.0"
+msgstr "Análogico Envolvente 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Análogo Envolvente 4.1"
+msgstr "Análogico Envolvente 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
 msgid "Analog Surround 4.0"
@@ -2567,19 +2554,16 @@
 msgstr "Análogo Envolvente 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Análogo Envolvente 4.0"
+msgstr "Análogico Envolvente 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Análogo Envolvente 4.1"
+msgstr "Análogico Envolvente 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Análogo Envolvente 4.0"
+msgstr "Análogico Envolvente 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
 msgid "Analog Surround 7.1"
@@ -2590,9 +2574,8 @@
 msgstr "Estéreo Digital (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
-#, fuzzy
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr "Digital Envolvente 4.0 (IEC9588/AC3)"
+msgstr "Digital Envolvente 4.0 (IEC9588)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
@@ -2607,19 +2590,16 @@
 msgstr "Estéreo Digital (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
-#, fuzzy
 msgid "Analog Mono Duplex"
-msgstr "Mono Analógico"
+msgstr "Mono Analógico.Duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
-#, fuzzy
 msgid "Analog Stereo Duplex"
-msgstr "Estéreo Analógico"
+msgstr "Estéreo Analógico.Duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
-#, fuzzy
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Estéreo Digital (IEC958)"
+msgstr "Estéreo Digital Duplex(IEC958)"
 
 #~ msgid "Invalid client name '%s'\n"
 #~ msgstr "Nombre de cliente inválido '%s'\n"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/fi.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/fi.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/fi.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/fi.po	2010-01-15 23:21:18.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: git trunk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-15 13:24+0300\n"
+"PO-Revision-Date: 2009-11-09 15:16+0200\n"
 "Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
 "Language-Team: Finnish <laatu@lokalisointi.org>\n"
 "MIME-Version: 1.0\n"
@@ -2378,133 +2378,122 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Ulostulolaitteet"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
-#, fuzzy
 msgid "Input Devices"
-msgstr "Sisääntulo %s"
+msgstr "Sisääntulolaitteet"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Ääni koneella @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
-#, fuzzy
 msgid "Input"
-msgstr "Sisääntulo %s"
+msgstr "Sisääntulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Telakan sisääntulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Telakan mikrofoni"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Linjasisääntulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofoni"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Ulkoinen mikrofoni"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Sisäinen äänentoisto"
+msgstr "Sisäinen mikrofoni"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Automaattinen äänenvoimakkuuden säätö"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Ei automaattista äänenvoimakkuuden säätöä"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Vahvistus"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Ei vahvistusta"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Vahvistin"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Ei vahvistinta"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
-#, fuzzy
 msgid "Analog Input"
-msgstr "Analoginen mono"
+msgstr "Analoginen sisääntulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
-#, fuzzy
 msgid "Analog Microphone"
-msgstr "Analoginen mono"
+msgstr "Analoginen mikrofoni"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
-#, fuzzy
 msgid "Analog Line-In"
-msgstr "Analoginen mono"
+msgstr "Analoginen linjasisääntulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
-#, fuzzy
 msgid "Analog Radio"
-msgstr "Analoginen mono"
+msgstr "Analoginen radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
-#, fuzzy
 msgid "Analog Video"
-msgstr "Analoginen stereo"
+msgstr "Analoginen video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Tyhjä ulostulo"
+msgstr "Analoginen ulostulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
-#, fuzzy
 msgid "Analog Headphones"
-msgstr "Analoginen mono"
+msgstr "Analoginen kuulokeliitäntä"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Analoginen ulostulo (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
-#, fuzzy
 msgid "Analog Mono Output"
-msgstr "Analoginen mono"
+msgstr "Analoginen monoulostulo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
@@ -2515,19 +2504,16 @@
 msgstr "Analoginen stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Analoginen tilaääni 4.1"
+msgstr "Analoginen tilaääni 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Analoginen tilaääni 4.0"
+msgstr "Analoginen tilaääni 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Analoginen tilaääni 4.1"
+msgstr "Analoginen tilaääni 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
 msgid "Analog Surround 4.0"
@@ -2546,19 +2532,16 @@
 msgstr "Analoginen tilaääni 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Analoginen tilaääni 4.0"
+msgstr "Analoginen tilaääni 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Analoginen tilaääni 4.1"
+msgstr "Analoginen tilaääni 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Analoginen tilaääni 4.0"
+msgstr "Analoginen tilaääni 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
 msgid "Analog Surround 7.1"
@@ -2569,9 +2552,8 @@
 msgstr "Digitaalinen stereo (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
-#, fuzzy
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr "Digitaalinen tilaääni 4.0 (IEC958/AC3)"
+msgstr "Digitaalinen tilaääni 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/hu.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/hu.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/hu.po	1970-01-01 01:00:00.000000000 +0100
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/hu.po	2010-01-15 23:21:18.000000000 +0000
@@ -0,0 +1,2403 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-17 04:45+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: KAMI <kami911@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Hungarian\n"
+"X-Poedit-Country: HUNGARY\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../src/modules/alsa/alsa-util.c:858
+#: ../src/pulsecore/sink.c:2629
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/modules/alsa/alsa-util.c:1106
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
+msgstr ""
+"A „snd_pcm_avail()” függvény visszatérési értéke váratlanul nagy értékű: %lu bájt (%lu ms).\n"
+"Ez egy hiba lehet az ALSA „%s” eszközmeghajtóban. Kérem jelentse ezt a problémát az ALSA fejlesztői felé."
+
+#: ../src/modules/alsa/alsa-util.c:1147
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
+msgstr ""
+"A „snd_pcm_delay()” függvény visszatérési értéke váratlanul nagy értékű: %li bájt (%s%lu ms).\n"
+"Ez egy hiba lehet az ALSA „%s” eszközmeghajtóban. Kérem jelentse ezt a problémát az ALSA fejlesztői felé."
+
+#: ../src/modules/alsa/alsa-util.c:1194
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
+msgstr ""
+"A „snd_pcm_mmap_begin()” függvény visszatérési értéke váratlanul nagy értékű: %lu bájt (%lu ms).\n"
+"Ez egy hiba lehet az ALSA „%s” eszközmeghajtóban. Kérem jelentse ezt a problémát az ALSA fejlesztői felé."
+
+#: ../src/modules/module-always-sink.c:39
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "Mindig maradjon meg legalább egy nyelőt, még ha az csak az üres nyelő."
+
+#: ../src/modules/module-always-sink.c:83
+msgid "Dummy Output"
+msgstr "Látszólagos kimenet"
+
+#: ../src/modules/module-ladspa-sink.c:49
+msgid "Virtual LADSPA sink"
+msgstr "Látszólagos LADSPA nyelő"
+
+#: ../src/modules/module-ladspa-sink.c:53
+msgid "sink_name=<name for the sink> sink_properties=<properties for the sink> master=<name of sink to filter> format=<sample format> rate=<sample rate> channels=<number of channels> channel_map=<channel map> plugin=<ladspa plugin name> label=<ladspa plugin label> control=<comma seperated list of input control values>"
+msgstr "sink_name=<nyelő neve> sink_properties=<nyelő tulajdonságai> master=<szűrendő nyelő neve> format=<sample format> rate=<mintavételezési ráta> channels=<csatornák száma> channel_map=<csatornaleképzés> plugin=<ladspa bővítmény neve> label=<ladspa bővítmény címkéje> control=<bemenetszabályzó értékek vesszővel elválasztott listája>"
+
+#: ../src/modules/module-null-sink.c:55
+msgid "Clocked NULL sink"
+msgstr "Órajelezett semmis nyelő"
+
+#: ../src/modules/module-null-sink.c:291
+msgid "Null Output"
+msgstr "Semmis kimenet"
+
+#: ../src/pulsecore/sink.c:2613
+msgid "Internal Audio"
+msgstr "Belső hangforrás"
+
+#: ../src/pulsecore/sink.c:2618
+msgid "Modem"
+msgstr "Modem"
+
+#: ../src/daemon/ltdl-bind-now.c:124
+msgid "Failed to find original lt_dlopen loader."
+msgstr "Nem található az eredeti „lt_dlopen” betöltő."
+
+#: ../src/daemon/ltdl-bind-now.c:129
+msgid "Failed to allocate new dl loader."
+msgstr "Nem foglalható le hely az új dl betöltő számára."
+
+#: ../src/daemon/ltdl-bind-now.c:142
+msgid "Failed to add bind-now-loader."
+msgstr "Nem sikerült hozzáadni az azonnali betöltés csatolást."
+
+#: ../src/daemon/main.c:141
+#, c-format
+msgid "Got signal %s."
+msgstr "Szignál: %s."
+
+#: ../src/daemon/main.c:168
+msgid "Exiting."
+msgstr "Kilépés."
+
+#: ../src/daemon/main.c:186
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr "Nem található a(z) „%s” felhasználó."
+
+#: ../src/daemon/main.c:191
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr "Nem található a(z) „%s” csoport."
+
+#: ../src/daemon/main.c:195
+#, c-format
+msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
+msgstr "Létező felhasználó „%s” (UID: %lu) és csoport „%s” (GID: %lu)."
+
+#: ../src/daemon/main.c:200
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr "A(z) „%s” felhasználó GID azonosítója és „%s” csoportja nem egyezik meg."
+
+#: ../src/daemon/main.c:205
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr "A(z) „%s” felhasználó Saját mappája nem „%s”. Kihagyás."
+
+#: ../src/daemon/main.c:208
+#: ../src/daemon/main.c:213
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "Nem sikerült létrehozni a(z) „%s” fájlt: %s"
+
+#: ../src/daemon/main.c:220
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr "Nem sikerült megváltoztatni a csoportlistát: %s"
+
+#: ../src/daemon/main.c:236
+#, c-format
+msgid "Failed to change GID: %s"
+msgstr "Nem sikerült megváltoztatni az GID azonosítót: %s"
+
+#: ../src/daemon/main.c:252
+#, c-format
+msgid "Failed to change UID: %s"
+msgstr "Nem sikerült megváltoztatni az UID azonosítót: %s"
+
+#: ../src/daemon/main.c:271
+msgid "Successfully dropped root privileges."
+msgstr "A rendszergazdai jogosultságok sikeresen visszaadva."
+
+#: ../src/daemon/main.c:279
+msgid "System wide mode unsupported on this platform."
+msgstr "A rendszer üzemmód nem támogatott ezen az operációs rendszeren."
+
+#: ../src/daemon/main.c:297
+#, c-format
+msgid "setrlimit(%s, (%u, %u)) failed: %s"
+msgstr "setrlimit(%s, (%u, %u)) meghiúsult: %s"
+
+#: ../src/daemon/main.c:474
+msgid "Failed to parse command line."
+msgstr "Nem sikerült feldolgozni a parancssort."
+
+#: ../src/daemon/main.c:541
+msgid "Daemon not running"
+msgstr "A démon nem fut."
+
+#: ../src/daemon/main.c:543
+#, c-format
+msgid "Daemon running as PID %u"
+msgstr "A démon a következő PID azonosítóval fut: %u"
+
+#: ../src/daemon/main.c:553
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr "A démon kilövése nem sikerült: %s"
+
+#: ../src/daemon/main.c:571
+msgid "This program is not intended to be run as root (unless --system is specified)."
+msgstr "Ez a program nincsen felkészítve arra, hogy rendszergazdai jogosultságokkal fusson (kivéve, ha a --system paraméter megadásra kerül)."
+
+#: ../src/daemon/main.c:573
+msgid "Root privileges required."
+msgstr "Rendszergazdai jogosultságok szükségesek."
+
+#: ../src/daemon/main.c:578
+msgid "--start not supported for system instances."
+msgstr "--start nem támogatott rendszer üzemmód használata esetén."
+
+#: ../src/daemon/main.c:583
+msgid "Running in system mode, but --disallow-exit not set!"
+msgstr "Futtatás rendszer üzemmódban, de a --disallow-exit paraméter nincs beállítva."
+
+#: ../src/daemon/main.c:586
+msgid "Running in system mode, but --disallow-module-loading not set!"
+msgstr "Futtatás rendszer üzemmódban, de a --disallow-module-loading paraméter nincs beállítva."
+
+#: ../src/daemon/main.c:589
+msgid "Running in system mode, forcibly disabling SHM mode!"
+msgstr "Futtatás rendszer üzemmódban, az SHM üzemmód forszírozott letiltása."
+
+#: ../src/daemon/main.c:594
+msgid "Running in system mode, forcibly disabling exit idle time!"
+msgstr "Futtatás rendszer üzemmódban, kilépés üresjárati időtúllépés esetén beállítás forszírozott letiltása."
+
+#: ../src/daemon/main.c:621
+msgid "Failed to acquire stdio."
+msgstr "Nem sikerült jogot szerezni az alapértelmezett ki- és bemenetre (stdio)."
+
+#: ../src/daemon/main.c:627
+#, c-format
+msgid "pipe failed: %s"
+msgstr "Cső létrehozás meghiúsult: %s"
+
+#: ../src/daemon/main.c:632
+#, c-format
+msgid "fork() failed: %s"
+msgstr "Programindítás meghiúsult: %s"
+
+#: ../src/daemon/main.c:646
+#: ../src/utils/pacat.c:508
+#, c-format
+msgid "read() failed: %s"
+msgstr "Olvasás meghiúsult: %s"
+
+#: ../src/daemon/main.c:652
+msgid "Daemon startup failed."
+msgstr "A démon elindítása nem sikerült."
+
+#: ../src/daemon/main.c:654
+msgid "Daemon startup successful."
+msgstr "A démon sikeresen elindult."
+
+#: ../src/daemon/main.c:731
+#, c-format
+msgid "This is PulseAudio %s"
+msgstr "PulseAudio %s"
+
+#: ../src/daemon/main.c:732
+#, c-format
+msgid "Compilation host: %s"
+msgstr "Összeépítő számítógép: %s"
+
+#: ../src/daemon/main.c:733
+#, c-format
+msgid "Compilation CFLAGS: %s"
+msgstr "Összeépítési CFLAGS jelzők: %s"
+
+#: ../src/daemon/main.c:736
+#, c-format
+msgid "Running on host: %s"
+msgstr "Kiszolgáló: %s"
+
+#: ../src/daemon/main.c:739
+#, c-format
+msgid "Found %u CPUs."
+msgstr "%u CPU található a rendszerben."
+
+#: ../src/daemon/main.c:741
+#, c-format
+msgid "Page size is %lu bytes"
+msgstr "Oldalméret: %lu bájt"
+
+#: ../src/daemon/main.c:744
+msgid "Compiled with Valgrind support: yes"
+msgstr "Összeépítés Valgrind támogatással: Igen"
+
+#: ../src/daemon/main.c:746
+msgid "Compiled with Valgrind support: no"
+msgstr "Összeépítés Valgrind támogatással: Nem"
+
+#: ../src/daemon/main.c:749
+#, c-format
+msgid "Running in valgrind mode: %s"
+msgstr "Futás Valgrind üzemmódban: %s"
+
+#: ../src/daemon/main.c:752
+msgid "Optimized build: yes"
+msgstr "Optimalizált összeépítés: Igen"
+
+#: ../src/daemon/main.c:754
+msgid "Optimized build: no"
+msgstr "Optimalizált összeépítés: Nem"
+
+#: ../src/daemon/main.c:758
+msgid "NDEBUG defined, all asserts disabled."
+msgstr "NDEBUG megadva, minden érvényesítés letiltva."
+
+#: ../src/daemon/main.c:760
+msgid "FASTPATH defined, only fast path asserts disabled."
+msgstr "FASTPATH megadva, így csak a gyors útvonal-érvényesítés lesz letiltva."
+
+#: ../src/daemon/main.c:762
+msgid "All asserts enabled."
+msgstr "Minden érvényesítés engedélyezve."
+
+#: ../src/daemon/main.c:766
+msgid "Failed to get machine ID"
+msgstr "Nem sikerült lekérdezni a számítógép azonosítóját"
+
+#: ../src/daemon/main.c:769
+#, c-format
+msgid "Machine ID is %s."
+msgstr "Számítógép-azonosító: %s."
+
+#: ../src/daemon/main.c:773
+#, c-format
+msgid "Session ID is %s."
+msgstr "Munkamenet-azonosító: %s."
+
+#: ../src/daemon/main.c:779
+#, c-format
+msgid "Using runtime directory %s."
+msgstr "A futásidőben használt mappa: %s."
+
+#: ../src/daemon/main.c:784
+#, c-format
+msgid "Using state directory %s."
+msgstr "Az állapottároló mappa: %s."
+
+#: ../src/daemon/main.c:787
+#, c-format
+msgid "Using modules directory %s."
+msgstr "A modulok mappája: %s."
+
+#: ../src/daemon/main.c:789
+#, c-format
+msgid "Running in system mode: %s"
+msgstr "Futás rendszer üzemmódban: %s"
+
+#: ../src/daemon/main.c:792
+msgid ""
+"OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
+"If you do it nonetheless then it's your own fault if things don't work as expected.\n"
+"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an explanation why system mode is usually a bad idea."
+msgstr ""
+"A PulseAudio rendszer üzemmódban fut. Általánosságban ezen üzemmód használata nem ajánlott.\n"
+"Ha mindenképpen ilyen üzemmódban kívánja futtatni a PulseAudio rendszert, ne lepődjön meg, ha egyes funkciók esetleg nem az elvárások szerint működnek.\n"
+"További tájékoztatás: http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode amelyből megtudhatja miért nem tanácsos a rendszer üzemmód használata."
+
+#: ../src/daemon/main.c:809
+msgid "pa_pid_file_create() failed."
+msgstr "A „pa_pid_file_create()” függvényhívás meghiúsult: %s"
+
+#: ../src/daemon/main.c:819
+msgid "Fresh high-resolution timers available! Bon appetit!"
+msgstr "A nagypontosságú időzítők elérhetőek."
+
+#: ../src/daemon/main.c:821
+msgid "Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"
+msgstr "A nagypontosságú időzítők nem érhetőek el. Napjaink Linux rendszereiben érdemes engedélyezni a nagypontosságú időzítőket."
+
+#: ../src/daemon/main.c:844
+msgid "pa_core_new() failed."
+msgstr "A „pa_core_new()” függvényhívás meghiúsult: %s"
+
+#: ../src/daemon/main.c:904
+msgid "Failed to initialize daemon."
+msgstr "Nem sikerült előkészíteni a démont."
+
+#: ../src/daemon/main.c:909
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "A démont noha elindult, de nem töltött be modulokat, így a hangrendszer nem üzemképes."
+
+#: ../src/daemon/main.c:926
+msgid "Daemon startup complete."
+msgstr "A démon elindítása sikeres."
+
+#: ../src/daemon/main.c:932
+msgid "Daemon shutdown initiated."
+msgstr "A démon leállítása kezdeményezve."
+
+#: ../src/daemon/main.c:954
+msgid "Daemon terminated."
+msgstr "A démon leállítva."
+
+#: ../src/daemon/cmdline.c:115
+#, c-format
+msgid ""
+"%s [options]\n"
+"\n"
+"COMMANDS:\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"      --dump-conf                       Dump default configuration\n"
+"      --dump-modules                    Dump list of available modules\n"
+"      --dump-resample-methods           Dump available resample methods\n"
+"      --cleanup-shm                     Cleanup stale shared memory segments\n"
+"      --start                           Start the daemon if it is not running\n"
+"  -k  --kill                            Kill a running daemon\n"
+"      --check                           Check for a running daemon (only returns exit code)\n"
+"\n"
+"OPTIONS:\n"
+"      --system[=BOOL]                   Run as system-wide instance\n"
+"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
+"      --fail[=BOOL]                     Quit when startup fails\n"
+"      --high-priority[=BOOL]            Try to set high nice level\n"
+"                                        (only available as root, when SUID or\n"
+"                                        with elevated RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
+"                                        (only available as root, when SUID or\n"
+"                                        with elevated RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  Disallow module user requested module\n"
+"                                        loading/unloading after startup\n"
+"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
+"      --exit-idle-time=SECS             Terminate the daemon when idle and this\n"
+"                                        time passed\n"
+"      --module-idle-time=SECS           Unload autoloaded modules when idle and\n"
+"                                        this time passed\n"
+"      --scache-idle-time=SECS           Unload autoloaded samples when idle and\n"
+"                                        this time passed\n"
+"      --log-level[=LEVEL]               Increase or set verbosity level\n"
+"  -v                                    Increase the verbosity level\n"
+"      --log-target={auto,syslog,stderr} Specify the log target\n"
+"      --log-meta[=BOOL]                 Include code location in log messages\n"
+"      --log-time[=BOOL]                 Include timestamps in log messages\n"
+"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
+"  -p, --dl-search-path=PATH             Set the search path for dynamic shared\n"
+"                                        objects (plugins)\n"
+"      --resample-method=METHOD          Use the specified resampling method\n"
+"                                        (See --dump-resample-methods for\n"
+"                                        possible values)\n"
+"      --use-pid-file[=BOOL]             Create a PID file\n"
+"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
+"                                        platforms that support it.\n"
+"      --disable-shm[=BOOL]              Disable shared memory support.\n"
+"\n"
+"STARTUP SCRIPT:\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module with\n"
+"                                        the specified argument\n"
+"  -F, --file=FILENAME                   Run the specified script\n"
+"  -C                                    Open a command line on the running TTY\n"
+"                                        after startup\n"
+"\n"
+"  -n                                    Don't load default script file\n"
+msgstr ""
+
+#: ../src/daemon/cmdline.c:247
+msgid "--daemonize expects boolean argument"
+msgstr "--daemonize paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:254
+msgid "--fail expects boolean argument"
+msgstr "--fail paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:264
+msgid "--log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error)."
+msgstr "--log-level paraméter a naplózás szintjének értékét várja el (Ez lehet a 0..4 számtartomány, vagy a következők egyike: debug, info, notice, warn, error)."
+
+#: ../src/daemon/cmdline.c:276
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:283
+msgid "--realtime expects boolean argument"
+msgstr "--realtime paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:290
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "--disallow-module-loading paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:297
+msgid "--disallow-exit expects boolean argument"
+msgstr "--disallow-exit paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:304
+msgid "--use-pid-file expects boolean argument"
+msgstr "--use-pid-file paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:321
+msgid "Invalid log target: use either 'syslog', 'stderr' or 'auto'."
+msgstr "Érvénytelen naplózási cél: használja a „syslog”, a „stderr” vagy az „auto” értéket."
+
+#: ../src/daemon/cmdline.c:328
+msgid "--log-time expects boolean argument"
+msgstr "--log-time paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:335
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:354
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Érvénytelen újramintavételezési eljárás: „%s”."
+
+#: ../src/daemon/cmdline.c:361
+msgid "--system expects boolean argument"
+msgstr "--system paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:368
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit paraméter logikai értéket vár el"
+
+#: ../src/daemon/cmdline.c:375
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm paraméter logikai értéket vár el"
+
+#: ../src/daemon/dumpmodules.c:60
+#, c-format
+msgid "Name: %s\n"
+msgstr "Név: %s\n"
+
+#: ../src/daemon/dumpmodules.c:63
+#, c-format
+msgid "No module information available\n"
+msgstr "Nem áll rendelkezésre modul információ.\n"
+
+#: ../src/daemon/dumpmodules.c:66
+#, c-format
+msgid "Version: %s\n"
+msgstr "Verzió: %s\n"
+
+#: ../src/daemon/dumpmodules.c:68
+#, c-format
+msgid "Description: %s\n"
+msgstr "Leírás: %s\n"
+
+#: ../src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Author: %s\n"
+msgstr "Szerző: %s\n"
+
+#: ../src/daemon/dumpmodules.c:72
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Használat: %s\n"
+
+#: ../src/daemon/dumpmodules.c:73
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Betöltve: %s\n"
+
+#: ../src/daemon/dumpmodules.c:75
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "VISSZAVONÁSI FIGYELMEZTETÉS: %s\n"
+
+#: ../src/daemon/dumpmodules.c:79
+#, c-format
+msgid "Path: %s\n"
+msgstr "Elérési útvonal: %s\n"
+
+#: ../src/daemon/daemon-conf.c:232
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] Érvénytelen naplózási cél: „%s”."
+
+#: ../src/daemon/daemon-conf.c:248
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Érvénytelen naplózási szint: „%s”."
+
+#: ../src/daemon/daemon-conf.c:264
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Érvénytelen újramintavételezési eljárás: „%s”."
+
+#: ../src/daemon/daemon-conf.c:287
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] Érvénytelen rlimit érték: „%s”."
+
+#: ../src/daemon/daemon-conf.c:294
+#, c-format
+msgid "[%s:%u] rlimit not supported on this platform."
+msgstr "[%s:%u] Az rlimit nem támogatott ezen az operációs rendszeren."
+
+#: ../src/daemon/daemon-conf.c:310
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] Érvénytelen mintavételi formátum: „%s”."
+
+#: ../src/daemon/daemon-conf.c:328
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] Érvénytelen mintavételi ráta: „%s”."
+
+#: ../src/daemon/daemon-conf.c:352
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] Érvénytelen minta csatornák: „%s”."
+
+#: ../src/daemon/daemon-conf.c:370
+#, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "[%s:%u] Érvénytelen csatornaleképzés: „%s”."
+
+#: ../src/daemon/daemon-conf.c:388
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] Érvénytelen a részek száma: „%s”."
+
+#: ../src/daemon/daemon-conf.c:406
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] Érvénytelen a részek mérete: „%s”."
+
+#: ../src/daemon/daemon-conf.c:424
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] Érvénytelen a prioritási érték: „%s”."
+
+#: ../src/daemon/daemon-conf.c:546
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Nem sikerült megnyitni a konfigurációs fájlt: %s"
+
+#: ../src/daemon/daemon-conf.c:562
+msgid "The specified default channel map has a different number of channels than the specified default number of channels."
+msgstr "Az alapértelmezetten megadott mintavételi leírás csatornáinak száma eltér az alapértelmezetten megadott csatornaszámtól."
+
+#: ../src/daemon/daemon-conf.c:638
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### Olvasás a következő konfigurációs fájlból: %s ###\n"
+
+#: ../src/daemon/caps.c:62
+msgid "Cleaning up privileges."
+msgstr "Jogosultságok letisztázása."
+
+#: ../src/daemon/pulseaudio.desktop.in.h:1
+msgid "PulseAudio Sound System"
+msgstr "PulseAudio hangrendszer"
+
+#: ../src/daemon/pulseaudio.desktop.in.h:2
+msgid "Start the PulseAudio Sound System"
+msgstr "A PulseAudio hangrendszer elindítása"
+
+#: ../src/pulse/channelmap.c:105
+#: ../src/pulse/channelmap.c:757
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/pulse/channelmap.c:107
+msgid "Front Center"
+msgstr "Első középső"
+
+#: ../src/pulse/channelmap.c:108
+msgid "Front Left"
+msgstr "Első bal"
+
+#: ../src/pulse/channelmap.c:109
+msgid "Front Right"
+msgstr "Első jobb"
+
+#: ../src/pulse/channelmap.c:111
+msgid "Rear Center"
+msgstr "Hátsó középső"
+
+#: ../src/pulse/channelmap.c:112
+msgid "Rear Left"
+msgstr "Hátsó bal"
+
+#: ../src/pulse/channelmap.c:113
+msgid "Rear Right"
+msgstr "Hátsó jobb"
+
+#: ../src/pulse/channelmap.c:115
+msgid "Low Frequency Emmiter"
+msgstr "Mély-hangszóró (LFE)"
+
+#: ../src/pulse/channelmap.c:117
+msgid "Front Left-of-center"
+msgstr "Első közép-bal"
+
+#: ../src/pulse/channelmap.c:118
+msgid "Front Right-of-center"
+msgstr "Első közép-jobb"
+
+#: ../src/pulse/channelmap.c:120
+msgid "Side Left"
+msgstr "Bal oldalsó"
+
+#: ../src/pulse/channelmap.c:121
+msgid "Side Right"
+msgstr "Jobb oldalsó"
+
+#: ../src/pulse/channelmap.c:123
+msgid "Auxiliary 0"
+msgstr "Külső 0"
+
+#: ../src/pulse/channelmap.c:124
+msgid "Auxiliary 1"
+msgstr "Külső 1"
+
+#: ../src/pulse/channelmap.c:125
+msgid "Auxiliary 2"
+msgstr "Külső 2"
+
+#: ../src/pulse/channelmap.c:126
+msgid "Auxiliary 3"
+msgstr "Külső 3"
+
+#: ../src/pulse/channelmap.c:127
+msgid "Auxiliary 4"
+msgstr "Külső 4"
+
+#: ../src/pulse/channelmap.c:128
+msgid "Auxiliary 5"
+msgstr "Külső 5"
+
+#: ../src/pulse/channelmap.c:129
+msgid "Auxiliary 6"
+msgstr "Külső 6"
+
+#: ../src/pulse/channelmap.c:130
+msgid "Auxiliary 7"
+msgstr "Külső 7"
+
+#: ../src/pulse/channelmap.c:131
+msgid "Auxiliary 8"
+msgstr "Külső 8"
+
+#: ../src/pulse/channelmap.c:132
+msgid "Auxiliary 9"
+msgstr "Külső 9"
+
+#: ../src/pulse/channelmap.c:133
+msgid "Auxiliary 10"
+msgstr "Külső 10"
+
+#: ../src/pulse/channelmap.c:134
+msgid "Auxiliary 11"
+msgstr "Külső 11"
+
+#: ../src/pulse/channelmap.c:135
+msgid "Auxiliary 12"
+msgstr "Külső 12"
+
+#: ../src/pulse/channelmap.c:136
+msgid "Auxiliary 13"
+msgstr "Külső 13"
+
+#: ../src/pulse/channelmap.c:137
+msgid "Auxiliary 14"
+msgstr "Külső 14"
+
+#: ../src/pulse/channelmap.c:138
+msgid "Auxiliary 15"
+msgstr "Külső 15"
+
+#: ../src/pulse/channelmap.c:139
+msgid "Auxiliary 16"
+msgstr "Külső 16"
+
+#: ../src/pulse/channelmap.c:140
+msgid "Auxiliary 17"
+msgstr "Külső 17"
+
+#: ../src/pulse/channelmap.c:141
+msgid "Auxiliary 18"
+msgstr "Külső 18"
+
+#: ../src/pulse/channelmap.c:142
+msgid "Auxiliary 19"
+msgstr "Külső 19"
+
+#: ../src/pulse/channelmap.c:143
+msgid "Auxiliary 20"
+msgstr "Külső 20"
+
+#: ../src/pulse/channelmap.c:144
+msgid "Auxiliary 21"
+msgstr "Külső 21"
+
+#: ../src/pulse/channelmap.c:145
+msgid "Auxiliary 22"
+msgstr "Külső 22"
+
+#: ../src/pulse/channelmap.c:146
+msgid "Auxiliary 23"
+msgstr "Külső 23"
+
+#: ../src/pulse/channelmap.c:147
+msgid "Auxiliary 24"
+msgstr "Külső 24"
+
+#: ../src/pulse/channelmap.c:148
+msgid "Auxiliary 25"
+msgstr "Külső 25"
+
+#: ../src/pulse/channelmap.c:149
+msgid "Auxiliary 26"
+msgstr "Külső 26"
+
+#: ../src/pulse/channelmap.c:150
+msgid "Auxiliary 27"
+msgstr "Külső 27"
+
+#: ../src/pulse/channelmap.c:151
+msgid "Auxiliary 28"
+msgstr "Külső 28"
+
+#: ../src/pulse/channelmap.c:152
+msgid "Auxiliary 29"
+msgstr "Külső 29"
+
+#: ../src/pulse/channelmap.c:153
+msgid "Auxiliary 30"
+msgstr "Külső 30"
+
+#: ../src/pulse/channelmap.c:154
+msgid "Auxiliary 31"
+msgstr "Külső 31"
+
+#: ../src/pulse/channelmap.c:156
+msgid "Top Center"
+msgstr "Felső középső"
+
+#: ../src/pulse/channelmap.c:158
+msgid "Top Front Center"
+msgstr "Felső első középső"
+
+#: ../src/pulse/channelmap.c:159
+msgid "Top Front Left"
+msgstr "Felső első bal"
+
+#: ../src/pulse/channelmap.c:160
+msgid "Top Front Right"
+msgstr "Felső első jobb"
+
+#: ../src/pulse/channelmap.c:162
+msgid "Top Rear Center"
+msgstr "Felső hátsó középső"
+
+#: ../src/pulse/channelmap.c:163
+msgid "Top Rear Left"
+msgstr "Felső hátsó bal"
+
+#: ../src/pulse/channelmap.c:164
+msgid "Top Rear Right"
+msgstr "Felső hátsó jobb"
+
+#: ../src/pulse/channelmap.c:484
+#: ../src/pulse/sample.c:170
+#: ../src/pulse/volume.c:295
+#: ../src/pulse/volume.c:321
+#: ../src/pulse/volume.c:341
+#: ../src/pulse/volume.c:371
+msgid "(invalid)"
+msgstr "(Érvénytelen)"
+
+#: ../src/pulse/channelmap.c:761
+msgid "Stereo"
+msgstr "Sztereó"
+
+#: ../src/pulse/channelmap.c:766
+msgid "Surround 4.0"
+msgstr "Térhatású 4.0"
+
+#: ../src/pulse/channelmap.c:772
+msgid "Surround 4.1"
+msgstr "Térhatású 4.1"
+
+#: ../src/pulse/channelmap.c:778
+msgid "Surround 5.0"
+msgstr "Térhatású 5.0"
+
+#: ../src/pulse/channelmap.c:784
+msgid "Surround 5.1"
+msgstr "Térhatású 5.1"
+
+#: ../src/pulse/channelmap.c:791
+msgid "Surround 7.1"
+msgstr "Térhatású 7.1"
+
+#: ../src/pulse/error.c:43
+msgid "OK"
+msgstr "OK"
+
+#: ../src/pulse/error.c:44
+msgid "Access denied"
+msgstr "Hozzáférés megtagadva"
+
+#: ../src/pulse/error.c:45
+msgid "Unknown command"
+msgstr "Ismeretlen parancs"
+
+#: ../src/pulse/error.c:46
+msgid "Invalid argument"
+msgstr "Érvénytelen paraméter"
+
+#: ../src/pulse/error.c:47
+msgid "Entity exists"
+msgstr "Az egység létezik"
+
+#: ../src/pulse/error.c:48
+msgid "No such entity"
+msgstr "Nincs ilyen egység"
+
+#: ../src/pulse/error.c:49
+msgid "Connection refused"
+msgstr "Kapcsolat elutasítva"
+
+#: ../src/pulse/error.c:50
+msgid "Protocol error"
+msgstr "Protokollhiba"
+
+#: ../src/pulse/error.c:51
+msgid "Timeout"
+msgstr "Időtúllépés"
+
+#: ../src/pulse/error.c:52
+msgid "No authorization key"
+msgstr "Nem érhető el hitelesítőkulcs"
+
+#: ../src/pulse/error.c:53
+msgid "Internal error"
+msgstr "Belső hiba"
+
+#: ../src/pulse/error.c:54
+msgid "Connection terminated"
+msgstr "A kapcsolat megszakadt."
+
+#: ../src/pulse/error.c:55
+msgid "Entity killed"
+msgstr "Egység kilőve"
+
+#: ../src/pulse/error.c:56
+msgid "Invalid server"
+msgstr "Érvénytelen kiszolgáló"
+
+#: ../src/pulse/error.c:57
+msgid "Module initalization failed"
+msgstr "A modul előkészítése meghiúsult."
+
+#: ../src/pulse/error.c:58
+msgid "Bad state"
+msgstr "Hibás állapot"
+
+#: ../src/pulse/error.c:59
+msgid "No data"
+msgstr "Nincs adat"
+
+#: ../src/pulse/error.c:60
+msgid "Incompatible protocol version"
+msgstr "Inkompatibilis protokollverzió"
+
+#: ../src/pulse/error.c:61
+msgid "Too large"
+msgstr "Túl nagy"
+
+#: ../src/pulse/error.c:62
+msgid "Not supported"
+msgstr "Nem támogatott"
+
+#: ../src/pulse/error.c:63
+msgid "Unknown error code"
+msgstr "Ismeretlen hibakód"
+
+#: ../src/pulse/error.c:64
+msgid "No such extension"
+msgstr "Nincs ilyen kiterjesztés"
+
+#: ../src/pulse/error.c:65
+msgid "Obsolete functionality"
+msgstr "Elavult funkcionalitás"
+
+#: ../src/pulse/error.c:66
+msgid "Missing implementation"
+msgstr "Nincs megvalósítva"
+
+#: ../src/pulse/error.c:67
+msgid "Client forked"
+msgstr "Kliens elindítva"
+
+#: ../src/pulse/error.c:68
+msgid "Input/Output error"
+msgstr "Kimeneti/bemeneti hiba"
+
+#: ../src/pulse/error.c:69
+msgid "Device or resource busy"
+msgstr "Az eszköz vagy erőforrás foglalt"
+
+#: ../src/pulse/sample.c:172
+#, c-format
+msgid "%s %uch %uHz"
+msgstr "%s %uch %uHz"
+
+#: ../src/pulse/sample.c:184
+#, c-format
+msgid "%0.1f GiB"
+msgstr "%0.1f GiB"
+
+#: ../src/pulse/sample.c:186
+#, c-format
+msgid "%0.1f MiB"
+msgstr "%0.1f MiB"
+
+#: ../src/pulse/sample.c:188
+#, c-format
+msgid "%0.1f KiB"
+msgstr "%0.1f KiB"
+
+#: ../src/pulse/sample.c:190
+#, c-format
+msgid "%u B"
+msgstr "%u B"
+
+#: ../src/pulse/client-conf-x11.c:55
+#: ../src/utils/pax11publish.c:100
+msgid "XOpenDisplay() failed"
+msgstr "Az XOpenDisplay() függvényhívás meghiúsult."
+
+#: ../src/pulse/client-conf-x11.c:93
+msgid "Failed to parse cookie data"
+msgstr "Nem sikerült feldolgozni a süti adatokat."
+
+#: ../src/pulse/client-conf.c:111
+#, c-format
+msgid "Failed to open configuration file '%s': %s"
+msgstr "Nem sikerült megnyitni a(z) „%s” konfigurációs fájlt: %s"
+
+#: ../src/pulse/context.c:550
+msgid "No cookie loaded. Attempting to connect without."
+msgstr "Nincs betölthető süti. Kísérlet a kapcsolat felvételére sütik használata nélkül."
+
+#: ../src/pulse/context.c:693
+#, c-format
+msgid "fork(): %s"
+msgstr "Programindítás: %s"
+
+#: ../src/pulse/context.c:748
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: ../src/pulse/context.c:1438
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "Üzenet érkezett az ismeretlen „%s” kiterjesztéstől"
+
+#: ../src/utils/pacat.c:108
+#, c-format
+msgid "Failed to drain stream: %s"
+msgstr "Nem sikerült csatlakozni a következő adatfolyamhoz: %s"
+
+#: ../src/utils/pacat.c:113
+msgid "Playback stream drained."
+msgstr "A lejátszás adatfolyamához csatlakozva."
+
+#: ../src/utils/pacat.c:123
+msgid "Draining connection to server."
+msgstr "Csatlakozás a kiszolgálóhoz kapcsolathoz."
+
+#: ../src/utils/pacat.c:136
+#, c-format
+msgid "pa_stream_drain(): %s"
+msgstr "pa_stream_drain(): %s"
+
+#: ../src/utils/pacat.c:159
+#, c-format
+msgid "pa_stream_write() failed: %s"
+msgstr "A „pa_stream_write()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:197
+#, c-format
+msgid "pa_stream_begin_write() failed: %s"
+msgstr "A „pa_stream_begin_write()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:237
+#: ../src/utils/pacat.c:267
+#, c-format
+msgid "pa_stream_peek() failed: %s"
+msgstr "A „pa_stream_peek()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:307
+msgid "Stream successfully created."
+msgstr "Az adatfolyam sikeresen létrejött."
+
+#: ../src/utils/pacat.c:310
+#, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s"
+msgstr "A „pa_stream_get_buffer_attr()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:314
+#, c-format
+msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgstr "Pufferméretek: maximális nagyság: %u, hossz: %u, előpufferelés: %u, minimum: %u"
+
+#: ../src/utils/pacat.c:317
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u"
+msgstr "Pufferméretek: maximális nagyság: %u, részek mérete: %u"
+
+#: ../src/utils/pacat.c:321
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'."
+msgstr "Mintavételi leírás: „%s” és csatornaleképzés: „%s” használata."
+
+#: ../src/utils/pacat.c:325
+#, c-format
+msgid "Connected to device %s (%u, %ssuspended)."
+msgstr "Csatlakozva a következő eszközhöz: „%s” (%u, %ssuspended)."
+
+#: ../src/utils/pacat.c:335
+#, c-format
+msgid "Stream error: %s"
+msgstr "Adatfolyam hiba: %s"
+
+#: ../src/utils/pacat.c:345
+#, c-format
+msgid "Stream device suspended.%s"
+msgstr "Adatfolyam-eszköz készenléti állapotban: %s"
+
+#: ../src/utils/pacat.c:347
+#, c-format
+msgid "Stream device resumed.%s"
+msgstr "Adatfolyam-eszköz visszatért a készenléti állapotból: %s"
+
+#: ../src/utils/pacat.c:355
+#, c-format
+msgid "Stream underrun.%s"
+msgstr "%s adatfolyam alulcsordulás."
+
+#: ../src/utils/pacat.c:362
+#, c-format
+msgid "Stream overrun.%s"
+msgstr "%s adatfolyam túlcsordulás."
+
+#: ../src/utils/pacat.c:369
+#, c-format
+msgid "Stream started.%s"
+msgstr "%s adatfolyam elindítva."
+
+#: ../src/utils/pacat.c:376
+#, c-format
+msgid "Stream moved to device %s (%u, %ssuspended).%s"
+msgstr "Az adatfolyam áthelyezve a következő eszközre: „%s” (%u, %ssuspended). %s"
+
+#: ../src/utils/pacat.c:376
+msgid "not "
+msgstr "nem"
+
+#: ../src/utils/pacat.c:383
+#, c-format
+msgid "Stream buffer attributes changed.%s"
+msgstr "Az adatfolyam-puffer beállításai megváltoztak: %s"
+
+#: ../src/utils/pacat.c:415
+#, c-format
+msgid "Connection established.%s"
+msgstr "Kapcsolat létrehozva. %s"
+
+#: ../src/utils/pacat.c:418
+#, c-format
+msgid "pa_stream_new() failed: %s"
+msgstr "A „pa_stream_new()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:450
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s"
+msgstr "A „pa_stream_connect_playback()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:456
+#, c-format
+msgid "pa_stream_connect_record() failed: %s"
+msgstr "A „pa_stream_connect_record()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:470
+#: ../src/utils/pactl.c:857
+#, c-format
+msgid "Connection failure: %s"
+msgstr "Kapcsolódási hiba: %s"
+
+#: ../src/utils/pacat.c:503
+msgid "Got EOF."
+msgstr "A fájl vége elérve."
+
+#: ../src/utils/pacat.c:540
+#, c-format
+msgid "write() failed: %s"
+msgstr "Az írás sikertelen: %s"
+
+#: ../src/utils/pacat.c:561
+msgid "Got signal, exiting."
+msgstr "Kilépés, szignál hatására…"
+
+#: ../src/utils/pacat.c:575
+#, c-format
+msgid "Failed to get latency: %s"
+msgstr "Nem sikerült lekérdezni a késleltetést: %s"
+
+#: ../src/utils/pacat.c:580
+#, c-format
+msgid "Time: %0.3f sec; Latency: %0.0f usec."
+msgstr "Idő: %0.3f másodperc, késleltetés: %0.0f ezredmásodperc."
+
+#: ../src/utils/pacat.c:599
+#, c-format
+msgid "pa_stream_update_timing_info() failed: %s"
+msgstr "A „pa_stream_update_timing_info()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:609
+#, c-format
+msgid ""
+"%s [options]\n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"\n"
+"  -r, --record                          Create a connection for recording\n"
+"  -p, --playback                        Create a connection for playback\n"
+"\n"
+"  -v, --verbose                         Enable verbose operations\n"
+"\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"  -d, --device=DEVICE                   The name of the sink/source to connect to\n"
+"  -n, --client-name=NAME                How to call this client on the server\n"
+"      --stream-name=NAME                How to call this stream on the server\n"
+"      --volume=VOLUME                   Specify the initial (linear) volume in range 0...65536\n"
+"      --rate=SAMPLERATE                 The sample rate in Hz (defaults to 44100)\n"
+"      --format=SAMPLEFORMAT             The sample type, one of s16le, s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, s24le, s24be,\n"
+"                                        s24-32le, s24-32be (defaults to s16ne)\n"
+"      --channels=CHANNELS               The number of channels, 1 for mono, 2 for stereo\n"
+"                                        (defaults to 2)\n"
+"      --channel-map=CHANNELMAP          Channel map to use instead of the default\n"
+"      --fix-format                      Take the sample format from the sink the stream is\n"
+"                                        being connected to.\n"
+"      --fix-rate                        Take the sampling rate from the sink the stream is\n"
+"                                        being connected to.\n"
+"      --fix-channels                    Take the number of channels and the channel map\n"
+"                                        from the sink the stream is being connected to.\n"
+"      --no-remix                        Don't upmix or downmix channels.\n"
+"      --no-remap                        Map channels by index instead of name.\n"
+"      --latency=BYTES                   Request the specified latency in bytes.\n"
+"      --process-time=BYTES              Request the specified process time per request in bytes.\n"
+"      --property=PROPERTY=VALUE         Set the specified property to the specified value.\n"
+"      --raw                             Record/play raw PCM data.\n"
+"      --file-format=FFORMAT             Record/play formatted PCM data.\n"
+"      --list-file-formats               List available file formats.\n"
+msgstr ""
+"%s [KAPCSOLÓ]\n"
+"\n"
+"  -h, --help                            Ezen súgó megjelenítése\n"
+"      --version                         Az alkalmazás verziószámának megjelenítése\n"
+"\n"
+"  -r, --record                          Kapcsolat létrehozása felvételhez\n"
+"  -p, --playback                        Kapcsolat létrehozása lejátszáshoz\n"
+"\n"
+"  -v, --verbose                         Történések részletezése\n"
+"\n"
+"  -s, --server=KISZOLGÁLÓ                   Kapcsolódás a megadott KISZOLGÁLÓ kiszolgálóhoz\n"
+"  -d, --device=ESZKÖZ                   Kapcsolódás az ESZKÖZ nevű nyelőhöz vagy forráshoz\n"
+"  -n, --client-name=NÉV                A kliens neve ezen a szerveren\n"
+"      --stream-name=NÉV                Adatfolyam neve a kiszolgálón\n"
+"      --volume=HANGERŐ                   Kezdeti (lineáris) hangerő megadása a következő tartományban: 0...65536\n"
+"      --rate=MINTAVÉTEL                 Mintavételezés érzéke Hz-ben (alapértelmezés: 44100)\n"
+"      --format=MINTAFORMÁTUM             A mintavétel típusa a következőkből: s16le, s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, s24le, s24be,\n"
+"                                        s24-32le, s24-32be (alapértelmezés: s16ne)\n"
+"      --channels=CSATORNÁK               Csatornák száma: 1 - mono, 2 - sztereó\n"
+"                                        (defaults to 2)\n"
+"      --channel-map=CSATORNALEKÉPZÉS          Az alapértelmezés helyett használandó csatornaleképzés\n"
+"      --fix-format                      Take the sample format from the sink the stream is\n"
+"                                        being connected to.\n"
+"      --fix-rate                        Take the sampling rate from the sink the stream is\n"
+"                                        being connected to.\n"
+"      --fix-channels                    Take the number of channels and the channel map\n"
+"                                        from the sink the stream is being connected to.\n"
+"      --no-remix                        Don't upmix or downmix channels.\n"
+"      --no-remap                        Map channels by index instead of name.\n"
+"      --latency=BYTES                   Request the specified latency in bytes.\n"
+"      --process-time=BYTES              Request the specified process time per request in bytes.\n"
+"      --property=PROPERTY=VALUE         Set the specified property to the specified value.\n"
+"      --raw                             Nyers PCM adatok felvétele vagy lejátszása.\n"
+"      --file-format=FORMÁTUM             FORMÁTUM alakú PCM adatok felvétele vagy lejátszása.\n"
+"      --list-file-formats               Elérhető fájlformátumok listája.\n"
+
+#: ../src/utils/pacat.c:731
+#, c-format
+msgid ""
+"pacat %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pacat %s\n"
+"Összeépítve a libpulse %s programkönyvtárral\n"
+"Csatolva a libpulse %s programkönyvtárhoz\n"
+
+#: ../src/utils/pacat.c:764
+#: ../src/utils/pactl.c:953
+#, c-format
+msgid "Invalid client name '%s'"
+msgstr "Érvénytelen kliensnév: „%s”"
+
+#: ../src/utils/pacat.c:779
+#, c-format
+msgid "Invalid stream name '%s'"
+msgstr "Érvénytelen adatfolyam-név: „%s”"
+
+#: ../src/utils/pacat.c:816
+#, c-format
+msgid "Invalid channel map '%s'"
+msgstr "Érvénytelen csatornaleképzés: „%s”"
+
+#: ../src/utils/pacat.c:845
+#, c-format
+msgid "Invalid latency specification '%s'"
+msgstr "Érvénytelen késleltetés leírás: „%s”"
+
+#: ../src/utils/pacat.c:852
+#, c-format
+msgid "Invalid process time specification '%s'"
+msgstr "Érvénytelen műveleti idő leírás: „%s”"
+
+#: ../src/utils/pacat.c:864
+#, c-format
+msgid "Invalid property '%s'"
+msgstr "Érvénytelen tulajdonság: „%s”"
+
+#: ../src/utils/pacat.c:881
+#, c-format
+msgid "Unknown file format %s."
+msgstr "Ismeretlen fájlformátum: „%s”"
+
+#: ../src/utils/pacat.c:900
+msgid "Invalid sample specification"
+msgstr "Érvénytelen mintavételi leírás."
+
+#: ../src/utils/pacat.c:910
+#, c-format
+msgid "open(): %s"
+msgstr "Megnyitás: %s"
+
+#: ../src/utils/pacat.c:915
+#, c-format
+msgid "dup2(): %s"
+msgstr "dup2(): %s"
+
+#: ../src/utils/pacat.c:922
+msgid "Too many arguments."
+msgstr "Túl sok paraméter."
+
+#: ../src/utils/pacat.c:933
+msgid "Failed to generate sample specification for file."
+msgstr "Nem sikerült létrehozni a mintavételi leírást a fájlhoz."
+
+#: ../src/utils/pacat.c:953
+msgid "Failed to open audio file."
+msgstr "Nem sikerült megnyitni a hangfájlt."
+
+#: ../src/utils/pacat.c:959
+msgid "Warning: specified sample specification will be overwritten with specification from file."
+msgstr "Figyelmeztetés: a megadott mintavételi leírás felül lesz írva a fájlból származó mintavételi leírással."
+
+#: ../src/utils/pacat.c:962
+#: ../src/utils/pactl.c:997
+msgid "Failed to determine sample specification from file."
+msgstr "Nem sikerült meghatározni a mintavételi leírást a fájlból."
+
+#: ../src/utils/pacat.c:971
+msgid "Warning: Failed to determine channel map from file."
+msgstr "Figyelmeztetés: Nem sikerült meghatározni a csatornaleképzést a fájlból."
+
+#: ../src/utils/pacat.c:982
+msgid "Channel map doesn't match sample specification"
+msgstr "A csatornaleképzés nem feleltethető meg a mintavételi leírásnak."
+
+#: ../src/utils/pacat.c:993
+msgid "Warning: failed to write channel map to file."
+msgstr "Hiba történt a csatornaleképzés fájlba írása közben."
+
+#: ../src/utils/pacat.c:1008
+#, c-format
+msgid "Opening a %s stream with sample specification '%s' and channel map '%s'."
+msgstr "A(z) „%s” adatfolyam megnyitása a következő mintavételi leírás: „%s” és csatornaleképzés: „%s” használatával."
+
+#: ../src/utils/pacat.c:1009
+msgid "recording"
+msgstr "Felvétel"
+
+#: ../src/utils/pacat.c:1009
+msgid "playback"
+msgstr "Lejátszás"
+
+#: ../src/utils/pacat.c:1035
+#: ../src/utils/pactl.c:1267
+msgid "pa_mainloop_new() failed."
+msgstr "A „pa_mainloop_new()” függvényhívás meghiúsult."
+
+#: ../src/utils/pacat.c:1054
+msgid "io_new() failed."
+msgstr "A „io_new()” függvényhívás meghiúsult."
+
+#: ../src/utils/pacat.c:1061
+#: ../src/utils/pactl.c:1279
+msgid "pa_context_new() failed."
+msgstr "A „pa_context_new()” függvényhívás meghiúsult."
+
+#: ../src/utils/pacat.c:1069
+#: ../src/utils/pactl.c:1285
+#, c-format
+msgid "pa_context_connect() failed: %s"
+msgstr "A „pa_context_connect()” függvényhívás meghiúsult: %s"
+
+#: ../src/utils/pacat.c:1075
+msgid "pa_context_rttime_new() failed."
+msgstr "A „pa_context_rttime_new()” függvényhívás meghiúsult."
+
+#: ../src/utils/pacat.c:1082
+#: ../src/utils/pactl.c:1290
+msgid "pa_mainloop_run() failed."
+msgstr "A „pa_mainloop_run()” függvényhívás meghiúsult."
+
+#: ../src/utils/pasuspender.c:81
+#, c-format
+msgid "fork(): %s\n"
+msgstr "Programindítás: %s\n"
+
+#: ../src/utils/pasuspender.c:92
+#, c-format
+msgid "execvp(): %s\n"
+msgstr "execvp(): %s\n"
+
+#: ../src/utils/pasuspender.c:109
+#, c-format
+msgid "Failure to suspend: %s\n"
+msgstr "Hiba lépett fel a készenléti állapotba térés közben: %s\n"
+
+#: ../src/utils/pasuspender.c:124
+#, c-format
+msgid "Failure to resume: %s\n"
+msgstr "Hiba lépett fel a készenléti állapotból visszatérés közben: %s\n"
+
+#: ../src/utils/pasuspender.c:147
+#, c-format
+msgid "WARNING: Sound server is not local, not suspending.\n"
+msgstr "FIGYELMEZTETÉS: A hangkiszolgáló nem helyi és nincs is felfüggesztve.\n"
+
+#: ../src/utils/pasuspender.c:159
+#, c-format
+msgid "Connection failure: %s\n"
+msgstr "Kapcsolódási hiba: %s\n"
+
+#: ../src/utils/pasuspender.c:176
+#, c-format
+msgid "Got SIGINT, exiting.\n"
+msgstr "Kilépés, SIGINT szignál hatására…\n"
+
+#: ../src/utils/pasuspender.c:194
+#, c-format
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr "FIGYELMEZTETÉS: A gyermek folyamat a következő szignállal fejeződött be: %u\n"
+
+#: ../src/utils/pasuspender.c:212
+#, c-format
+msgid ""
+"%s [options] ... \n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"\n"
+msgstr ""
+"%s [KAPCSOLÓ] ... \n"
+"\n"
+"  -h, --help                            Megjeleníti ezt a súgót\n"
+"      --version                         Az alkalmazás verziószámának megjelenítése\n"
+"\n"
+
+#: ../src/utils/pasuspender.c:248
+#, c-format
+msgid ""
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pasuspender %s\n"
+"Összeépítve a libpulse %s programkönyvtárral\n"
+"Csatolva a libpulse %s programkönyvtárhoz\n"
+
+#: ../src/utils/pasuspender.c:277
+#, c-format
+msgid "pa_mainloop_new() failed.\n"
+msgstr "A „pa_mainloop_new()” függvényhívás meghiúsult.\n"
+
+#: ../src/utils/pasuspender.c:290
+#, c-format
+msgid "pa_context_new() failed.\n"
+msgstr "A „pa_context_new()” függvényhívás meghiúsult.\n"
+
+#: ../src/utils/pasuspender.c:298
+#, c-format
+msgid "pa_mainloop_run() failed.\n"
+msgstr "A „pa_mainloop_run()” függvényhívás meghiúsult.\n"
+
+#: ../src/utils/pactl.c:135
+#, c-format
+msgid "Failed to get statistics: %s"
+msgstr "Nem sikerült a statisztika lekérdezése: %s"
+
+#: ../src/utils/pactl.c:141
+#, c-format
+msgid "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr "Jelenleg lefoglalt blokkok száma: %u, amely összesen %s bájtot jelent.\n"
+
+#: ../src/utils/pactl.c:144
+#, c-format
+msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr "A futás során összesen lefoglalt blokkok száma: %u, amely összesen %s bájtot jelent.\n"
+
+#: ../src/utils/pactl.c:147
+#, c-format
+msgid "Sample cache size: %s\n"
+msgstr "Minta-gyorsítótár mérete: %s\n"
+
+#: ../src/utils/pactl.c:156
+#, c-format
+msgid "Failed to get server information: %s"
+msgstr "Nem sikerült lekérdezni a kiszolgáló adatait: „%s”"
+
+#: ../src/utils/pactl.c:164
+#, c-format
+msgid ""
+"User name: %s\n"
+"Host Name: %s\n"
+"Server Name: %s\n"
+"Server Version: %s\n"
+"Default Sample Specification: %s\n"
+"Default Channel Map: %s\n"
+"Default Sink: %s\n"
+"Default Source: %s\n"
+"Cookie: %08x\n"
+msgstr ""
+"Felhasználónév: %s\n"
+"Számítógépnév: %s\n"
+"Kiszolgálónév: %s\n"
+"Kiszolgáló verzió: %s\n"
+"Alapértelmezett mintavételi leírás: %s\n"
+"Alapértelmezett csatornaleképzés: %s\n"
+"Alapértelmezett nyelő: %s\n"
+"Alapértelmezett forrás: %s\n"
+"Süti: %08x\n"
+
+#: ../src/utils/pactl.c:205
+#, c-format
+msgid "Failed to get sink information: %s"
+msgstr "Nem sikerült lekérdezni a nyelő adatait: „%s”"
+
+#: ../src/utils/pactl.c:221
+#, c-format
+msgid ""
+"Sink #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s%s%s\n"
+"\t        balance %0.2f\n"
+"\tBase Volume: %s%s%s\n"
+"\tMonitor Source: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Nyelő #%u\n"
+"\tÁllapot: %s\n"
+"\tNév: %s\n"
+"\tLeírás: %s\n"
+"\tEszközmeghajtó: %s\n"
+"\tMintavételi leírás: %s\n"
+"\tCsatornaleképzés: %s\n"
+"\tTulajdonos modul: %u\n"
+"\tNémítás: %s\n"
+"\tHangerő: %s%s%s\n"
+"\t        egyensúly %0.2f\n"
+"\tAlap hangerő: %s%s%s\n"
+"\tMonitor forrás: %s\n"
+"\tKésleltetés: %0.0f ezredmásodperc, beállítva %0.0f ezredmásodperc\n"
+"\tJelzők: %s%s%s%s%s%s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:268
+#: ../src/utils/pactl.c:360
+#, c-format
+msgid "\tPorts:\n"
+msgstr "\tPort:\n"
+
+#: ../src/utils/pactl.c:274
+#: ../src/utils/pactl.c:366
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tAktív Port: %s\n"
+
+#: ../src/utils/pactl.c:297
+#, c-format
+msgid "Failed to get source information: %s"
+msgstr "Nem sikerült lekérdezni a forrás adatait: „%s”"
+
+#: ../src/utils/pactl.c:313
+#, c-format
+msgid ""
+"Source #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s%s%s\n"
+"\t        balance %0.2f\n"
+"\tBase Volume: %s%s%s\n"
+"\tMonitor of Sink: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Forrás #%u\n"
+"\tÁllapot: %s\n"
+"\tNév: %s\n"
+"\tLeírás: %s\n"
+"\tEszközmeghajtó: %s\n"
+"\tMintavételi leírás: %s\n"
+"\tCsatornaleképzés: %s\n"
+"\tTulajdonos modul: %u\n"
+"\tNémítás: %s\n"
+"\tHangerő: %s%s%s\n"
+"\t        egyensúly %0.2f\n"
+"\tAlap hangerő: %s%s%s\n"
+"\tNyelő monitora: %s\n"
+"\tKésleltetés: %0.0f ezredmásodperc, beállítva %0.0f ezredmásodperc\n"
+"\tJelzők: %s%s%s%s%s%s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:345
+#: ../src/utils/pactl.c:401
+#: ../src/utils/pactl.c:436
+#: ../src/utils/pactl.c:473
+#: ../src/utils/pactl.c:532
+#: ../src/utils/pactl.c:533
+#: ../src/utils/pactl.c:543
+#: ../src/utils/pactl.c:587
+#: ../src/utils/pactl.c:588
+#: ../src/utils/pactl.c:594
+#: ../src/utils/pactl.c:637
+#: ../src/utils/pactl.c:638
+#: ../src/utils/pactl.c:645
+msgid "n/a"
+msgstr "ismeretlen"
+
+#: ../src/utils/pactl.c:375
+#, c-format
+msgid "Failed to get module information: %s"
+msgstr "Nem sikerült lekérdezni a modul adatait: „%s”"
+
+#: ../src/utils/pactl.c:393
+#, c-format
+msgid ""
+"Module #%u\n"
+"\tName: %s\n"
+"\tArgument: %s\n"
+"\tUsage counter: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Modul #%u\n"
+"\tNév: %s\n"
+"\tParaméter: %s\n"
+"\tHasználva: %s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:412
+#, c-format
+msgid "Failed to get client information: %s"
+msgstr "Nem sikerült lekérdezni a kliens adatait: „%s”"
+
+#: ../src/utils/pactl.c:430
+#, c-format
+msgid ""
+"Client #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Kliens #%u\n"
+"\tEszközmeghajtó: %s\n"
+"\tTulajdonos modul: %s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:447
+#, c-format
+msgid "Failed to get card information: %s"
+msgstr "Nem sikerült lekérdezni a kártya adatait: „%s”"
+
+#: ../src/utils/pactl.c:465
+#, c-format
+msgid ""
+"Card #%u\n"
+"\tName: %s\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Kártya #%u\n"
+"\tNév: %s\n"
+"\tEszközmeghajtó: %s\n"
+"\tTulajdonos modul: %s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:479
+#, c-format
+msgid "\tProfiles:\n"
+msgstr "\tProfil:\n"
+
+#: ../src/utils/pactl.c:485
+#, c-format
+msgid "\tActive Profile: %s\n"
+msgstr "\tAktív profil: %s\n"
+
+#: ../src/utils/pactl.c:496
+#, c-format
+msgid "Failed to get sink input information: %s"
+msgstr "Nem sikerült lekérdezni a nyelő bemeneti adatait: „%s”"
+
+#: ../src/utils/pactl.c:515
+#, c-format
+msgid ""
+"Sink Input #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSink: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t        %s\n"
+"\t        balance %0.2f\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSink Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Nyelő bemenet #%u\n"
+"\tEszközmeghajtó: %s\n"
+"\tTulajdonos modul: %s\n"
+"\tKliens: %s\n"
+"\tNyelő: %u\n"
+"\tMintavételi leírás: %s\n"
+"\tCsatornaleképzés: %s\n"
+"\tNémítás: %s\n"
+"\tHangerő: %s\n"
+"\t        %s\n"
+"\t        egyensúly %0.2f\n"
+"\tPuffer késleltetés: %0.0f usec\n"
+"\tNyelő késleltetés: %0.0f usec\n"
+"\tÚjramintavételezési eljárás: %s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:554
+#, c-format
+msgid "Failed to get source output information: %s"
+msgstr "Nem sikerült lekérdezni a forrás kimeneti adatait: „%s”"
+
+#: ../src/utils/pactl.c:574
+#, c-format
+msgid ""
+"Source Output #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSource: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSource Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Forrás kimenet #%u\n"
+"\tEszközmeghajtó: %s\n"
+"\tTulajdonos modul: %s\n"
+"\tKliens: %s\n"
+"\tForrás: %u\n"
+"\tMintavételi leírás: %s\n"
+"\tCsatornaleképzés: %s\n"
+"\tPuffer késleltetés: %0.0f usec\n"
+"\tForrás késleltetés: %0.0f usec\n"
+"\tÚjramintavételezési eljárás: %s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:605
+#, c-format
+msgid "Failed to get sample information: %s"
+msgstr "Nem sikerült lekérdezni a mintavétel adatait: „%s”"
+
+#: ../src/utils/pactl.c:623
+#, c-format
+msgid ""
+"Sample #%u\n"
+"\tName: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tVolume: %s\n"
+"\t        %s\n"
+"\t        balance %0.2f\n"
+"\tDuration: %0.1fs\n"
+"\tSize: %s\n"
+"\tLazy: %s\n"
+"\tFilename: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Minta #%u\n"
+"\tNév: %s\n"
+"\tMintavételi leírás: %s\n"
+"\tCsatornaleképzés: %s\n"
+"\tHangerő: %s\n"
+"\t        %s\n"
+"\t        egyensúly %0.2f\n"
+"\tIdőtartam: %0.1fs\n"
+"\tMéret: %s\n"
+"\tLassú: %s\n"
+"\tFájlnév: %s\n"
+"\tTulajdonságok:\n"
+"\t\t%s\n"
+
+#: ../src/utils/pactl.c:653
+#: ../src/utils/pactl.c:663
+#, c-format
+msgid "Failure: %s"
+msgstr "Hiba: %s"
+
+#: ../src/utils/pactl.c:687
+#, c-format
+msgid "Failed to upload sample: %s"
+msgstr "Nem sikerült feltölteni a mintát: %s"
+
+#: ../src/utils/pactl.c:704
+msgid "Premature end of file"
+msgstr "Idő előtti fájlvége"
+
+#: ../src/utils/pactl.c:863
+msgid "Got SIGINT, exiting."
+msgstr "Kilépés, SIGINT szignál hatására…"
+
+#: ../src/utils/pactl.c:869
+#, c-format
+msgid ""
+"%s [options] stat\n"
+"%s [options] list\n"
+"%s [options] exit\n"
+"%s [options] upload-sample FILENAME [NAME]\n"
+"%s [options] play-sample NAME [SINK]\n"
+"%s [options] remove-sample NAME\n"
+"%s [options] move-sink-input SINKINPUT SINK\n"
+"%s [options] move-source-output SOURCEOUTPUT SOURCE\n"
+"%s [options] load-module NAME [ARGS ...]\n"
+"%s [options] unload-module MODULE\n"
+"%s [options] suspend-sink SINK 1|0\n"
+"%s [options] suspend-source SOURCE 1|0\n"
+"%s [options] set-card-profile CARD PROFILE\n"
+"%s [options] set-sink-port SINK PORT\n"
+"%s [options] set-source-port SOURCE PORT\n"
+"%s [options] set-sink-volume SINK VOLUME\n"
+"%s [options] set-source-volume SOURCE VOLUME\n"
+"%s [options] set-sink-input-volume SINKINPUT VOLUME\n"
+"%s [options] set-sink-mute SINK 1|0\n"
+"%s [options] set-source-mute SOURCE 1|0\n"
+"%s [options] set-sink-input-mute SINKINPUT 1|0\n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"  -n, --client-name=NAME                How to call this client on the server\n"
+msgstr ""
+"%s [options] stat\n"
+"%s [options] list\n"
+"%s [options] exit\n"
+"%s [options] upload-sample FÁJLNÉV [NÉV]\n"
+"%s [options] play-sample NÉV [NYELŐ]\n"
+"%s [options] remove-sample NÉV\n"
+"%s [options] move-sink-input NYELŐBEMENET NYELŐ\n"
+"%s [options] move-source-output FORRÁSKIMENET FORRÁS\n"
+"%s [options] load-module NÉV [PARAMÉTEREK ...]\n"
+"%s [options] unload-module MODUL\n"
+"%s [options] suspend-sink NYELŐ 1|0\n"
+"%s [options] suspend-source FORRÁS 1|0\n"
+"%s [options] set-card-profile KÁRTYA PROFIL\n"
+"%s [options] set-sink-port NYELŐ PORT\n"
+"%s [options] set-source-port FORRÁS PORT\n"
+"%s [options] set-sink-volume NYELŐ HANGERŐ\n"
+"%s [options] set-source-volume FORRÁS HANGERŐ\n"
+"%s [options] set-sink-input-volume NYELŐBEMENET HANGERŐ\n"
+"%s [options] set-sink-mute NYELŐ 1|0\n"
+"%s [options] set-source-mute FORRÁS 1|0\n"
+"%s [options] set-sink-input-mute NYELŐBEMENET 1|0\n"
+"\n"
+"  -h, --help                            Megjeleníti ezt a súgót\n"
+"      --version                         Az alkalmazás verziószámának megjelenítése\n"
+"\n"
+"  -s, --server=KISZOLGÁLÓ                   Kapcsolódás a megadott KISZOLGÁLÓ kiszolgálóhoz\n"
+"  -n, --client-name=NÉV                A kliens neve ezen a szerveren\n"
+
+#: ../src/utils/pactl.c:933
+#, c-format
+msgid ""
+"pactl %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pactl %s\n"
+"Összeépítve a libpulse %s programkönyvtárral\n"
+"Csatolva a libpulse %s programkönyvtárhoz\n"
+
+#: ../src/utils/pactl.c:979
+msgid "Please specify a sample file to load"
+msgstr "Adja meg a betöltendő mintafájlt"
+
+#: ../src/utils/pactl.c:992
+msgid "Failed to open sound file."
+msgstr "Nem sikerült megnyitni az hangfájlt."
+
+#: ../src/utils/pactl.c:1004
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Figyelmeztetés: Nem sikerült meghatározni a mintavételi leírást a fájlból."
+
+#: ../src/utils/pactl.c:1014
+msgid "You have to specify a sample name to play"
+msgstr "Meg kell adnia lejátszandó minta nevét."
+
+#: ../src/utils/pactl.c:1026
+msgid "You have to specify a sample name to remove"
+msgstr "Meg kell adnia az eltávolítandó minta nevét."
+
+#: ../src/utils/pactl.c:1035
+msgid "You have to specify a sink input index and a sink"
+msgstr "Meg kell adnia a nyelő bemeneti azonosítóját és a nyelőt."
+
+#: ../src/utils/pactl.c:1045
+msgid "You have to specify a source output index and a source"
+msgstr "Meg kell adnia a forrás kimeneti azonosítóját és a forrást."
+
+#: ../src/utils/pactl.c:1060
+msgid "You have to specify a module name and arguments."
+msgstr "Meg kell adnia a modul nevét és a paramétereit."
+
+#: ../src/utils/pactl.c:1080
+msgid "You have to specify a module index"
+msgstr "Meg kell adnia a modul azonosítóját."
+
+#: ../src/utils/pactl.c:1090
+msgid "You may not specify more than one sink. You have to specify a boolean value."
+msgstr "Nem adhat meg egynél több nyelőt. Egy logikai értéket kell megadnia."
+
+#: ../src/utils/pactl.c:1103
+msgid "You may not specify more than one source. You have to specify a boolean value."
+msgstr "Nem adhat meg egynél több forrást. Egy logikai értéket kell megadnia."
+
+#: ../src/utils/pactl.c:1115
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Meg kell adnia a kártya nevét vagy azonosítóját és a profil nevét"
+
+#: ../src/utils/pactl.c:1126
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Meg kell adnia a nyelő nevét vagy azonosítóját és a port nevét."
+
+#: ../src/utils/pactl.c:1137
+msgid "You have to specify a source name/index and a port name"
+msgstr "Meg kell adnia a forrás nevét vagy azonosítóját és a port nevét"
+
+#: ../src/utils/pactl.c:1149
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Meg kell adnia a nyelő nevét vagy azonosítóját és a hangerejét."
+
+#: ../src/utils/pactl.c:1154
+#: ../src/utils/pactl.c:1171
+#: ../src/utils/pactl.c:1193
+#: ../src/utils/pactl.c:1209
+#: ../src/utils/pactl.c:1226
+#: ../src/utils/pactl.c:1248
+msgid "Invalid volume specification"
+msgstr "A hangerő megadása érvénytelen."
+
+#: ../src/utils/pactl.c:1166
+msgid "You have to specify a source name/index and a volume"
+msgstr "Meg kell adnia a forrás nevét vagy azonosítóját és a hangerejét"
+
+#: ../src/utils/pactl.c:1183
+msgid "You have to specify a sink input index and a volume"
+msgstr "Meg kell adnia a nyelő bemenet azonosítóját és a hangerejét"
+
+#: ../src/utils/pactl.c:1188
+msgid "Invalid sink input index"
+msgstr "A nyelő bemeneti azonosítója érvénytelen."
+
+#: ../src/utils/pactl.c:1204
+msgid "You have to specify a sink name/index and a mute boolean"
+msgstr "Meg kell adnia a nyelő nevét vagy azonosítóját és a némítás logikai változóját."
+
+#: ../src/utils/pactl.c:1221
+msgid "You have to specify a source name/index and a mute boolean"
+msgstr "Meg kell adnia a forrás nevét vagy azonosítóját és a némítás logikai változóját"
+
+#: ../src/utils/pactl.c:1238
+msgid "You have to specify a sink input index and a mute boolean"
+msgstr "Meg kell adnia a nyelő bemenet azonosítóját és a némítás logikai változóját"
+
+#: ../src/utils/pactl.c:1243
+msgid "Invalid sink input index specification"
+msgstr "A nyelő bemeneti azonosítójának megadása érvénytelen."
+
+#: ../src/utils/pactl.c:1262
+msgid "No valid command specified."
+msgstr "Érvénytelen parancs lett megadva."
+
+#: ../src/utils/pax11publish.c:61
+#, c-format
+msgid ""
+"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    Show current PulseAudio data attached to X11 display (default)\n"
+" -e    Export local PulseAudio data to X11 display\n"
+" -i    Import PulseAudio data from X11 display to local environment variables and cookie file.\n"
+" -r    Remove PulseAudio data from X11 display\n"
+msgstr ""
+"%s [-D megjelenítő] [-S kiszolgáló] [-O nyelő] [-I forrás] [-c fájl]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    Megjeleníti az aktuális X11 megjelenítőhöz csatlakoztatott PulseAudio adatokat (alapértelmezés)\n"
+" -e    Helyi PulseAudio adatok exportálása az X11 megjelenítőre\n"
+" -i    Helyi PulseAudio adatok importálása az X11 megjelenítőről helyi környezeti változókba és süti fájlokba\n"
+" -r    Eltávolítja a PulseAudio adatokat z X11 megjelenítőről\n"
+
+#: ../src/utils/pax11publish.c:94
+#, c-format
+msgid "Failed to parse command line.\n"
+msgstr "Nem sikerült feldolgozni a parancssort.\n"
+
+#: ../src/utils/pax11publish.c:108
+#, c-format
+msgid "Server: %s\n"
+msgstr "Kiszolgáló: %s\n"
+
+#: ../src/utils/pax11publish.c:110
+#, c-format
+msgid "Source: %s\n"
+msgstr "Forrás: %s\n"
+
+#: ../src/utils/pax11publish.c:112
+#, c-format
+msgid "Sink: %s\n"
+msgstr "Nyelő: %s\n"
+
+#: ../src/utils/pax11publish.c:114
+#, c-format
+msgid "Cookie: %s\n"
+msgstr "Süti: %s\n"
+
+#: ../src/utils/pax11publish.c:132
+#, c-format
+msgid "Failed to parse cookie data\n"
+msgstr "Nem sikerült feldolgozni a süti adatokat.\n"
+
+#: ../src/utils/pax11publish.c:137
+#, c-format
+msgid "Failed to save cookie data\n"
+msgstr "Nem sikerült elmenteni a süti adatokat.\n"
+
+#: ../src/utils/pax11publish.c:152
+#, c-format
+msgid "Failed to load client configuration file.\n"
+msgstr "Nem sikerült betölteni a kliens konfigurációs fájlt.\n"
+
+#: ../src/utils/pax11publish.c:157
+#, c-format
+msgid "Failed to read environment configuration data.\n"
+msgstr "Nem sikerült elolvasni a környezetváltozó konfigurációs adatokat.\n"
+
+#: ../src/utils/pax11publish.c:174
+#, c-format
+msgid "Failed to get FQDN.\n"
+msgstr "Nem sikerült lekérdezni a teljes tartománynevet (FQDN).\n"
+
+#: ../src/utils/pax11publish.c:194
+#, c-format
+msgid "Failed to load cookie data\n"
+msgstr "Nem sikerült betölteni a süti adatokat.\n"
+
+#: ../src/utils/pax11publish.c:211
+#, c-format
+msgid "Not yet implemented.\n"
+msgstr "Még nincs elkészítve.\n"
+
+#: ../src/utils/pacmd.c:69
+msgid "No PulseAudio daemon running, or not running as session daemon."
+msgstr "Nem fut a PulseAudio démon vagy nem fut munkamenet démonként sem."
+
+#: ../src/utils/pacmd.c:74
+#, c-format
+msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+
+#: ../src/utils/pacmd.c:91
+#, c-format
+msgid "connect(): %s"
+msgstr "Kapcsolódás: %s"
+
+#: ../src/utils/pacmd.c:99
+msgid "Failed to kill PulseAudio daemon."
+msgstr "A PulseAudio démon kilövése nem sikerült."
+
+#: ../src/utils/pacmd.c:107
+msgid "Daemon not responding."
+msgstr "A démon nem válaszol."
+
+#: ../src/utils/pacmd.c:161
+#, c-format
+msgid "poll(): %s"
+msgstr "Lekérdezés: %s"
+
+#: ../src/utils/pacmd.c:171
+#: ../src/utils/pacmd.c:188
+#, c-format
+msgid "read(): %s"
+msgstr "Olvasás: %s"
+
+#: ../src/utils/pacmd.c:207
+#: ../src/utils/pacmd.c:223
+#, c-format
+msgid "write(): %s"
+msgstr "Írás: %s"
+
+#: ../src/pulsecore/lock-autospawn.c:136
+#: ../src/pulsecore/lock-autospawn.c:219
+msgid "Cannot access autospawn lock."
+msgstr "Nem érhető zárolás az automatikus indításhoz."
+
+#: ../src/modules/alsa/alsa-sink.c:530
+#: ../src/modules/alsa/alsa-sink.c:689
+#, c-format
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail."
+msgstr ""
+"Az ALSA modul értesítése nyomán új adatokat kellett volna írni az eszközre, de jelenleg semmilyen írandó adat nincsen.\n"
+"Ez egy hiba lehet az ALSA „%s” eszközmeghajtóban. Kérem jelentse ezt a problémát az ALSA fejlesztői felé.\n"
+"Az értesítés a POLLOUT jelzésen keresztül érkezett – viszont a „snd_pcm_avail()” függvény visszatérési értéke 0 volt vagy a második érték kisebb volt, mint a minimum."
+
+#: ../src/modules/alsa/alsa-source.c:506
+#: ../src/modules/alsa/alsa-source.c:656
+#, c-format
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail."
+msgstr ""
+"Az ALSA modul értesítése nyomán új adatokat kellett volna olvasni az eszközről, de jelenleg semmilyen olvasandó adat nincsen.\n"
+"Ez egy hiba lehet az ALSA „%s” eszközmeghajtóban. Kérem jelentse ezt a problémát az ALSA fejlesztői felé.\n"
+"Az értesítés a POLLIN jelzésen keresztül érkezett – viszont a „snd_pcm_avail()” függvény visszatérési értéke 0 volt vagy a második érték kisebb volt, mint a minimum."
+
+#: ../src/modules/alsa/module-alsa-card.c:152
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2228
+#: ../src/modules/alsa/alsa-mixer.c:2931
+msgid "Off"
+msgstr "Kikapcsolva"
+
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2184
+msgid "High Fidelity Playback (A2DP)"
+msgstr "HiFi lejátszás (A2DP)"
+
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2198
+msgid "High Fidelity Capture (A2DP)"
+msgstr "HiFi felvétel (A2DP)"
+
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2213
+msgid "Telephony Duplex (HSP/HFP)"
+msgstr "Telefon duplex (HSP/HFP)"
+
+#: ../src/modules/reserve-wrap.c:151
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio hangkiszolgáló"
+
+#: ../src/modules/module-rygel-media-server.c:569
+#: ../src/modules/module-rygel-media-server.c:583
+msgid "Output Devices"
+msgstr "Kimeneti eszközök"
+
+#: ../src/modules/module-rygel-media-server.c:570
+#: ../src/modules/module-rygel-media-server.c:584
+msgid "Input Devices"
+msgstr "Bemeneti eszközök"
+
+#: ../src/modules/module-rygel-media-server.c:774
+msgid "Audio on @HOSTNAME@"
+msgstr "Hangforrások a(z) @HOSTNAME@ számítógépen"
+
+#: ../src/modules/alsa/alsa-mixer.c:1701
+msgid "Input"
+msgstr "Bemenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1702
+msgid "Docking Station Input"
+msgstr "Dokkolóállomás bemenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1703
+msgid "Docking Station Microphone"
+msgstr "Dokkolóállomás mikrofon"
+
+#: ../src/modules/alsa/alsa-mixer.c:1704
+msgid "Line-In"
+msgstr "Vonalbemenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1705
+msgid "Microphone"
+msgstr "Mikrofon"
+
+#: ../src/modules/alsa/alsa-mixer.c:1706
+msgid "External Microphone"
+msgstr "Külső mikrofon"
+
+#: ../src/modules/alsa/alsa-mixer.c:1707
+msgid "Internal Microphone"
+msgstr "Belső mikrofon"
+
+#: ../src/modules/alsa/alsa-mixer.c:1708
+msgid "Radio"
+msgstr "Rádió"
+
+#: ../src/modules/alsa/alsa-mixer.c:1709
+msgid "Video"
+msgstr "Videó"
+
+#: ../src/modules/alsa/alsa-mixer.c:1710
+msgid "Automatic Gain Control"
+msgstr "Automatikus erősítésszabályzás"
+
+#: ../src/modules/alsa/alsa-mixer.c:1711
+msgid "No Automatic Gain Control"
+msgstr "Nincs automatikus erősítésszabályzás"
+
+#: ../src/modules/alsa/alsa-mixer.c:1712
+msgid "Boost"
+msgstr "Erősítés"
+
+#: ../src/modules/alsa/alsa-mixer.c:1713
+msgid "No Boost"
+msgstr "Nincs erősítés"
+
+#: ../src/modules/alsa/alsa-mixer.c:1714
+msgid "Amplifier"
+msgstr "Erősítő"
+
+#: ../src/modules/alsa/alsa-mixer.c:1715
+msgid "No Amplifier"
+msgstr "Nincs erősítő"
+
+#: ../src/modules/alsa/alsa-mixer.c:1773
+msgid "Analog Input"
+msgstr "Analóg bemenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1774
+msgid "Analog Microphone"
+msgstr "Analóg mikrofon"
+
+#: ../src/modules/alsa/alsa-mixer.c:1775
+msgid "Analog Line-In"
+msgstr "Analóg vonalbemenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1776
+msgid "Analog Radio"
+msgstr "Analóg rádió"
+
+#: ../src/modules/alsa/alsa-mixer.c:1777
+msgid "Analog Video"
+msgstr "Analóg videó"
+
+#: ../src/modules/alsa/alsa-mixer.c:1778
+msgid "Analog Output"
+msgstr "Analóg kimenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1779
+msgid "Analog Headphones"
+msgstr "Analóg fejhallgató"
+
+#: ../src/modules/alsa/alsa-mixer.c:1780
+msgid "Analog Output (LFE)"
+msgstr "Analóg kimenet (mély)"
+
+#: ../src/modules/alsa/alsa-mixer.c:1781
+msgid "Analog Mono Output"
+msgstr "Analóg mono kimenet"
+
+#: ../src/modules/alsa/alsa-mixer.c:1981
+#, c-format
+msgid "%s+%s"
+msgstr "%s+%s"
+
+#: ../src/modules/alsa/alsa-mixer.c:1984
+#: ../src/modules/alsa/alsa-mixer.c:3404
+#, c-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
+#: ../src/modules/alsa/alsa-mixer.c:2790
+msgid "Analog Mono"
+msgstr "Analóg mono"
+
+#: ../src/modules/alsa/alsa-mixer.c:2791
+msgid "Analog Stereo"
+msgstr "Analóg sztereó"
+
+#: ../src/modules/alsa/alsa-mixer.c:2792
+msgid "Analog Surround 2.1"
+msgstr "Analóg térhatású 2.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:2793
+msgid "Analog Surround 3.0"
+msgstr "Analóg térhatású 3.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:2794
+msgid "Analog Surround 3.1"
+msgstr "Analóg térhatású 3.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:2795
+msgid "Analog Surround 4.0"
+msgstr "Analóg térhatású 4.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Surround 4.1"
+msgstr "Analóg térhatású 4.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:2797
+msgid "Analog Surround 5.0"
+msgstr "Analóg térhatású 5.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:2798
+msgid "Analog Surround 5.1"
+msgstr "Analóg térhatású 5.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:2799
+msgid "Analog Surround 6.0"
+msgstr "Analóg térhatású 6.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:2800
+msgid "Analog Surround 6.1"
+msgstr "Analóg térhatású 6.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:2801
+msgid "Analog Surround 7.0"
+msgstr "Analóg térhatású 7.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:2802
+msgid "Analog Surround 7.1"
+msgstr "Analóg térhatású 7.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:2803
+msgid "Digital Stereo (IEC958)"
+msgstr "Digitális sztereó (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2804
+msgid "Digital Surround 4.0 (IEC958)"
+msgstr "Digitális térhatású 4.0 (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2805
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digitális térhatású 4.0 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2806
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digitális térhatású 5.1 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2807
+msgid "Digital Stereo (HDMI)"
+msgstr "Digitális térhatású (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2928
+msgid "Analog Mono Duplex"
+msgstr "Analóg mono duplex"
+
+#: ../src/modules/alsa/alsa-mixer.c:2929
+msgid "Analog Stereo Duplex"
+msgstr "Analóg sztereó duplex"
+
+#: ../src/modules/alsa/alsa-mixer.c:2930
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Analóg sztereó duplex (IEC958)"
+
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/it.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/it.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/it.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/it.po	2010-01-15 23:21:18.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-08-26 21:46+0200\n"
+"POT-Creation-Date: 2009-10-18 05:22+0000\n"
+"PO-Revision-Date: 2009-10-18 11:46+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -62,11 +62,11 @@
 
 #: ../src/modules/module-always-sink.c:39
 msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr ""
+msgstr "Mantiene sempre almeno un sink caricato anche se è nullo"
 
 #: ../src/modules/module-always-sink.c:83
 msgid "Dummy Output"
-msgstr ""
+msgstr "Output dummy"
 
 #: ../src/modules/module-ladspa-sink.c:49
 msgid "Virtual LADSPA sink"
@@ -88,12 +88,11 @@
 
 #: ../src/modules/module-null-sink.c:55
 msgid "Clocked NULL sink"
-msgstr ""
+msgstr "Sink NULL temporizzato"
 
 #: ../src/modules/module-null-sink.c:291
-#, fuzzy
 msgid "Null Output"
-msgstr "Output %s"
+msgstr "Output nullo"
 
 #: ../src/pulsecore/sink.c:2613
 msgid "Internal Audio"
@@ -1139,11 +1138,11 @@
 
 #: ../src/pulse/error.c:68
 msgid "Input/Output error"
-msgstr ""
+msgstr "Errore di input/output"
 
 #: ../src/pulse/error.c:69
 msgid "Device or resource busy"
-msgstr ""
+msgstr "Dispositivo o risorsa occupata"
 
 #: ../src/pulse/sample.c:172
 #, c-format
@@ -1355,9 +1354,9 @@
 
 # dubbio: tempo o durata??
 #: ../src/utils/pacat.c:580
-#, fuzzy, c-format
+#, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Tempo: %0.3f sec; Latenza: %0.0f microsec.  \r"
+msgstr "Tempo: %0.3f sec; Latenza: %0.0f microsec."
 
 #: ../src/utils/pacat.c:599
 #, c-format
@@ -1716,9 +1715,9 @@
 msgstr "pa_mainloop_run() non riuscita.\n"
 
 #: ../src/utils/pactl.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get statistics: %s"
-msgstr "Recupero delle statistiche non riuscito: %s\n"
+msgstr "Recupero delle statistiche non riuscito: %s"
 
 #: ../src/utils/pactl.c:141
 #, c-format
@@ -1738,9 +1737,9 @@
 msgstr "Dimensione della cache dei campioni: %s\n"
 
 #: ../src/utils/pactl.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get server information: %s"
-msgstr "Recupero delle informazioni del server non riuscito: %s\n"
+msgstr "Recupero delle informazioni del server non riuscito: %s"
 
 #: ../src/utils/pactl.c:164
 #, c-format
@@ -1766,9 +1765,9 @@
 "Cookie: %08x\n"
 
 #: ../src/utils/pactl.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get sink information: %s"
-msgstr "Recupero delle informazioni del sink non riuscito: %s\n"
+msgstr "Recupero delle informazioni del sink non riuscito: %s"
 
 # nel relativo messaggio per il source
 # c'è "monitor of sink", quindi assumo che
@@ -1823,9 +1822,9 @@
 msgstr "\tPorta attiva: %s\n"
 
 #: ../src/utils/pactl.c:297
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get source information: %s"
-msgstr "Recupero delle informazioni della sorgente non riuscito: %s\n"
+msgstr "Recupero delle informazioni della sorgente non riuscito: %s"
 
 #: ../src/utils/pactl.c:313
 #, c-format
@@ -1875,9 +1874,9 @@
 msgstr "N/D"
 
 #: ../src/utils/pactl.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get module information: %s"
-msgstr "Recupero delle informazioni del modulo non riuscito: %s\n"
+msgstr "Recupero delle informazioni del modulo non riuscito: %s"
 
 #: ../src/utils/pactl.c:393
 #, c-format
@@ -1897,9 +1896,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:412
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get client information: %s"
-msgstr "Recupero delle informazioni del client non riuscito: %s\n"
+msgstr "Recupero delle informazioni del client non riuscito: %s"
 
 #: ../src/utils/pactl.c:430
 #, c-format
@@ -1917,9 +1916,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get card information: %s"
-msgstr "Recupero delle informazioni della scheda non riuscito: %s\n"
+msgstr "Recupero delle informazioni della scheda non riuscito: %s"
 
 #: ../src/utils/pactl.c:465
 #, c-format
@@ -1953,10 +1952,9 @@
 #
 # from http://pulseaudio.org/wiki/WritingVolumeControlUIs
 #: ../src/utils/pactl.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get sink input information: %s"
-msgstr ""
-"Recupero delle informazioni dell'ingresso per il sink non riuscito: %s\n"
+msgstr "Recupero delle informazioni dell'ingresso per il sink non riuscito: %s"
 
 #: ../src/utils/pactl.c:515
 #, c-format
@@ -2000,10 +1998,10 @@
 #
 # from http://pulseaudio.org/wiki/WritingVolumeControlUIs
 #: ../src/utils/pactl.c:554
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
-"Recupero delle informazioni dell'uscita per la sorgente non riuscito: %s\n"
+"Recupero delle informazioni dell'uscita per la sorgente non riuscito: %s"
 
 #: ../src/utils/pactl.c:574
 #, c-format
@@ -2035,9 +2033,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:605
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get sample information: %s"
-msgstr "Recupero delle informazioni del campione non riuscito: %s\n"
+msgstr "Recupero delle informazioni del campione non riuscito: %s"
 
 # campiona lazy??
 #: ../src/utils/pactl.c:623
@@ -2072,27 +2070,25 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:653 ../src/utils/pactl.c:663
-#, fuzzy, c-format
+#, c-format
 msgid "Failure: %s"
-msgstr "Fallimento: %s\n"
+msgstr "Fallimento: %s"
 
 #: ../src/utils/pactl.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to upload sample: %s"
-msgstr "Caricamento del campione non riuscito: %s\n"
+msgstr "Caricamento del campione non riuscito: %s"
 
 #: ../src/utils/pactl.c:704
-#, fuzzy
 msgid "Premature end of file"
-msgstr "Fine del file prematura\n"
+msgstr "Fine del file prematura"
 
 #: ../src/utils/pactl.c:863
-#, fuzzy
 msgid "Got SIGINT, exiting."
-msgstr "Ricevuto SIGINT, in uscita.\n"
+msgstr "Ricevuto SIGINT, uscita."
 
 #: ../src/utils/pactl.c:869
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s [options] stat\n"
 "%s [options] list\n"
@@ -2130,15 +2126,21 @@
 "%s [OPZIONI] upload-sample NOMEFILE [NOME]\n"
 "%s [OPZIONI] play-sample NOME [SINK]\n"
 "%s [OPZIONI] remove-sample NOME\n"
-"%s [OPZIONI] move-sink-input ID SINK\n"
-"%s [OPZIONI] move-source-output ID SORGENTE\n"
+"%s [OPZIONI] move-sink-input SINKINPUT SINK\n"
+"%s [OPZIONI] move-source-output SOURCEOUTPUT SORGENTE\n"
 "%s [OPZIONI] load-module NOME [ARGOMENTI...]\n"
-"%s [OPZIONI] unload-module ID\n"
-"%s [OPZIONI] suspend-sink [SINK] 1|0\n"
-"%s [OPZIONI] suspend-source [SORGENTE] 1|0\n"
-"%s [OPZIONI] set-card-profile [SCHEDA] [PROFILO] \n"
-"%s [OPZIONI] set-sink-port [SINK] [PORTA] \n"
-"%s [OPZIONI] set-source-port [SORGENTE] [PORTA] \n"
+"%s [OPZIONI] unload-module MODULO\n"
+"%s [OPZIONI] suspend-sink SINK 1|0\n"
+"%s [OPZIONI] suspend-source SORGENTE 1|0\n"
+"%s [OPZIONI] set-card-profile SCHEDA PROFILO\n"
+"%s [OPZIONI] set-sink-port SINK PORTA\n"
+"%s [OPZIONI] set-source-port SORGENTE PORTA\n"
+"%s [OPZIONI] set-sink-volume SINK VOLUME\n"
+"%s [OPZIONI] set-source-volume SORGENTE VOLUME\n"
+"%s [OPZIONI] set-sink-input-volume SINKINPUT VOLUME\n"
+"%s [OPZIONI] set-sink-mute SINK 1|0\n"
+"%s [OPZIONI] set-source-mute SORGENTE 1|0\n"
+"%s [OPZIONI] set-sink-input-mute SINKINPUT 1|0\n"
 "\n"
 "  -h, --help                       Mostra questo aiuto\n"
 "      --version                    Mostra la versione\n"
@@ -2158,139 +2160,113 @@
 "Link eseguito con libpulse %s\n"
 
 #: ../src/utils/pactl.c:979
-#, fuzzy
 msgid "Please specify a sample file to load"
-msgstr "Specificare un file campione da caricare\n"
+msgstr "Specificare un file campione da caricare"
 
 #: ../src/utils/pactl.c:992
-#, fuzzy
 msgid "Failed to open sound file."
-msgstr "Apertura del file audio non riuscita.\n"
+msgstr "Apertura del file audio non riuscita."
 
 #: ../src/utils/pactl.c:1004
-#, fuzzy
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Attenzione: determinazione della specifica di campionamento dal file non "
-"riuscita.\n"
+"riuscita."
 
 #: ../src/utils/pactl.c:1014
-#, fuzzy
 msgid "You have to specify a sample name to play"
-msgstr "È necessario specificare un nome di campione da riprodurre\n"
+msgstr "È necessario specificare un nome di campione da riprodurre"
 
 #: ../src/utils/pactl.c:1026
-#, fuzzy
 msgid "You have to specify a sample name to remove"
-msgstr "È necessario specificare un nome di campione da rimuovere\n"
+msgstr "È necessario specificare un nome di campione da rimuovere"
 
 #: ../src/utils/pactl.c:1035
-#, fuzzy
 msgid "You have to specify a sink input index and a sink"
-msgstr "È necessario specificare un indice di ingresso per sink e un sink\n"
+msgstr "È necessario specificare un indice di ingresso per sink e un sink"
 
 #: ../src/utils/pactl.c:1045
-#, fuzzy
 msgid "You have to specify a source output index and a source"
 msgstr ""
-"È necessario specificare una indice di uscita per sorgente e una sorgente\n"
+"È necessario specificare una indice di uscita per sorgente e una sorgente"
 
 #: ../src/utils/pactl.c:1060
-#, fuzzy
 msgid "You have to specify a module name and arguments."
-msgstr "È necessario specificare un nome di modulo e gli argomenti.\n"
+msgstr "È necessario specificare un nome di modulo e gli argomenti."
 
 #: ../src/utils/pactl.c:1080
-#, fuzzy
 msgid "You have to specify a module index"
-msgstr "È necessario specificare un indice di modulo\n"
+msgstr "È necessario specificare un indice di modulo"
 
 #: ../src/utils/pactl.c:1090
-#, fuzzy
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Non è possibile specificare più di un sink. È necessario specificare un "
-"valore booleano.\n"
+"valore booleano."
 
 #: ../src/utils/pactl.c:1103
-#, fuzzy
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "Non è possibile specificare più di una sorgente. È necessario specificare un "
-"valore booleano.\n"
+"valore booleano."
 
 #: ../src/utils/pactl.c:1115
-#, fuzzy
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
-"È necessario specificare un nome/indice di scheda e un nome di profilo.\n"
+"È necessario specificare un nome/indice di scheda e un nome di profilo."
 
 #: ../src/utils/pactl.c:1126
-#, fuzzy
 msgid "You have to specify a sink name/index and a port name"
-msgstr "È necessario specificare un nome/indice di sink e un nome di porta\n"
+msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
 
 #: ../src/utils/pactl.c:1137
-#, fuzzy
 msgid "You have to specify a source name/index and a port name"
-msgstr ""
-"È necessario specificare un nome/indice di sorgente e un nome di porta\n"
+msgstr "È necessario specificare un nome/indice di sorgente e un nome di porta"
 
 #: ../src/utils/pactl.c:1149
-#, fuzzy
 msgid "You have to specify a sink name/index and a volume"
-msgstr "È necessario specificare un nome/indice di sink e un nome di porta\n"
+msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
 
 #: ../src/utils/pactl.c:1154 ../src/utils/pactl.c:1171
 #: ../src/utils/pactl.c:1193 ../src/utils/pactl.c:1209
 #: ../src/utils/pactl.c:1226 ../src/utils/pactl.c:1248
-#, fuzzy
 msgid "Invalid volume specification"
-msgstr "Specifica di campionamento non valida"
+msgstr "Specifica di volume non valida"
 
 #: ../src/utils/pactl.c:1166
-#, fuzzy
 msgid "You have to specify a source name/index and a volume"
-msgstr ""
-"È necessario specificare un nome/indice di sorgente e un nome di porta\n"
+msgstr "È necessario specificare un nome/indice di sorgente e un nome di porta"
 
 #: ../src/utils/pactl.c:1183
-#, fuzzy
 msgid "You have to specify a sink input index and a volume"
-msgstr "È necessario specificare un indice di ingresso per sink e un sink\n"
+msgstr "È necessario specificare un indice di ingresso per sink e un sink"
 
 #: ../src/utils/pactl.c:1188
 msgid "Invalid sink input index"
-msgstr ""
+msgstr "Indice dell'input del sink non valido"
 
 #: ../src/utils/pactl.c:1204
-#, fuzzy
 msgid "You have to specify a sink name/index and a mute boolean"
-msgstr "È necessario specificare un nome/indice di sink e un nome di porta\n"
+msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
 
 #: ../src/utils/pactl.c:1221
-#, fuzzy
 msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
-"È necessario specificare un nome/indice di sorgente e un nome di porta\n"
+msgstr "È necessario specificare un nome/indice di sorgente e un nome di porta"
 
 #: ../src/utils/pactl.c:1238
-#, fuzzy
 msgid "You have to specify a sink input index and a mute boolean"
-msgstr "È necessario specificare un indice di ingresso per sink e un sink\n"
+msgstr "È necessario specificare un indice di ingresso per sink e un sink"
 
 #: ../src/utils/pactl.c:1243
-#, fuzzy
 msgid "Invalid sink input index specification"
-msgstr "Specifica di campionamento non valida"
+msgstr "Specifica dell'indice di input del sink non valida"
 
 #: ../src/utils/pactl.c:1262
-#, fuzzy
 msgid "No valid command specified."
-msgstr "Nessun comando valido specificato.\n"
+msgstr "Nessun comando valido specificato."
 
 #: ../src/utils/pax11publish.c:61
 #, c-format
@@ -2475,133 +2451,122 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Dispositivi di uscita"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
-#, fuzzy
 msgid "Input Devices"
-msgstr "Input %s"
+msgstr "Dispositivi di ingresso"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Audio su @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
-#, fuzzy
 msgid "Input"
-msgstr "Input %s"
+msgstr "Ingresso"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Ingresso docking station"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Microfono docking station"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Line-In"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Microfono"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Microfono esterno"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Audio interno"
+msgstr "Microfono interno"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Controllo automatico del guadagno"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Nessun controllo automatico del guadagno"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Boost"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Nessun boost"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Amplificatore"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Nessun amplificatore"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
-#, fuzzy
 msgid "Analog Input"
-msgstr "Mono analogico"
+msgstr "Ingresso analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
-#, fuzzy
 msgid "Analog Microphone"
-msgstr "Mono analogico"
+msgstr "Microfono analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
-#, fuzzy
 msgid "Analog Line-In"
-msgstr "Mono analogico"
+msgstr "Line-in analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
-#, fuzzy
 msgid "Analog Radio"
-msgstr "Mono analogico"
+msgstr "Radio analogica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
-#, fuzzy
 msgid "Analog Video"
-msgstr "Stereo analogico"
+msgstr "Video analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Output %s"
+msgstr "Uscita analogica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
-#, fuzzy
 msgid "Analog Headphones"
-msgstr "Mono analogico"
+msgstr "Cuffie analogiche"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Uscita analogica (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
-#, fuzzy
 msgid "Analog Mono Output"
-msgstr "Mono analogico"
+msgstr "Uscita mono analogica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
@@ -2612,19 +2577,16 @@
 msgstr "Stereo analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Surround analogico 4.1"
+msgstr "Surround analogico 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Surround analogico 4.0"
+msgstr "Surround analogico 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Surround analogico 4.1"
+msgstr "Surround analogico 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
 msgid "Analog Surround 4.0"
@@ -2643,19 +2605,16 @@
 msgstr "Surround analogico 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Surround analogico 4.0"
+msgstr "Surround analogico 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Surround analogico 4.1"
+msgstr "Surround analogico 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Surround analogico 4.0"
+msgstr "Surround analogico 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
 msgid "Analog Surround 7.1"
@@ -2666,9 +2625,8 @@
 msgstr "Stereo digitale (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
-#, fuzzy
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr "Surround digitale 4.0 (IEC958/AC3)"
+msgstr "Surround digitale 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
@@ -2683,235 +2641,13 @@
 msgstr "Stereo digitale (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
-#, fuzzy
 msgid "Analog Mono Duplex"
-msgstr "Mono analogico"
+msgstr "Duplex mono analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
-#, fuzzy
 msgid "Analog Stereo Duplex"
-msgstr "Stereo analogico"
+msgstr "Duplex stereo analogico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
-#, fuzzy
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Stereo digitale (IEC958)"
-
-#~ msgid "Invalid client name '%s'\n"
-#~ msgstr "Nome del client \"%s\" non valido\n"
-
-#~ msgid "Failed to determine sample specification from file.\n"
-#~ msgstr ""
-#~ "Determinazione della specifica di campionamento dal file non riuscita.\n"
-
-#~ msgid "select(): %s"
-#~ msgstr "select(): %s"
-
-#~ msgid "Cannot connect to system bus: %s"
-#~ msgstr "Impossibile effettuare la connessione al bus di sistema: %s"
-
-#~ msgid "Cannot get caller from PID: %s"
-#~ msgstr "Impossibile ottenere il chiamante dal PID: %s"
-
-#~ msgid "Cannot set UID on caller object."
-#~ msgstr "Impossibile impostare l'UID sull'oggetto chiamante."
-
-#~ msgid "Failed to get CK session."
-#~ msgstr "Recupero della sessione CK non riuscito."
-
-#~ msgid "Cannot set UID on session object."
-#~ msgstr "Impossibile impostare l'UID sull'oggetto sessione."
-
-#~ msgid "Cannot allocate PolKitAction."
-#~ msgstr "Impossibile allocare PolKitAction."
-
-#~ msgid "Cannot set action_id"
-#~ msgstr "Impossibile impostare action_id"
-
-#~ msgid "Cannot allocate PolKitContext."
-#~ msgstr "Impossibile allocare PolKitContext."
-
-#~ msgid "Cannot initialize PolKitContext: %s"
-#~ msgstr "Impossibile inizializzare PolKitContext: %s"
-
-#~ msgid "Could not determine whether caller is authorized: %s"
-#~ msgstr "Impossibile determinare se il chiamante è autorizzato: %s"
-
-#~ msgid "Cannot obtain auth: %s"
-#~ msgstr "Impossibile ottenere l'autorizzazione: %s"
-
-#~ msgid "PolicyKit responded with '%s'"
-#~ msgstr "PolicyKit ha risposto con \"%s\""
-
-#~ msgid ""
-#~ "High-priority scheduling (negative Unix nice level) for the PulseAudio "
-#~ "daemon"
-#~ msgstr ""
-#~ "Scheduling high-priority (valori negativi di \"nice\") per il demone "
-#~ "PulseAudio"
-
-#~ msgid "Real-time scheduling for the PulseAudio daemon"
-#~ msgstr "Scheduling realt-time per il demone PulseAudio"
-
-#~ msgid ""
-#~ "System policy prevents PulseAudio from acquiring high-priority scheduling."
-#~ msgstr ""
-#~ "La politica di sistema previene PulseAudio dall'ottenere lo scheduling "
-#~ "high-priority."
-
-#~ msgid ""
-#~ "System policy prevents PulseAudio from acquiring real-time scheduling."
-#~ msgstr ""
-#~ "La politica di sistema previene PulseAudio dall'ottenere lo scheduling "
-#~ "real-time."
-
-#~ msgid "read() failed: %s\n"
-#~ msgstr "read() non riuscita: %s\n"
-
-#, fuzzy
-#~ msgid "pa_context_connect() failed: %s\n"
-#~ msgstr "pa_context_connect() non riuscita: %s"
-
-#~ msgid "We're in the group '%s', allowing high-priority scheduling."
-#~ msgstr ""
-#~ "Attualmente nel gruppo \"%s\", che consente scheduling high-priority."
-
-#~ msgid "We're in the group '%s', allowing real-time scheduling."
-#~ msgstr "Attualmente nel gruppo \"%s\", che consente scheduling real-time."
-
-#~ msgid "PolicyKit grants us acquire-high-priority privilege."
-#~ msgstr "Privilegi acquire-high-priority assegnati da PolicyKit."
-
-#~ msgid "PolicyKit refuses acquire-high-priority privilege."
-#~ msgstr "Privilegi acquire-high-priority rifiutati da PolicyKit."
-
-#~ msgid "PolicyKit grants us acquire-real-time privilege."
-#~ msgstr "Privilegi acquire-real-time assegnati da PolicyKit."
-
-#~ msgid "PolicyKit refuses acquire-real-time privilege."
-#~ msgstr "Privilegi acquire-real-time rifiutati da PolicyKit."
-
-#~ msgid ""
-#~ "Called SUID root and real-time and/or high-priority scheduling was "
-#~ "requested in the configuration. However, we lack the necessary "
-#~ "privileges:\n"
-#~ "We are not in group '%s', PolicyKit refuse to grant us the requested "
-#~ "privileges and we have no increase RLIMIT_NICE/RLIMIT_RTPRIO resource "
-#~ "limits.\n"
-#~ "For enabling real-time/high-priority scheduling please acquire the "
-#~ "appropriate PolicyKit privileges, or become a member of '%s', or increase "
-#~ "the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user."
-#~ msgstr ""
-#~ "Lo SUID root e lo scheduling real-time o high-priority erano richiesti "
-#~ "nella configurazione, ma mancano i privilegi necessari:\n"
-#~ "non si è nel gruppo «%s», PolicyKit non consente di acquisire i privilegi "
-#~ "richiesti e non è possibile incrementare i limiti RLIMIT_NICE/"
-#~ "RLIMIT_RTPRIO della risorsa.\n"
-#~ "Per abilitare lo scheduling real-time/high-priority, acquisire i "
-#~ "privilegi PolicyKit appropriati, diventare un membro di «%s» oppure "
-#~ "incrementare i limiti RLIMIT_NICE/RLIMIT_RTPRIO della risorsa per questo "
-#~ "utente."
-
-#~ msgid ""
-#~ "High-priority scheduling enabled in configuration but not allowed by "
-#~ "policy."
-#~ msgstr ""
-#~ "Scheduling high-priority abilitato nella configurazione, ma non ammesso "
-#~ "dalla politica."
-
-#~ msgid "Successfully increased RLIMIT_RTPRIO"
-#~ msgstr "Incremento di RLIMIT_RTPRIO riuscito"
-
-#~ msgid "RLIMIT_RTPRIO failed: %s"
-#~ msgstr "RLIMIT_RTPRIO non riuscito: %s"
-
-# abbandono??
-#~ msgid "Giving up CAP_NICE"
-#~ msgstr "Abbandono del CAP_NICE"
-
-#~ msgid ""
-#~ "Real-time scheduling enabled in configuration but not allowed by policy."
-#~ msgstr ""
-#~ "Scheduling real-time abilitato nella configurazione, ma non ammesso dalla "
-#~ "politica."
-
-#~ msgid "Limited capabilities successfully to CAP_SYS_NICE."
-#~ msgstr "Limitazione delle capacità a CAP_SYS_NICE riuscita."
-
-#~ msgid "time_new() failed.\n"
-#~ msgstr "time_new() non riuscita.\n"
-
-#~ msgid "Output %s + Input %s"
-#~ msgstr "Output %s + Input %s"
-
-#~ msgid "Stream successfully created\n"
-#~ msgstr "Creazione dello stream riuscita\n"
-
-# fixme!!! errror
-#~ msgid "Stream errror: %s\n"
-#~ msgstr "Errore nello stream: %s\n"
-
-#~ msgid "Connection established.\n"
-#~ msgstr "Connessione stabilita.\n"
-
-#~ msgid ""
-#~ "%s [options] [FILE]\n"
-#~ "\n"
-#~ "  -h, --help                            Show this help\n"
-#~ "      --version                         Show version\n"
-#~ "\n"
-#~ "  -v, --verbose                         Enable verbose operation\n"
-#~ "\n"
-#~ "  -s, --server=SERVER                   The name of the server to connect "
-#~ "to\n"
-#~ "  -d, --device=DEVICE                   The name of the sink to connect "
-#~ "to\n"
-#~ "  -n, --client-name=NAME                How to call this client on the "
-#~ "server\n"
-#~ "      --stream-name=NAME                How to call this stream on the "
-#~ "server\n"
-#~ "      --volume=VOLUME                   Specify the initial (linear) "
-#~ "volume in range 0...65536\n"
-#~ "      --channel-map=CHANNELMAP          Set the channel map to the use\n"
-#~ msgstr ""
-#~ "%s [OPZIONI] [FILE]\n"
-#~ "\n"
-#~ "  -h, --help                            Mostra questo aiuto\n"
-#~ "      --version                         Mostra la versione\n"
-#~ "\n"
-#~ "  -v, --verbose                         Abilita la modalità prolissa\n"
-#~ "\n"
-#~ "  -s, --server=SERVER                   Il nome del server a cui "
-#~ "connettersi\n"
-#~ "  -d, --device=DEVICE                   Il nome del sink a cui "
-#~ "connettersi\n"
-#~ "  -n, --client-name=NOME                Come chiamare questo client sul "
-#~ "server\n"
-#~ "      --stream-name=NOME                Come chiamare questo stream sul "
-#~ "server\n"
-#~ "      --volume=VOLUME                   Specifica il volume iniziale "
-#~ "(lineare) \n"
-#~ "                                         nell'intervallo 0...65536\n"
-#~ "      --channel-map=MAPPA_CANALI        Imposta la mappa di canali da "
-#~ "usare\n"
-
-#~ msgid ""
-#~ "paplay %s\n"
-#~ "Compiled with libpulse %s\n"
-#~ "Linked with libpulse %s\n"
-#~ msgstr ""
-#~ "paplay %s\n"
-#~ "Compilato con libpulse %s\n"
-#~ "Link eseguito con libpulse %s\n"
-
-#~ msgid "Invalid channel map\n"
-#~ msgstr "Mappa dei canali non valida\n"
-
-#~ msgid "Failed to open file '%s'\n"
-#~ msgstr "Apertura del file \"%s\" non riuscita\n"
-
-#~ msgid "Channel map doesn't match file.\n"
-#~ msgstr "La mappa dei canali non corrisponde al file.\n"
-
-#~ msgid "Using sample spec '%s'\n"
-#~ msgstr "In uso la specifica di campionamento \"%s\"\n"
+msgstr "Duplex stereo digitale (IEC958)"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/LINGUAS pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/LINGUAS
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/LINGUAS	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/LINGUAS	2010-01-15 23:21:18.000000000 +0000
@@ -10,6 +10,7 @@
 fr
 gu
 hi
+hu
 it
 ja
 kn
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/nl.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/nl.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/nl.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/nl.po	2010-01-15 23:21:18.000000000 +0000
@@ -2,16 +2,17 @@
 # Copyright (C) 2009 THE pulseaudio.master-tx'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the pulseaudio.master-tx package.
 # Geert Warrink <geert.warrink@onsnet.nu>, 2009.
+# Reinout van Schouwen <reinout@gmail.com>, 2009
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-11 19:58+0200\n"
-"Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n"
-"Language-Team: nl <nl@li.org>\n"
+"POT-Creation-Date: 2009-10-14 04:44+0000\n"
+"PO-Revision-Date: 2009-10-14 11:00+0100\n"
+"Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding:  \n"
@@ -31,8 +32,8 @@
 msgstr ""
 "snd_pcm_avail() gaf een waarde terug die uitzonderlijk groot is: %lu bytes (%"
 "lu ms).\n"
-"Waarschijnlijk is dit een bug in de ALSA driver '%s'. Rapporteer dit "
-"probleem a.u.b. aan de ALSA ontwikkelaars."
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
 
 #: ../src/modules/alsa/alsa-util.c:1147
 #, c-format
@@ -44,8 +45,8 @@
 msgstr ""
 "snd_pcm_delay() gaf een waarde terug die uitzonderlijk groot is: %li bytes (%"
 "s%lu ms).\n"
-"Waarschijnlijk is  dit een bug in de ALSA driver '%s'. Rapporteer dit "
-"probleem a.u.b. aan de ALSA ontwikkelaars."
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
 
 #: ../src/modules/alsa/alsa-util.c:1194
 #, c-format
@@ -57,21 +58,21 @@
 msgstr ""
 "snd_pcm_mmap_begin() gaf een waarde terug die uitzonderlijk groot is: %lu "
 "bytes (%lu ms).\n"
-"Waarschijnlijk is dit een bug in de ALSA driver '%s'. Rapporteer dit "
-"probleem a.u.b aan de ALSA ontwikkelaars."
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
 
 #: ../src/modules/module-always-sink.c:39
 msgid "Always keeps at least one sink loaded even if it's a null one"
 msgstr ""
-"Houdt altijd ten minste een afvoer ingeladen zelfs als het de null afvoer is."
+"Houdt altijd ten minste een afvoer ingeladen zelfs als het de null-afvoer is."
 
 #: ../src/modules/module-always-sink.c:83
 msgid "Dummy Output"
-msgstr "Dummy output"
+msgstr "Dummy-uitvoer"
 
 #: ../src/modules/module-ladspa-sink.c:49
 msgid "Virtual LADSPA sink"
-msgstr "Virtuele LADSPA afoer"
+msgstr "Virtuele LADSPA afvoer"
 
 #: ../src/modules/module-ladspa-sink.c:53
 msgid ""
@@ -81,19 +82,19 @@
 "plugin name> label=<ladspa plugin label> control=<comma seperated list of "
 "input control values>"
 msgstr ""
-"sink_name=<naam voor de afoer> sink_properties=<eigenschappen van de afoer> "
-"master=<naam van de te filteren afoer> format=<sample formaat> rate=<sample "
-"snelheid> channels=<aantal kanalen> channel_map=<kanaal map> plugin=<ladspa "
-"plugin naam> label=<ladspa plugin label> control=<met kommas gescheiden "
-"lijst van input controle waarden>"
+"sink_name=<naam voor de afvoer> sink_properties=<eigenschappen van de afvoer> "
+"master=<naam van de te filteren afvoer> format=<sampleformaat> rate=<sample "
+"snelheid> channels=<aantal kanalen> channel_map=<kanaalkaart> plugin=<ladspa "
+"pluginnaam> label=<ladspa pluginlabel> control=<kommagescheiden "
+"lijst van invoercontrolewaarden>"
 
 #: ../src/modules/module-null-sink.c:55
 msgid "Clocked NULL sink"
-msgstr "Geklokte MULL afvoer"
+msgstr "Geklokte NULL afvoer"
 
 #: ../src/modules/module-null-sink.c:291
 msgid "Null Output"
-msgstr "Null output"
+msgstr "Null-uitvoer"
 
 #: ../src/pulsecore/sink.c:2613
 msgid "Internal Audio"
@@ -118,7 +119,7 @@
 #: ../src/daemon/main.c:141
 #, c-format
 msgid "Got signal %s."
-msgstr "Ontving signaal %s."
+msgstr "Signaal %s ontvangen."
 
 #: ../src/daemon/main.c:168
 msgid "Exiting."
@@ -132,50 +133,50 @@
 #: ../src/daemon/main.c:191
 #, c-format
 msgid "Failed to find group '%s'."
-msgstr "Kon groep '%s' niet vinden."
+msgstr "Kon groep ‘%s’ niet vinden."
 
 #: ../src/daemon/main.c:195
 #, c-format
 msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-msgstr "Gebruiker '%s' (UID %lu) en groep '%s' (GID %lu) gevonden."
+msgstr "Gebruiker ‘%s’ (UID %lu) en groep ‘%s’ (GID %lu) gevonden."
 
 #: ../src/daemon/main.c:200
 #, c-format
 msgid "GID of user '%s' and of group '%s' don't match."
-msgstr "GID van gebruiker '%s' en van groep '%s' passen niet bij elkaar."
+msgstr "GID van gebruiker ‘%s’ en van groep ‘%s’ passen niet bij elkaar."
 
 #: ../src/daemon/main.c:205
 #, c-format
 msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr "Persoonlijke map van gebruiker '%s' is niet '%s', negeer het."
+msgstr "Persoonlijke map van gebruiker ‘%s’ is niet ‘%s’, negeer het."
 
 #: ../src/daemon/main.c:208 ../src/daemon/main.c:213
 #, c-format
 msgid "Failed to create '%s': %s"
-msgstr "Aanmaken van '%s': %s mislukte"
+msgstr "Aanmaken van ‘%s’ mislukt: %s"
 
 #: ../src/daemon/main.c:220
 #, c-format
 msgid "Failed to change group list: %s"
-msgstr "Veranderen van groeps lijst: '%s' mislukte"
+msgstr "Veranderen van groepslijst mislukt: %s"
 
 #: ../src/daemon/main.c:236
 #, c-format
 msgid "Failed to change GID: %s"
-msgstr "Veranderen van GID: %s mislukte"
+msgstr "Veranderen van GID mislukt: %s"
 
 #: ../src/daemon/main.c:252
 #, c-format
 msgid "Failed to change UID: %s"
-msgstr "Veranderen van UID: %s mislukte"
+msgstr "Veranderen van UID mislukt: %s"
 
 #: ../src/daemon/main.c:271
 msgid "Successfully dropped root privileges."
-msgstr "Root rechten met succes laten vervallen."
+msgstr "Beheerdersrechten met succes laten vervallen."
 
 #: ../src/daemon/main.c:279
 msgid "System wide mode unsupported on this platform."
-msgstr "Systeem brede mode wordt op dit platform niet ondersteund."
+msgstr "Systeembrede modus wordt op dit platform niet ondersteund."
 
 #: ../src/daemon/main.c:297
 #, c-format
@@ -184,21 +185,21 @@
 
 #: ../src/daemon/main.c:474
 msgid "Failed to parse command line."
-msgstr "Analyseren van de commandoregel mislukte."
+msgstr "Analyseren van de opdrachtregel mislukte."
 
 #: ../src/daemon/main.c:541
 msgid "Daemon not running"
-msgstr "Daemon draait niet"
+msgstr "Voorziening draait niet"
 
 #: ../src/daemon/main.c:543
 #, c-format
 msgid "Daemon running as PID %u"
-msgstr "Daemon draait met PID %u"
+msgstr "Voorziening draait met PID %u"
 
 #: ../src/daemon/main.c:553
 #, c-format
 msgid "Failed to kill daemon: %s"
-msgstr "Afschieten mislukt van daemon: '%s'"
+msgstr "Elimineren van voorziening mislukt: ‘%s’"
 
 #: ../src/daemon/main.c:571
 msgid ""
@@ -210,28 +211,28 @@
 
 #: ../src/daemon/main.c:573
 msgid "Root privileges required."
-msgstr "Root rechten vereisd"
+msgstr "Beheerdersrechten vereist."
 
 #: ../src/daemon/main.c:578
 msgid "--start not supported for system instances."
-msgstr "--start wordt niet ondersteund voor systeem instances"
+msgstr "--start wordt niet ondersteund voor systeeminstanties"
 
 #: ../src/daemon/main.c:583
 msgid "Running in system mode, but --disallow-exit not set!"
-msgstr "Draaiend in systeem mode, maar --disallow-exit is niet gezet!"
+msgstr "Draaiend in systeemmodus, maar --disallow-exit is niet ingesteld!"
 
 #: ../src/daemon/main.c:586
 msgid "Running in system mode, but --disallow-module-loading not set!"
 msgstr ""
-"Draaiend in systeem mode, maar --disallow-module-loading is niet gezet!"
+"Draaiend in systeemmodus, maar --disallow-module-loading is niet gezet!"
 
 #: ../src/daemon/main.c:589
 msgid "Running in system mode, forcibly disabling SHM mode!"
-msgstr "Draaiend in systeem mode, geforceerd uitzetten van SHM mode!"
+msgstr "Draaiend in systeemmodus, geforceerd uitzetten van SHM-modus!"
 
 #: ../src/daemon/main.c:594
 msgid "Running in system mode, forcibly disabling exit idle time!"
-msgstr "Draaiend in systeem mode, geforceerd uitzetten van exit idle time!"
+msgstr "Draaiend in systeemmodus, geforceerd uitzetten van exit idle time!"
 
 #: ../src/daemon/main.c:621
 msgid "Failed to acquire stdio."
@@ -254,11 +255,11 @@
 
 #: ../src/daemon/main.c:652
 msgid "Daemon startup failed."
-msgstr "Daemon opstarten mislukte."
+msgstr "Voorziening opstarten mislukt."
 
 #: ../src/daemon/main.c:654
 msgid "Daemon startup successful."
-msgstr "Daemon met succes opgestart."
+msgstr "Voorziening met succes opgestart."
 
 #: ../src/daemon/main.c:731
 #, c-format
@@ -268,12 +269,12 @@
 #: ../src/daemon/main.c:732
 #, c-format
 msgid "Compilation host: %s"
-msgstr "Compilatie host: %s"
+msgstr "Compilatiehost: %s"
 
 #: ../src/daemon/main.c:733
 #, c-format
 msgid "Compilation CFLAGS: %s"
-msgstr "Compilatie CFLAGS: %s"
+msgstr "Compilatie-CFLAGS: %s"
 
 #: ../src/daemon/main.c:736
 #, c-format
@@ -301,61 +302,61 @@
 #: ../src/daemon/main.c:749
 #, c-format
 msgid "Running in valgrind mode: %s"
-msgstr "Draaiend in valgrind mode: %s"
+msgstr "Draaiend in valgrind-modus: %s"
 
 #: ../src/daemon/main.c:752
 msgid "Optimized build: yes"
-msgstr "Optimaal gebouwd: ja"
+msgstr "Geoptimaliseerd gebouwd: ja"
 
 #: ../src/daemon/main.c:754
 msgid "Optimized build: no"
-msgstr "Optimaak gebouwd: nee"
+msgstr "Geoptimaliseerd gebouwd: nee"
 
 #: ../src/daemon/main.c:758
 msgid "NDEBUG defined, all asserts disabled."
-msgstr "NDEBUG gedefinieerd, alle verklaringen uitgezet."
+msgstr "NDEBUG gedefinieerd, alle asserts uitgezet."
 
 #: ../src/daemon/main.c:760
 msgid "FASTPATH defined, only fast path asserts disabled."
-msgstr "FASTPATH gedefinieerd, alleen snel pad verklaringen uitgezet."
+msgstr "FASTPATH gedefinieerd, alleen fast path-asserts uitgezet."
 
 #: ../src/daemon/main.c:762
 msgid "All asserts enabled."
-msgstr "Alle verklaringen aangezet."
+msgstr "Alle asserts aangezet."
 
 #: ../src/daemon/main.c:766
 msgid "Failed to get machine ID"
-msgstr "Machine ID verkrijgen mislukte"
+msgstr "Machine-ID verkrijgen mislukt"
 
 #: ../src/daemon/main.c:769
 #, c-format
 msgid "Machine ID is %s."
-msgstr "Machine ID is: %s."
+msgstr "Machine-ID is: %s."
 
 #: ../src/daemon/main.c:773
 #, c-format
 msgid "Session ID is %s."
-msgstr "Sessie ID is: %s."
+msgstr "Sessie-ID is: %s."
 
 #: ../src/daemon/main.c:779
 #, c-format
 msgid "Using runtime directory %s."
-msgstr "Gebruik van runtime map %s."
+msgstr "Gebruik van runtime-map %s."
 
 #: ../src/daemon/main.c:784
 #, c-format
 msgid "Using state directory %s."
-msgstr "Verbruik van state map %s."
+msgstr "Verbruik van state-map %s."
 
 #: ../src/daemon/main.c:787
 #, c-format
 msgid "Using modules directory %s."
-msgstr "Gebruik van module map %s."
+msgstr "Gebruik van module-map %s."
 
 #: ../src/daemon/main.c:789
 #, c-format
 msgid "Running in system mode: %s"
-msgstr "Draaiend in systeem mode: %s"
+msgstr "Draaiend in systeemmodus: %s"
 
 #: ../src/daemon/main.c:792
 msgid ""
@@ -366,12 +367,12 @@
 "Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
 "explanation why system mode is usually a bad idea."
 msgstr ""
-"OK, dus je draait PA in systeem mode. Merk a.u.b. op dat je dit "
-"waarschijnlijk niet moet doen.\n"
-"Als je het toch doet dan is het je eigen schuld als dingen niet werken zoals "
+"OK, dus u draait PA in systeemmodus. Merk op dat u dit "
+"waarschijnlijk beter niet kunt doen.\n"
+"Als u het toch doet dan is het uw eigen schuld als dingen niet werken zoals "
 "verwacht.\n"
-"Lees a.u.b.http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode voor een "
-"uitleg waarom systeem mode gewoonlijk een slecht idee is."
+"Lees http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode voor een "
+"uitleg waarom systeemmodus gewoonlijk een slecht idee is."
 
 #: ../src/daemon/main.c:809
 msgid "pa_pid_file_create() failed."
@@ -395,23 +396,23 @@
 
 #: ../src/daemon/main.c:904
 msgid "Failed to initialize daemon."
-msgstr "Initialiseren van de daemon mislukte."
+msgstr "Initialiseren van de voorziening mislukt."
 
 #: ../src/daemon/main.c:909
 msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr "Daemon opgestart zonder geladen modules, dat werkt niet."
+msgstr "Voorziening opgestart zonder geladen modules, dat werkt niet."
 
 #: ../src/daemon/main.c:926
 msgid "Daemon startup complete."
-msgstr "Daemon opstarten is klaar."
+msgstr "Voorziening opstarten is klaar."
 
 #: ../src/daemon/main.c:932
 msgid "Daemon shutdown initiated."
-msgstr "Daemon afsluiten is begonnen."
+msgstr "Voorziening afsluiten is begonnen."
 
 #: ../src/daemon/main.c:954
 msgid "Daemon terminated."
-msgstr "Daemon is afgesloten."
+msgstr "Voorziening is afgesloten."
 
 #: ../src/daemon/cmdline.c:115
 #, c-format
@@ -559,7 +560,7 @@
 "met\n"
 "                                        de opgegeven argumenten\n"
 "  -F, --file=FILENAME                   Draai het opgegeven script\n"
-"  -C                                    Open een commandoregel op de "
+"  -C                                    Open een opdrachtregel op de "
 "draaiende TTY\n"
 "                                        na het opstarten\n"
 "\n"
@@ -669,7 +670,7 @@
 #: ../src/daemon/dumpmodules.c:75
 #, c-format
 msgid "DEPRECATION WARNING: %s\n"
-msgstr "OUDERE VERSIE WAARSCHUWING: %s\n"
+msgstr "ACHTERHAALDHEIDSWAARSCHUWING: %s\n"
 
 #: ../src/daemon/dumpmodules.c:79
 #, c-format
@@ -679,22 +680,22 @@
 #: ../src/daemon/daemon-conf.c:232
 #, c-format
 msgid "[%s:%u] Invalid log target '%s'."
-msgstr "[%s:%u] Ongeldig log doel '%s'."
+msgstr "[%s:%u] Ongeldig logdoel '%s'."
 
 #: ../src/daemon/daemon-conf.c:248
 #, c-format
 msgid "[%s:%u] Invalid log level '%s'."
-msgstr "[%s:%u] Ongeldig log niveau '%s'."
+msgstr "[%s:%u] Ongeldig logniveau '%s'."
 
 #: ../src/daemon/daemon-conf.c:264
 #, c-format
 msgid "[%s:%u] Invalid resample method '%s'."
-msgstr "[%s:%u] Ongeldige her-bemonster methode '%s'."
+msgstr "[%s:%u] Ongeldige resample-methode ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:287
 #, c-format
 msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr "[%s:%u] Ongeldige rlimit '%s'."
+msgstr "[%s:%u] Ongeldige rlimit ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:294
 #, c-format
@@ -704,22 +705,22 @@
 #: ../src/daemon/daemon-conf.c:310
 #, c-format
 msgid "[%s:%u] Invalid sample format '%s'."
-msgstr "[%s:%u] Ongeldig bemonster formaat '%s'."
+msgstr "[%s:%u] Ongeldig sampleformaat ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:328
 #, c-format
 msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr "[%s:%u] Ongeldige bemonster snelheid '%s'."
+msgstr "[%s:%u] Ongeldige samlperate ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:352
 #, c-format
 msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr "[%s:%u] Ongeldige bemonster kanalen '%s'."
+msgstr "[%s:%u] Ongeldige sample-kanalen ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:370
 #, c-format
 msgid "[%s:%u] Invalid channel map '%s'."
-msgstr "[%s:%u] Ongeldige kanalen map '%s'."
+msgstr "[%s:%u] Ongeldige kanalenkaart ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:388
 #, c-format
@@ -729,30 +730,30 @@
 #: ../src/daemon/daemon-conf.c:406
 #, c-format
 msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr "[%s:%u] Ongeldige fragment grootte '%s'."
+msgstr "[%s:%u] Ongeldige fragmentgrootte ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:424
 #, c-format
 msgid "[%s:%u] Invalid nice level '%s'."
-msgstr "[%s:%u] Ongeldig nice niveau '%s'."
+msgstr "[%s:%u] Ongeldig nice niveau ‘%s’."
 
 #: ../src/daemon/daemon-conf.c:546
 #, c-format
 msgid "Failed to open configuration file: %s"
-msgstr "Openen van configuratie bestand %s mislukte."
+msgstr "Openen van configuratiebestand %s mislukt."
 
 #: ../src/daemon/daemon-conf.c:562
 msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
 msgstr ""
-"De opgegeven standaard kanalen map heeft een ander aantal kanalen dan de "
+"De opgegeven standaard kanalenkaart heeft een ander aantal kanalen dan de "
 "opgegeven standaard aantal kanalen."
 
 #: ../src/daemon/daemon-conf.c:638
 #, c-format
 msgid "### Read from configuration file: %s ###\n"
-msgstr "### Lees in het configuratie bestand: %s ###\n"
+msgstr "### Lees uit het configuratiebestand: %s ###\n"
 
 #: ../src/daemon/caps.c:62
 msgid "Cleaning up privileges."
@@ -792,11 +793,11 @@
 
 #: ../src/pulse/channelmap.c:113
 msgid "Rear Right"
-msgstr "Achter rechta"
+msgstr "Achter rechts"
 
 #: ../src/pulse/channelmap.c:115
 msgid "Low Frequency Emmiter"
-msgstr "Lage frequentie zender"
+msgstr "Lage-frequentiezender"
 
 #: ../src/pulse/channelmap.c:117
 msgid "Front Left-of-center"
@@ -1022,15 +1023,15 @@
 
 #: ../src/pulse/error.c:48
 msgid "No such entity"
-msgstr "Eenheid onbekent"
+msgstr "Eenheid onbekend"
 
 #: ../src/pulse/error.c:49
 msgid "Connection refused"
-msgstr "Verbinding geweigert"
+msgstr "Verbinding geweigerd"
 
 #: ../src/pulse/error.c:50
 msgid "Protocol error"
-msgstr "Protocol fout"
+msgstr "Protocolfout"
 
 #: ../src/pulse/error.c:51
 msgid "Timeout"
@@ -1038,7 +1039,7 @@
 
 #: ../src/pulse/error.c:52
 msgid "No authorization key"
-msgstr "Geen authorisatie sleutel"
+msgstr "Geen autorisatiesleutel"
 
 #: ../src/pulse/error.c:53
 msgid "Internal error"
@@ -1050,7 +1051,7 @@
 
 #: ../src/pulse/error.c:55
 msgid "Entity killed"
-msgstr "Eenheid afgeschoten"
+msgstr "Eenheid geëlimineerd"
 
 #: ../src/pulse/error.c:56
 msgid "Invalid server"
@@ -1058,7 +1059,7 @@
 
 #: ../src/pulse/error.c:57
 msgid "Module initalization failed"
-msgstr "Module initialisatie mislukte"
+msgstr "Module-initialisatie mislukt"
 
 #: ../src/pulse/error.c:58
 msgid "Bad state"
@@ -1139,12 +1140,12 @@
 
 #: ../src/pulse/client-conf-x11.c:93
 msgid "Failed to parse cookie data"
-msgstr "Analyseren van cookie data mislukte"
+msgstr "Analyseren van cookie-data mislukt"
 
 #: ../src/pulse/client-conf.c:111
 #, c-format
 msgid "Failed to open configuration file '%s': %s"
-msgstr "Open van configuratie bestand '%s' mislukte: %s"
+msgstr "Open van configuratiebestand ‘%s’ mislukte: %s"
 
 #: ../src/pulse/context.c:550
 msgid "No cookie loaded. Attempting to connect without."
@@ -1163,7 +1164,7 @@
 #: ../src/pulse/context.c:1438
 #, c-format
 msgid "Received message for unknown extension '%s'"
-msgstr "Ontving boodschap voor onbekende extensie '%s'"
+msgstr "Ontving boodschap voor onbekende extensie ‘%s’"
 
 #: ../src/utils/pacat.c:108
 #, c-format
@@ -1210,17 +1211,17 @@
 #: ../src/utils/pacat.c:314
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-msgstr "Buffer metriek: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgstr "Buffermetriek: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 
 #: ../src/utils/pacat.c:317
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr "Buffer metriek: maxlength=%u, fragsize=%u"
+msgstr "Buffermetriek: maxlength=%u, fragsize=%u"
 
 #: ../src/utils/pacat.c:321
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
-msgstr "Gebruik bemonster spec  '%s', kanaal map '%s'."
+msgstr "Gebruik sample-spec  '%s', kanaal map '%s'."
 
 #: ../src/utils/pacat.c:325
 #, c-format
@@ -1230,27 +1231,27 @@
 #: ../src/utils/pacat.c:335
 #, c-format
 msgid "Stream error: %s"
-msgstr "Stroom fout: %s"
+msgstr "Stroomfout: %s"
 
 #: ../src/utils/pacat.c:345
 #, c-format
 msgid "Stream device suspended.%s"
-msgstr "Stroom apparaat opgeschort.%s"
+msgstr "Stroomapparaat opgeschort.%s"
 
 #: ../src/utils/pacat.c:347
 #, c-format
 msgid "Stream device resumed.%s"
-msgstr "Stroom apparaat hervat.%s"
+msgstr "Stroomapparaat hervat.%s"
 
 #: ../src/utils/pacat.c:355
 #, c-format
 msgid "Stream underrun.%s"
-msgstr "Stroom te weinig data.%s"
+msgstr "Te weinig data voor stroom.%s"
 
 #: ../src/utils/pacat.c:362
 #, c-format
 msgid "Stream overrun.%s"
-msgstr "Stroom data overschrijding.%s"
+msgstr "Data-overschrijding voor stroom.%s"
 
 #: ../src/utils/pacat.c:369
 #, c-format
@@ -1264,7 +1265,7 @@
 
 #: ../src/utils/pacat.c:376
 msgid "not "
-msgstr "niet"
+msgstr "niet "
 
 #: ../src/utils/pacat.c:383
 #, c-format
@@ -1395,7 +1396,7 @@
 "\n"
 "  -s, --server=SERVER                   De naam van de server waarmee "
 "verbonden moet worden\n"
-"  -d, --device=DEVICE                   De naam van de afoer/bron waarmee "
+"  -d, --device=DEVICE                   De naam van de afvoer/bron waarmee "
 "verbonden moet worden\n"
 "  -n, --client-name=NAME                Hoe wordt deze cliënt op de server "
 "genoemd\n"
@@ -1403,9 +1404,9 @@
 "genoemd\n"
 "      --volume=VOLUME                   Geef het begins (lineare) volume in "
 "reeks 0...65536\n"
-"      --rate=SAMPLERATE                 De bemonstersnelheid in Hz "
+"      --rate=SAMPLERATE                 De samplerate in Hz "
 "(standaard 44100)\n"
-"      --format=SAMPLEFORMAT             Het bemonster type, een van s16le, "
+"      --format=SAMPLEFORMAT             Het sampletype, een van s16le, "
 "s16be, u8, float32le,\n"
 "                                        float32be, ulaw, alaw, s32le, s32be, "
 "s24le, s24be,\n"
@@ -1414,12 +1415,12 @@
 "      --channels=CHANNELS               Het aantal kanalen, 1 voor mono, 2 "
 "voor stereo\n"
 "                                        (standaard 2)\n"
-"      --channel-map=CHANNELMAP          Kanaal map te gebruiken in plaats "
+"      --channel-map=CHANNELMAP          Kanaalkaart te gebruiken in plaats "
 "van de standaard\n"
-"      --fix-format                      Neem het bemonsteringsformaat over "
-"van de afoer waar de stroom\n"
+"      --fix-format                      Neem het sampleformaat over "
+"van de afvoer waar de stroom\n"
 "                                        mee verbonden is.\n"
-"      --fix-rate                        Neem de bemonsteringssnelheid over "
+"      --fix-rate                        Neem de samplerate over "
 "van de afvoer waar de stroom\n"
 "                                        mee verbonden is.\n"
 "      --fix-channels                    Neem het aantal kanalen en de kanaal "
@@ -1456,32 +1457,32 @@
 #: ../src/utils/pacat.c:764 ../src/utils/pactl.c:953
 #, c-format
 msgid "Invalid client name '%s'"
-msgstr "Ongeldige cliënt naam '%s'."
+msgstr "Ongeldige clientnaam ‘%s’."
 
 #: ../src/utils/pacat.c:779
 #, c-format
 msgid "Invalid stream name '%s'"
-msgstr "Ongeldige stroom naam '%s'."
+msgstr "Ongeldige stroomnaam ‘%s’."
 
 #: ../src/utils/pacat.c:816
 #, c-format
 msgid "Invalid channel map '%s'"
-msgstr "Ongeldige kanaal map '%s'."
+msgstr "Ongeldige kanaalkaart ‘%s’."
 
 #: ../src/utils/pacat.c:845
 #, c-format
 msgid "Invalid latency specification '%s'"
-msgstr "Ongeldige latentie specificatie '%s'."
+msgstr "Ongeldige latentie-specificatie ‘%s’."
 
 #: ../src/utils/pacat.c:852
 #, c-format
 msgid "Invalid process time specification '%s'"
-msgstr "Ongeldige proces tijd specificatie '%s'."
+msgstr "Ongeldige procestijdspecificatie ‘%s’."
 
 #: ../src/utils/pacat.c:864
 #, c-format
 msgid "Invalid property '%s'"
-msgstr "Ongeldige eigenschap '%s'."
+msgstr "Ongeldige eigenschap ‘%s’."
 
 #: ../src/utils/pacat.c:881
 #, c-format
@@ -1490,7 +1491,7 @@
 
 #: ../src/utils/pacat.c:900
 msgid "Invalid sample specification"
-msgstr "Ongeldige bemonster specificatie"
+msgstr "Ongeldige samplespecificatie"
 
 #: ../src/utils/pacat.c:910
 #, c-format
@@ -1508,7 +1509,7 @@
 
 #: ../src/utils/pacat.c:933
 msgid "Failed to generate sample specification for file."
-msgstr "Bemonster specificatie voor bestand aanmaken mislukte."
+msgstr "Aanmaken van samplespecificatie voor bestand mislukt."
 
 #: ../src/utils/pacat.c:953
 msgid "Failed to open audio file."
@@ -1524,11 +1525,11 @@
 
 #: ../src/utils/pacat.c:962 ../src/utils/pactl.c:997
 msgid "Failed to determine sample specification from file."
-msgstr "Bepalen van bemonster specificatie van het bestand mislukte."
+msgstr "Bepalen van samplespecificatie van het bestand mislukte."
 
 #: ../src/utils/pacat.c:971
 msgid "Warning: Failed to determine channel map from file."
-msgstr "Waarschuwing: Bepalen van kanaal map van bestand mislukte."
+msgstr "Waarschuwing: Bepalen van kanaalkaart van bestand mislukte."
 
 #: ../src/utils/pacat.c:982
 msgid "Channel map doesn't match sample specification"
@@ -1536,14 +1537,14 @@
 
 #: ../src/utils/pacat.c:993
 msgid "Warning: failed to write channel map to file."
-msgstr "Waarschuwing: schrijven van kanaal map naar bestand mislukte."
+msgstr "Waarschuwing: schrijven van kanaalkaart naar bestand mislukte."
 
 #: ../src/utils/pacat.c:1008
 #, c-format
 msgid ""
 "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
-"Openen van een %s stroom met bemonster specificatie '%s' en kanaal map '%s'."
+"Openen van een %s stroom met samplespecificatie ‘%s’ en kanaalkaart ‘%s’."
 
 #: ../src/utils/pacat.c:1009
 msgid "recording"
@@ -1601,7 +1602,7 @@
 #: ../src/utils/pasuspender.c:147
 #, c-format
 msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr "WAARSCHUWING: Geluidsserver is niet locaal, geen opschorten.\n"
+msgstr "WAARSCHUWING: Geluidsserver is niet lokaal, geen opschorten.\n"
 
 #: ../src/utils/pasuspender.c:159
 #, c-format
@@ -1683,7 +1684,7 @@
 #: ../src/utils/pactl.c:147
 #, c-format
 msgid "Sample cache size: %s\n"
-msgstr "Bemonstering cache grootte: %s\n"
+msgstr "Sample-buffergrootte: %s\n"
 
 #: ../src/utils/pactl.c:156
 #, c-format
@@ -1706,8 +1707,8 @@
 "Gebruikersnaam: %s\n"
 "Hostnaam: %s\n"
 "Servernaam: %s\n"
-"Server versie: %s\n"
-"Standaard bemonsterings specificatie: %s\n"
+"Serverversie: %s\n"
+"Standaard samplespecificatie: %s\n"
 "Standaard kanaal map: %s\n"
 "Standaard afvoer: %s\n"
 "Standaard bron: %s\n"
@@ -1716,7 +1717,7 @@
 #: ../src/utils/pactl.c:205
 #, c-format
 msgid "Failed to get sink information: %s"
-msgstr "Verkrijgen afvoer informatie mislukte: %s"
+msgstr "Verkrijgen afvoerinformatie mislukte: %s"
 
 #: ../src/utils/pactl.c:221
 #, c-format
@@ -1770,7 +1771,7 @@
 #: ../src/utils/pactl.c:297
 #, c-format
 msgid "Failed to get source information: %s"
-msgstr "Verkrijgen van bron informatie mislukte: %s"
+msgstr "Verkrijgen van broninformatie mislukt: %s"
 
 #: ../src/utils/pactl.c:313
 #, c-format
@@ -1798,14 +1799,14 @@
 "\tNaam: %s\n"
 "\tBeschrijving: %s\n"
 "\tDriver: %s\n"
-"\tBemonsterings specificatie: %s\n"
+"\tSamplespecificatie: %s\n"
 "\tKanaal map: %s\n"
 "\tModule eigenaar: %u\n"
 "\tDemping: %s\n"
 "\tVolume: %s%s%s\n"
 "\t        balans %0.2f\n"
 "\tBasis volume: %s%s%s\n"
-"\tMonitor afvoer: %s\n"
+"\tMonitorafvoer: %s\n"
 "\tLatentie: %0.0f usec, ingesteld %0.0f usec\n"
 "\tVlaggen: %s%s%s%s%s%s\n"
 "\tEigenschappen:\n"
@@ -1837,14 +1838,14 @@
 "Module #%u\n"
 "\tNaam: %s\n"
 "\tArgument: %s\n"
-"\tGebruiks teller: %s\n"
+"\tGebruiksteller: %s\n"
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:412
 #, c-format
 msgid "Failed to get client information: %s"
-msgstr "Verkrijgen van cliënt informatie mislukte: %s"
+msgstr "Verkrijgen van clientinformatie mislukt: %s"
 
 #: ../src/utils/pactl.c:430
 #, c-format
@@ -1855,16 +1856,16 @@
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Cliënt #%u\n"
-"\tDriver: %s\n"
-"\tModule eigenaar: %s\n"
+"Client #%u\n"
+"\tStuurprogramma: %s\n"
+"\tModule-eigenaar: %s\n"
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:447
 #, c-format
 msgid "Failed to get card information: %s"
-msgstr "Verkrijgen van kaart informatie mislukte: %s"
+msgstr "Verkrijgen van kaartinformatie mislukt: %s"
 
 #: ../src/utils/pactl.c:465
 #, c-format
@@ -1878,8 +1879,8 @@
 msgstr ""
 "Kaart #%u\n"
 "\tNaam: %s\n"
-"\tDriver: %s\n"
-"\tModule eigenaar: %s\n"
+"\tStuurprogramma: %s\n"
+"\tModule-eigenaar: %s\n"
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
@@ -1896,7 +1897,7 @@
 #: ../src/utils/pactl.c:496
 #, c-format
 msgid "Failed to get sink input information: %s"
-msgstr "Verkrijgen van afvoer input informatie mislukte: %s"
+msgstr "Verkrijgen van afvoer-invoerinformatie mislukt: %s"
 
 #: ../src/utils/pactl.c:515
 #, c-format
@@ -1919,26 +1920,26 @@
 "\t\t%s\n"
 msgstr ""
 "Afvoer input #%u\n"
-"\tDriver: %s\n"
-"\tModule eigenaar: %s\n"
-"\tCliënt: %s\n"
-"\tSink: %u\n"
-"\tBemonsterings specificatie: %s\n"
-"\tKanaal map: %s\n"
+"\tStuurprogramma: %s\n"
+"\tModule-eigenaar: %s\n"
+"\tClient: %s\n"
+"\tAfvoer: %u\n"
+"\tSamplespecificatie: %s\n"
+"\tKanaalkaart: %s\n"
 "\tDemping: %s\n"
 "\tVolume: %s\n"
 "\t        %s\n"
 "\t        balans %0.2f\n"
-"\tBuffer latentie: %0.0f usec\n"
-"\tAfvoer latentie: %0.0f usec\n"
-"\tHerbemonsterings methode: %s\n"
+"\tBufferlatentie: %0.0f usec\n"
+"\tAfvoerlatentie: %0.0f usec\n"
+"\tResample-methode: %s\n"
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:554
 #, c-format
 msgid "Failed to get source output information: %s"
-msgstr "Verkrijgen van bron output informatie mislukte: %s"
+msgstr "Verkrijgen van bron-uitvoerinformatie mislukt: %s"
 
 #: ../src/utils/pactl.c:574
 #, c-format
@@ -1956,23 +1957,23 @@
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Bron output #%u\n"
+"Bronuitvoer #%u\n"
 "\tDriver: %s\n"
-"\tModule eigenaaar: %s\n"
-"\tCliënt: %s\n"
+"\tModule-eigenaaar: %s\n"
+"\tClient: %s\n"
 "\tBron: %u\n"
-"\tBemonsterings specificatie: %s\n"
-"\tKanaal map: %s\n"
-"\tBuffer latentie: %0.0f usec\n"
-"\tBron latentie: %0.0f usec\n"
-"\tHerbemonsterings methode: %s\n"
+"\tSamplespecificatie: %s\n"
+"\tKanaalkaart: %s\n"
+"\tBufferlatentie: %0.0f usec\n"
+"\tBronlatentie: %0.0f usec\n"
+"\tResample-methode: %s\n"
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:605
 #, c-format
 msgid "Failed to get sample information: %s"
-msgstr "Verkrijgen van bemonsterings informatie mislukte: %s"
+msgstr "Verkrijgen van sample-informatie mislukt: %s"
 
 #: ../src/utils/pactl.c:623
 #, c-format
@@ -1991,9 +1992,9 @@
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
-"Monster #%u\n"
+"Sample #%u\n"
 "\tNaam: %s\n"
-"\tBemonsterings specificatie: %s\n"
+"\tSamplespecificatie: %s\n"
 "\tKanaal map: %s\n"
 "\tVolume: %s\n"
 "\t        %s\n"
@@ -2095,111 +2096,111 @@
 msgstr ""
 "pactl %s\n"
 "Gecompileerd met libpulse %s\n"
-"Gelint met libpulse %s\n"
+"Gelinkt met libpulse %s\n"
 
 #: ../src/utils/pactl.c:979
 msgid "Please specify a sample file to load"
-msgstr "Geef a.u.b een bemonsterings bestand op om te laden"
+msgstr "Geef een te laden samplebestand op"
 
 #: ../src/utils/pactl.c:992
 msgid "Failed to open sound file."
-msgstr "Openen geluidsbestand  mislukte."
+msgstr "Openen geluidsbestand mislukt."
 
 #: ../src/utils/pactl.c:1004
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
-"Waarschuwing: Bepalen van bemonsterings specificatie van bestand mislukte."
+"Waarschuwing: Bepalen van samplespecificatie van bestand mislukte."
 
 #: ../src/utils/pactl.c:1014
 msgid "You have to specify a sample name to play"
-msgstr "Je moet een monster naam opgeven om af te spelen"
+msgstr "U dient een samplenaam op te geven om af te spelen"
 
 #: ../src/utils/pactl.c:1026
 msgid "You have to specify a sample name to remove"
-msgstr "Je moet een monster naam opgeven om te verwijderen"
+msgstr "U dient een samplenaam op te geven om te verwijderen"
 
 #: ../src/utils/pactl.c:1035
 msgid "You have to specify a sink input index and a sink"
-msgstr "Je moet een afvoer input index en een afvoer opgeven"
+msgstr "U dient een afvoer-invoerindex en een afvoer op te geven"
 
 #: ../src/utils/pactl.c:1045
 msgid "You have to specify a source output index and a source"
-msgstr "Je moet een bron output index en een bron opgeven"
+msgstr "U dient een bron-uitvoerindex en een bron op te geven"
 
 #: ../src/utils/pactl.c:1060
 msgid "You have to specify a module name and arguments."
-msgstr "Je moet een module naam en argumenten opgeven."
+msgstr "U dient een modulenaam en argumenten op te geven."
 
 #: ../src/utils/pactl.c:1080
 msgid "You have to specify a module index"
-msgstr "Je moet een module index opgeven"
+msgstr "U dient een module index op te geven"
 
 #: ../src/utils/pactl.c:1090
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
-"Je kunt niet meer dan een afvoer opgeven. Je moet een boolean waarde opgeven"
+"U kunt niet meer dan een afvoer opgeven. U dient een boolean waarde op te geven."
 
 #: ../src/utils/pactl.c:1103
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
-"Je kunt niet meerd dan een bron opgeven. Je moet een boolean waarde opgeven."
+"U kunt niet meer dan één bron opgeven. u dient een boolean waarde op te geven."
 
 #: ../src/utils/pactl.c:1115
 msgid "You have to specify a card name/index and a profile name"
-msgstr "Je moet een kaart naam/index en een profiel naam opgeven"
+msgstr "U dient een kaartnaam/index en een profielnaam op te geven"
 
 #: ../src/utils/pactl.c:1126
 msgid "You have to specify a sink name/index and a port name"
-msgstr "Je moet een afvoer naam/index en een poort naam opgeven"
+msgstr "U dient een afvoernaam/index en een poortnaam op te geven"
 
 #: ../src/utils/pactl.c:1137
 msgid "You have to specify a source name/index and a port name"
-msgstr "Je moet een bron naam/index en een poort naam opgeven"
+msgstr "U dient een bronnaam/index en een poortnaam op te geven"
 
 #: ../src/utils/pactl.c:1149
 msgid "You have to specify a sink name/index and a volume"
-msgstr "Je moet een afvoer naam/index en een volume opgeven"
+msgstr "U dient een afvoernaam/index en een volume op te geven"
 
 #: ../src/utils/pactl.c:1154 ../src/utils/pactl.c:1171
 #: ../src/utils/pactl.c:1193 ../src/utils/pactl.c:1209
 #: ../src/utils/pactl.c:1226 ../src/utils/pactl.c:1248
 msgid "Invalid volume specification"
-msgstr "Ongeldige volume opgave"
+msgstr "Ongeldige volume-opgave"
 
 #: ../src/utils/pactl.c:1166
 msgid "You have to specify a source name/index and a volume"
-msgstr "Je moet een bron naam/index en een volume opgeven"
+msgstr "U dient een bronnaam/index en een volume op te geven"
 
 #: ../src/utils/pactl.c:1183
 msgid "You have to specify a sink input index and a volume"
-msgstr "Je moet een afvoer input index en een volume opgeven"
+msgstr "U dient een afvoer-invoerindex en een volume op te geven"
 
 #: ../src/utils/pactl.c:1188
 msgid "Invalid sink input index"
-msgstr "Ongeldige afvoer input index"
+msgstr "Ongeldige afvoer-invoerindex"
 
 #: ../src/utils/pactl.c:1204
 msgid "You have to specify a sink name/index and a mute boolean"
-msgstr "Je moet een afvoer naam/index en een dempings boolean opgeven"
+msgstr "U dient een afvoernaam/index en een dempingsboolean op te geven"
 
 #: ../src/utils/pactl.c:1221
 msgid "You have to specify a source name/index and a mute boolean"
-msgstr "Je moet een bron naam/index en een dempings boolean opgeven"
+msgstr "U dient een bronnaam/index en een dempingsboolean op te geven"
 
 #: ../src/utils/pactl.c:1238
 msgid "You have to specify a sink input index and a mute boolean"
-msgstr "Je moet een afvoer input index en een dempings boolean opgeven"
+msgstr "U dient een afvoer-invoerindex en een dempingsboolean op te geven"
 
 #: ../src/utils/pactl.c:1243
 msgid "Invalid sink input index specification"
-msgstr "Ongeldige afvoer input index opgave"
+msgstr "Ongeldige afvoer-invoerindex opgave"
 
 #: ../src/utils/pactl.c:1262
 msgid "No valid command specified."
-msgstr "Geen geldig commando opgegeven."
+msgstr "Geen geldige opdracht opgegeven."
 
 #: ../src/utils/pax11publish.c:61
 #, c-format
@@ -2224,7 +2225,7 @@
 #: ../src/utils/pax11publish.c:94
 #, c-format
 msgid "Failed to parse command line.\n"
-msgstr "Commando regel ontleden mislukte.\n"
+msgstr "Opdrachtregel ontleden mislukt.\n"
 
 #: ../src/utils/pax11publish.c:108
 #, c-format
@@ -2249,22 +2250,22 @@
 #: ../src/utils/pax11publish.c:132
 #, c-format
 msgid "Failed to parse cookie data\n"
-msgstr "Cookie data ontleden mislukte\n"
+msgstr "Cookiedata ontleden mislukt\n"
 
 #: ../src/utils/pax11publish.c:137
 #, c-format
 msgid "Failed to save cookie data\n"
-msgstr "Cookie data opslaan mislukte\n"
+msgstr "Cookiedata opslaan mislukt\n"
 
 #: ../src/utils/pax11publish.c:152
 #, c-format
 msgid "Failed to load client configuration file.\n"
-msgstr "Cliënt configuratie bestand laden mislukte.\n"
+msgstr "Clientconfiguratiebestand laden mislukt.\n"
 
 #: ../src/utils/pax11publish.c:157
 #, c-format
 msgid "Failed to read environment configuration data.\n"
-msgstr "Omgevings configuratie bestand lezen mislukte.\n"
+msgstr "Omgevingsconfiguratiedata lezen mislukt.\n"
 
 #: ../src/utils/pax11publish.c:174
 #, c-format
@@ -2274,7 +2275,7 @@
 #: ../src/utils/pax11publish.c:194
 #, c-format
 msgid "Failed to load cookie data\n"
-msgstr "Cookie data laden mislukte\n"
+msgstr "Cookiedata laden mislukt\n"
 
 #: ../src/utils/pax11publish.c:211
 #, c-format
@@ -2284,7 +2285,7 @@
 #: ../src/utils/pacmd.c:69
 msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr ""
-"Er draait geen PulseAudio daemon, of het draait niet als sessie daemon."
+"Er draait geen PulseAudio-voorziening, of het draait niet als sessievoorziening."
 
 #: ../src/utils/pacmd.c:74
 #, c-format
@@ -2298,11 +2299,11 @@
 
 #: ../src/utils/pacmd.c:99
 msgid "Failed to kill PulseAudio daemon."
-msgstr "PulseAudio daemon uitzetten mislukte."
+msgstr "PulseAudio-voorziening uitzetten mislukt."
 
 #: ../src/utils/pacmd.c:107
 msgid "Daemon not responding."
-msgstr "Daemon reageert niet."
+msgstr "Voorziening reageert niet."
 
 #: ../src/utils/pacmd.c:161
 #, c-format
@@ -2335,8 +2336,8 @@
 msgstr ""
 "ALSA maakte ons wakker om nieuwe data naar het apparaat te schrijven, maar "
 "er was niets om weg te schrijven!\n"
-"Waarschijnlijk is dit een fout in de ALSA driver '%s\". Rapporteer dit "
-"probleem a.u.b. aan de ALSA ontwikkelaars.\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars.\n"
 "We werden gewekt met POLLOUT ingesteld -- echter een opvolgende snd_pcm_avail"
 "() gaf 0 terug of een andere waarde < min_avail."
 
@@ -2352,8 +2353,8 @@
 msgstr ""
 "ALSA maakte ons wakker om nieuwe data van het apparaat te lezen, maar er was "
 "niets om te lezen!\n"
-"Waarschijnlijk is dit een fout in de ALSA driver '%s\". Rapporteer dit "
-"probleem a.u.b. aan de ALSA ontwikkelaars.\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars.\n"
 "We werden gewekt met POLLIN ingesteld -- echter een opvolgende snd_pcm_avail"
 "() gaf 0 terug of een andere waarde < min_avail."
 
@@ -2361,7 +2362,7 @@
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2228
 #: ../src/modules/alsa/alsa-mixer.c:2931
 msgid "Off"
-msgstr "Uiy"
+msgstr "Uit"
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2184
 msgid "High Fidelity Playback (A2DP)"
@@ -2369,144 +2370,135 @@
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2198
 msgid "High Fidelity Capture (A2DP)"
-msgstr "High Fidelity Afvangen (A2DP)"
+msgstr "High Fidelity afvangen (A2DP)"
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2213
 msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Telefonie Duplex (HSP/HFP)"
+msgstr "Telefonie duplex (HSP/HFP)"
 
 #: ../src/modules/reserve-wrap.c:151
 msgid "PulseAudio Sound Server"
-msgstr "PulseAudio geluids server"
+msgstr "PulseAudio-geluidsserver"
 
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Uitvoerapparaten"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
 msgid "Input Devices"
-msgstr ""
+msgstr "Invoerapparaten"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Geluid op @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
 msgid "Input"
-msgstr ""
+msgstr "Invoer"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Docking station-invoer"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Docking station-microfoon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Lijn-in"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Microfoon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Externe microfoon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Intern geluid"
+msgstr "Interne microfoon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Automatische gain-controle"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Geen automatische gain-controle"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Boostversterking"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Geen boostversterking"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Versterker"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Geen versterker"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
-#, fuzzy
 msgid "Analog Input"
-msgstr "Analoog mono"
+msgstr "Analoge invoer"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
-#, fuzzy
 msgid "Analog Microphone"
-msgstr "Analoog mono"
+msgstr "Analoge microfoon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
-#, fuzzy
 msgid "Analog Line-In"
-msgstr "Analoog mono"
+msgstr "Analoge lijn-in"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
-#, fuzzy
 msgid "Analog Radio"
-msgstr "Analoog mono"
+msgstr "Analoge radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
-#, fuzzy
 msgid "Analog Video"
-msgstr "Analoog stereo"
+msgstr "Analoge video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Null output"
+msgstr "Analoge output"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
-#, fuzzy
 msgid "Analog Headphones"
-msgstr "Analoog mono"
+msgstr "Analoge koptelefoon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Analoge output (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
-#, fuzzy
 msgid "Analog Mono Output"
-msgstr "Analoog mono"
+msgstr "Analoge mono-uitvoer"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s/%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
@@ -2517,19 +2509,16 @@
 msgstr "Analoog stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Analoog surround 4.1"
+msgstr "Analoog surround 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Analoog surround 4.0"
+msgstr "Analoog surround 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Analoog surround 4.1"
+msgstr "Analoog surround 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
 msgid "Analog Surround 4.0"
@@ -2548,19 +2537,16 @@
 msgstr "Analoog surround 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Analoog surround 4.0"
+msgstr "Analoog surround 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Analoog surround 4.1"
+msgstr "Analoog surround 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Analoog surround 4.0"
+msgstr "Analoog surround 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
 msgid "Analog Surround 7.1"
@@ -2571,9 +2557,8 @@
 msgstr "Digitaal stereo (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
-#, fuzzy
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr "Digitaal surround 4.0 (IEC958/AC3)"
+msgstr "Digitaal surround 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
@@ -2588,19 +2573,16 @@
 msgstr "Digitaal stereo (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
-#, fuzzy
 msgid "Analog Mono Duplex"
-msgstr "Analoog mono"
+msgstr "Analoog mono duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
-#, fuzzy
 msgid "Analog Stereo Duplex"
-msgstr "Analoog stereo"
+msgstr "Analoog stereo duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
-#, fuzzy
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Digitaal stereo (IEC958)"
+msgstr "Digitaal stereo duplex (IEC958)"
 
 #, fuzzy
 #~ msgid "Invalid client name '%s'\n"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/pl.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/pl.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/pl.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/pl.po	2010-01-15 23:21:18.000000000 +0000
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-27 15:42+0200\n"
+"POT-Creation-Date: 2009-09-30 09:44+0000\n"
+"PO-Revision-Date: 2009-09-30 17:04+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <fedora-trans-pl@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -2377,217 +2377,203 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Urządzenia wyjściowe"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
 msgid "Input Devices"
-msgstr ""
+msgstr "Urządzenia wejściowe"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Dźwięk na @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
 msgid "Input"
-msgstr ""
+msgstr "Wejście"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Wejście stacji dokującej"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Mikrofon stacji dokującej"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Wejście liniowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Zewnętrzny mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Wewnętrzny dźwięk"
+msgstr "Wewnętrzny mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Wideo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Automatyczna kontrola natężenia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Brak automatycznej kontroli natężenia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Podbicie"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Brak podbicia"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Amplituner"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Brak amplitunera"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
 msgid "Analog Input"
-msgstr ""
+msgstr "Wejście analogowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
 msgid "Analog Microphone"
-msgstr ""
+msgstr "Mikrofon analogowy"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
 msgid "Analog Line-In"
-msgstr ""
+msgstr "Analogowe wejście liniowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
 msgid "Analog Radio"
-msgstr ""
+msgstr "Radio analogowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
 msgid "Analog Video"
-msgstr ""
+msgstr "Wideo analogowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Puste wyjście"
+msgstr "Wyjście analogowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
 msgid "Analog Headphones"
-msgstr ""
+msgstr "Słuchawki analogowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Wyjście analogowe (subwoofer)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Analogowe wyjście mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s/%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
-msgstr ""
+msgstr "Analogowe mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:2791
-#, fuzzy
 msgid "Analog Stereo"
-msgstr "Stereo"
+msgstr "Analogowe stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Surround 4.1"
+msgstr "Analogowe surround 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Surround 4.0"
+msgstr "Analogowe surround 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Surround 4.1"
+msgstr "Analogowe surround 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
-#, fuzzy
 msgid "Analog Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Analogowe surround 4.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2796
-#, fuzzy
 msgid "Analog Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Analogowe surround 4.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2797
-#, fuzzy
 msgid "Analog Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Analogowe surround 5.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2798
-#, fuzzy
 msgid "Analog Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Analogowe surround 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Surround 4.0"
+msgstr "Analogowe surround 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Surround 4.1"
+msgstr "Analogowe surround 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Surround 4.0"
+msgstr "Analogowe surround 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
-#, fuzzy
 msgid "Analog Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Analogowe surround 7.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2803
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Cyfrowe stereo (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr ""
+msgstr "Cyfrowe surround 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Cyfrowe surround 4.0 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2806
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Cyfrowe surround 5.1 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2807
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Cyfrowe stereo (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Analogowy dupleks mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Analogowy dupleks stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Cyfrowy dupleks stereo (IEC958)"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/pt_BR.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/pt_BR.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/pt_BR.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/pt_BR.po	2010-01-15 23:21:18.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-08-24 19:26-0300\n"
+"POT-Creation-Date: 2009-10-23 09:53+0000\n"
+"PO-Revision-Date: 2009-10-23 14:42-0300\n"
 "Last-Translator: Igor Pires Soares <igor@projetofedora.org>\n"
 "Language-Team: Brazilian-Portuguese <fedora-trans-pt_br@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,8 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: Brazil\n"
 
-#: ../src/modules/alsa/alsa-util.c:858 ../src/pulsecore/sink.c:2629
+#: ../src/modules/alsa/alsa-util.c:858
+#: ../src/pulsecore/sink.c:2629
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -27,75 +28,53 @@
 #: ../src/modules/alsa/alsa-util.c:1106
 #, c-format
 msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"O snd_pcm_avail() retornou um valor que é excepcionalmente grande: %lu bytes "
-"(%lu ms).\n"
-"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
-"relate esse problema aos desenvolvedores do ALSA."
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
+msgstr ""
+"O snd_pcm_avail() retornou um valor que é excepcionalmente grande: %lu bytes (%lu ms).\n"
+"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, relate esse problema aos desenvolvedores do ALSA."
 
 #: ../src/modules/alsa/alsa-util.c:1147
 #, c-format
 msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%"
-"lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"O snd_pcm_delay() retornou um valor que é excepcionalmente grande: %li bytes "
-"(%s%lu ms).\n"
-"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
-"relate esse problema aos desenvolvedores do ALSA."
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
+msgstr ""
+"O snd_pcm_delay() retornou um valor que é excepcionalmente grande: %li bytes (%s%lu ms).\n"
+"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, relate esse problema aos desenvolvedores do ALSA."
 
 #: ../src/modules/alsa/alsa-util.c:1194
 #, c-format
 msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"O snd_pcm_mmap_begin() retornou um valor que é excepcionalmente grande: %lu "
-"bytes (%lu ms).\n"
-"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
-"relate esse problema aos desenvolvedores do ALSA."
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers."
+msgstr ""
+"O snd_pcm_mmap_begin() retornou um valor que é excepcionalmente grande: %lu bytes (%lu ms).\n"
+"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, relate esse problema aos desenvolvedores do ALSA."
 
 #: ../src/modules/module-always-sink.c:39
 msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr ""
+msgstr "Sempre manter pelo menos um destino carregado mesmo se for nulo"
 
 #: ../src/modules/module-always-sink.c:83
 msgid "Dummy Output"
-msgstr ""
+msgstr "Saída fictícia"
 
 #: ../src/modules/module-ladspa-sink.c:49
 msgid "Virtual LADSPA sink"
 msgstr "Destino Virtual LADSPA"
 
 #: ../src/modules/module-ladspa-sink.c:53
-msgid ""
-"sink_name=<name for the sink> sink_properties=<properties for the sink> "
-"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<channel map> plugin=<ladspa "
-"plugin name> label=<ladspa plugin label> control=<comma seperated list of "
-"input control values>"
-msgstr ""
-"sink_name=<nome do destino> sink_properties=<propriedades do destino> "
-"master=<nome do destino a ser filtrado> format=<formato de amostragem> "
-"rate=<taxa da amostragem> channels=<número de canais> channel_map=<mapa dos "
-"canais> plugin=<nome do plugin ladspa> label=<rótulo do plugin ladspa> "
-"control=<lista separada por vírgulas dos valores de controle da entrada>"
+msgid "sink_name=<name for the sink> sink_properties=<properties for the sink> master=<name of sink to filter> format=<sample format> rate=<sample rate> channels=<number of channels> channel_map=<channel map> plugin=<ladspa plugin name> label=<ladspa plugin label> control=<comma seperated list of input control values>"
+msgstr "sink_name=<nome do destino> sink_properties=<propriedades do destino> master=<nome do destino a ser filtrado> format=<formato de amostragem> rate=<taxa da amostragem> channels=<número de canais> channel_map=<mapa dos canais> plugin=<nome do plugin ladspa> label=<rótulo do plugin ladspa> control=<lista separada por vírgulas dos valores de controle da entrada>"
 
 #: ../src/modules/module-null-sink.c:55
 msgid "Clocked NULL sink"
-msgstr ""
+msgstr "Destino nulo temporizado"
 
 #: ../src/modules/module-null-sink.c:291
 msgid "Null Output"
-msgstr ""
+msgstr "Saída nula"
 
 #: ../src/pulsecore/sink.c:2613
 msgid "Internal Audio"
@@ -151,7 +130,8 @@
 msgid "Home directory of user '%s' is not '%s', ignoring."
 msgstr "O diretório pessoal do usuário \"%s\" não é \"%s\", ignorando."
 
-#: ../src/daemon/main.c:208 ../src/daemon/main.c:213
+#: ../src/daemon/main.c:208
+#: ../src/daemon/main.c:213
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr "Falha ao criar \"%s\": %s"
@@ -203,12 +183,8 @@
 msgstr "Falha em encerrar o daemon: %s"
 
 #: ../src/daemon/main.c:571
-msgid ""
-"This program is not intended to be run as root (unless --system is "
-"specified)."
-msgstr ""
-"Este programa não é para ser executado como root (a não ser que --system "
-"seja especificado)."
+msgid "This program is not intended to be run as root (unless --system is specified)."
+msgstr "Este programa não é para ser executado como root (a não ser que --system seja especificado)."
 
 #: ../src/daemon/main.c:573
 msgid "Root privileges required."
@@ -224,8 +200,7 @@
 
 #: ../src/daemon/main.c:586
 msgid "Running in system mode, but --disallow-module-loading not set!"
-msgstr ""
-"Executando no modo system, mas --disallow-module-loading não foi configurado!"
+msgstr "Executando no modo system, mas --disallow-module-loading não foi configurado!"
 
 #: ../src/daemon/main.c:589
 msgid "Running in system mode, forcibly disabling SHM mode!"
@@ -233,8 +208,7 @@
 
 #: ../src/daemon/main.c:594
 msgid "Running in system mode, forcibly disabling exit idle time!"
-msgstr ""
-"Executando no modo system, desabilitando forçadamente o exit idle time!"
+msgstr "Executando no modo system, desabilitando forçadamente o exit idle time!"
 
 #: ../src/daemon/main.c:621
 msgid "Failed to acquire stdio."
@@ -250,7 +224,8 @@
 msgid "fork() failed: %s"
 msgstr "O fork() falhou: %s"
 
-#: ../src/daemon/main.c:646 ../src/utils/pacat.c:508
+#: ../src/daemon/main.c:646
+#: ../src/utils/pacat.c:508
 #, c-format
 msgid "read() failed: %s"
 msgstr "A operação read() falhou: %s"
@@ -320,9 +295,7 @@
 
 #: ../src/daemon/main.c:760
 msgid "FASTPATH defined, only fast path asserts disabled."
-msgstr ""
-"FASTPATH definido, somente as declarações do \"fast path\" foram "
-"desabilitadas."
+msgstr "FASTPATH definido, somente as declarações do \"fast path\" foram desabilitadas."
 
 #: ../src/daemon/main.c:762
 msgid "All asserts enabled."
@@ -364,19 +337,13 @@
 
 #: ../src/daemon/main.c:792
 msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
-msgstr ""
-"OK, então você está executando o PA no modo de sistema. Por favor, note que "
-"é mais provável que você não deveria estar fazendo isso.\n"
-"Todavia, se você o fizer, então a culpa será sua se as coisas não "
-"funcionarem como esperado.\n"
-"Por favor, leia o http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode para "
-"obter um explicação sobre porque o modo de sistema é uma má idéia."
+"OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
+"If you do it nonetheless then it's your own fault if things don't work as expected.\n"
+"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an explanation why system mode is usually a bad idea."
+msgstr ""
+"OK, então você está executando o PA no modo de sistema. Por favor, note que é mais provável que você não deveria estar fazendo isso.\n"
+"Todavia, se você o fizer, então a culpa será sua se as coisas não funcionarem como esperado.\n"
+"Por favor, leia o http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode para obter um explicação sobre porque o modo de sistema é uma má idéia."
 
 #: ../src/daemon/main.c:809
 msgid "pa_pid_file_create() failed."
@@ -387,12 +354,8 @@
 msgstr "Timers de alta resolução frequinhos disponíveis! Bon appetit!"
 
 #: ../src/daemon/main.c:821
-msgid ""
-"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
-"resolution timers enabled!"
-msgstr ""
-"Cara, teu kernel fede! A recomendação do chef hoje é Linux com timers de "
-"alta resolução habilitados!"
+msgid "Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"
+msgstr "Cara, teu kernel fede! A recomendação do chef hoje é Linux com timers de alta resolução habilitados!"
 
 #: ../src/daemon/main.c:844
 msgid "pa_core_new() failed."
@@ -404,8 +367,7 @@
 
 #: ../src/daemon/main.c:909
 msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr ""
-"O Daemon iniciou sem qualquer módulo carregado, recusando-se a trabalhar."
+msgstr "O Daemon iniciou sem qualquer módulo carregado, recusando-se a trabalhar."
 
 #: ../src/daemon/main.c:926
 msgid "Daemon startup complete."
@@ -430,48 +392,37 @@
 "      --dump-conf                       Dump default configuration\n"
 "      --dump-modules                    Dump list of available modules\n"
 "      --dump-resample-methods           Dump available resample methods\n"
-"      --cleanup-shm                     Cleanup stale shared memory "
-"segments\n"
-"      --start                           Start the daemon if it is not "
-"running\n"
+"      --cleanup-shm                     Cleanup stale shared memory segments\n"
+"      --start                           Start the daemon if it is not running\n"
 "  -k  --kill                            Kill a running daemon\n"
-"      --check                           Check for a running daemon (only "
-"returns exit code)\n"
+"      --check                           Check for a running daemon (only returns exit code)\n"
 "\n"
 "OPTIONS:\n"
 "      --system[=BOOL]                   Run as system-wide instance\n"
 "  -D, --daemonize[=BOOL]                Daemonize after startup\n"
 "      --fail[=BOOL]                     Quit when startup fails\n"
 "      --high-priority[=BOOL]            Try to set high nice level\n"
-"                                        (only available as root, when SUID "
-"or\n"
+"                                        (only available as root, when SUID or\n"
 "                                        with elevated RLIMIT_NICE)\n"
 "      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
-"                                        (only available as root, when SUID "
-"or\n"
+"                                        (only available as root, when SUID or\n"
 "                                        with elevated RLIMIT_RTPRIO)\n"
-"      --disallow-module-loading[=BOOL]  Disallow module user requested "
-"module\n"
+"      --disallow-module-loading[=BOOL]  Disallow module user requested module\n"
 "                                        loading/unloading after startup\n"
 "      --disallow-exit[=BOOL]            Disallow user requested exit\n"
-"      --exit-idle-time=SECS             Terminate the daemon when idle and "
-"this\n"
+"      --exit-idle-time=SECS             Terminate the daemon when idle and this\n"
 "                                        time passed\n"
-"      --module-idle-time=SECS           Unload autoloaded modules when idle "
-"and\n"
+"      --module-idle-time=SECS           Unload autoloaded modules when idle and\n"
 "                                        this time passed\n"
-"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
-"and\n"
+"      --scache-idle-time=SECS           Unload autoloaded samples when idle and\n"
 "                                        this time passed\n"
 "      --log-level[=LEVEL]               Increase or set verbosity level\n"
 "  -v                                    Increase the verbosity level\n"
 "      --log-target={auto,syslog,stderr} Specify the log target\n"
-"      --log-meta[=BOOL]                 Include code location in log "
-"messages\n"
+"      --log-meta[=BOOL]                 Include code location in log messages\n"
 "      --log-time[=BOOL]                 Include timestamps in log messages\n"
 "      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
-"  -p, --dl-search-path=PATH             Set the search path for dynamic "
-"shared\n"
+"  -p, --dl-search-path=PATH             Set the search path for dynamic shared\n"
 "                                        objects (plugins)\n"
 "      --resample-method=METHOD          Use the specified resampling method\n"
 "                                        (See --dump-resample-methods for\n"
@@ -482,12 +433,10 @@
 "      --disable-shm[=BOOL]              Disable shared memory support.\n"
 "\n"
 "STARTUP SCRIPT:\n"
-"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
-"with\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module with\n"
 "                                        the specified argument\n"
 "  -F, --file=FILENAME                   Run the specified script\n"
-"  -C                                    Open a command line on the running "
-"TTY\n"
+"  -C                                    Open a command line on the running TTY\n"
 "                                        after startup\n"
 "\n"
 "  -n                                    Don't load default script file\n"
@@ -498,79 +447,56 @@
 "  -h, --help                            Mostra esta ajuda\n"
 "      --version                        Mostra a versão\n"
 "      --dump-conf                       Descarrega a configuração padrão\n"
-"      --dump-modules                   Descarrega a lista de módulos "
-"disponíveis\n"
-"      --dump-resample-methods           Descarrega os métodos de "
-"reamostragem\n"
-"      --cleanup-shm                     Limpa os segmentos de memória "
-"compartilhados\n"
-"      --start                           Inicia o daemon se ele não estiver "
-"em execução\n"
+"      --dump-modules                   Descarrega a lista de módulos disponíveis\n"
+"      --dump-resample-methods           Descarrega os métodos de reamostragem\n"
+"      --cleanup-shm                     Limpa os segmentos de memória compartilhados\n"
+"      --start                           Inicia o daemon se ele não estiver em execução\n"
 "  -k  --kill                            Encerra um daemon em execução\n"
-"      --check                           Verifica se há um daemon em execução "
-"(somente retorna o código de saída)\n"
+"      --check                           Verifica se há um daemon em execução (somente retorna o código de saída)\n"
 "\n"
 "OPÇÕES:\n"
-"      --system[=BOOL]                   Executa como uma instância do "
-"sistema em escala ampla\n"
+"      --system[=BOOL]                   Executa como uma instância do sistema em escala ampla\n"
 "  -D, --daemonize[=BOOL]                Torna-se um daemom após o início\n"
 "      --fail[=BOOL]                     Sai quando a partida falha\n"
 "      --high-priority[=BOOL]            Tenta definir um nível alto de nice\n"
 "                                        (disponível apenas, quando SUID ou\n"
 "                                        com RLIMIT_NICE) elevado\n"
-"      --realtime[=BOOL]                 Tenta habilitar o escalonamento em "
-"tempo real\n"
-"                                        (disponível apenas como root, quando "
-"SUID ou\n"
+"      --realtime[=BOOL]                 Tenta habilitar o escalonamento em tempo real\n"
+"                                        (disponível apenas como root, quando SUID ou\n"
 "                                        com  RLIMIT_RTPRIO) elevado\n"
-"      --disallow-module-loading[=BOOL]  Não permite carga/descarga de módulo "
-"requerido pelo usuário\n"
+"      --disallow-module-loading[=BOOL]  Não permite carga/descarga de módulo requerido pelo usuário\n"
 "                                        depois da partida\n"
-"      --disallow-exit[=BOOL]            Não permite saída requisitada pelo "
-"usuário\n"
-"      --exit-idle-time=SECS             Termina um daemon quando ocioso e "
-"este\n"
+"      --disallow-exit[=BOOL]            Não permite saída requisitada pelo usuário\n"
+"      --exit-idle-time=SECS             Termina um daemon quando ocioso e este\n"
 "                                        tempo foi decorrido\n"
-"      --module-idle-time=SECS           Descarrega os módulos "
-"autocarregáveis quando ociosos e\n"
+"      --module-idle-time=SECS           Descarrega os módulos autocarregáveis quando ociosos e\n"
 "                                        este tempo foi decorrido\n"
-"      --scache-idle-time=SECS           Descarrega amostras quando ociosas "
-"e\n"
+"      --scache-idle-time=SECS           Descarrega amostras quando ociosas e\n"
 "                                        este tempo foi decorrido\n"
-"      --log-level[=LEVEL]               Aumenta ou define o grau de "
-"detalhamento\n"
+"      --log-level[=LEVEL]               Aumenta ou define o grau de detalhamento\n"
 "  -v                                    Aumenta o nível de detalhamento\n"
 "      --log-target={auto,syslog,stderr} Especifica o destino do log\n"
-"      --log-meta[=BOOL]                 Inclui a localização do código na "
-"mensagem de log\n"
-"      --log-time[=BOOL]                 Inclui carimbos de hora nas "
-"mensagens de log\n"
-"      --log-backtrace=FRAMES            Inclui um backtrace na mensagem de "
-"log\n"
-"  -p, --dl-search-path=PATH             Define o caminho de pesquisa para "
-"objetos (plugins)\n"
+"      --log-meta[=BOOL]                 Inclui a localização do código na mensagem de log\n"
+"      --log-time[=BOOL]                 Inclui carimbos de hora nas mensagens de log\n"
+"      --log-backtrace=FRAMES            Inclui um backtrace na mensagem de log\n"
+"  -p, --dl-search-path=PATH             Define o caminho de pesquisa para objetos (plugins)\n"
 "                                            dinamicamente compartilhados\n"
-"      --resample-method=METHOD         Usa o método de reamostragem "
-"especificado\n"
+"      --resample-method=METHOD         Usa o método de reamostragem especificado\n"
 "                                        (Veja --dump-resample-methods para\n"
 "                                        valores possíveis)\n"
 "      --use-pid-file[=BOOL]             Cria um arquivo PID\n"
-"      --no-cpu-limit[=BOOL]            Não instala um limitador de carga de "
-"CPU em\n"
+"      --no-cpu-limit[=BOOL]            Não instala um limitador de carga de CPU em\n"
 "                                        plataformas que o suportem.\n"
-"      --disable-shm[=BOOL]              Desabilita o suporte à memória "
-"compartilhada.\n"
+"      --disable-shm[=BOOL]              Desabilita o suporte à memória compartilhada.\n"
 "\n"
 "SCRIPT DE INÍCIO:\n"
 "  -L, --load=\"ARGUMENTOS DO MÓDULO\"    Carrega um plugin especificado com\n"
 "                                        o argumento especificado\n"
 "  -F, --file=NOME_DO_ARQUIVO          Executa o script especificado\n"
-"  -C                                    Abre uma linha de comando no TTY em "
-"execução\n"
+"  -C                                    Abre uma linha de comando no TTY em execução\n"
 "                                       depois da partida\n"
 "\n"
-"  -n                                    Não carrega o arquivo de script "
-"padrão\n"
+"  -n                                    Não carrega o arquivo de script padrão\n"
 
 #: ../src/daemon/cmdline.c:247
 msgid "--daemonize expects boolean argument"
@@ -581,12 +507,8 @@
 msgstr "--fail espera argumento booleano"
 
 #: ../src/daemon/cmdline.c:264
-msgid ""
-"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
-msgstr ""
-"--log-level espera um argumento em nível de log  (seja numérico na faixa de "
-"0..4 seja algum entre debug, info, notice, warn, error)."
+msgid "--log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error)."
+msgstr "--log-level espera um argumento em nível de log  (seja numérico na faixa de 0..4 seja algum entre debug, info, notice, warn, error)."
 
 #: ../src/daemon/cmdline.c:276
 msgid "--high-priority expects boolean argument"
@@ -748,12 +670,8 @@
 msgstr "Falha em abrir o arquivo de configuração: %s"
 
 #: ../src/daemon/daemon-conf.c:562
-msgid ""
-"The specified default channel map has a different number of channels than "
-"the specified default number of channels."
-msgstr ""
-"O mapa padrão dos canais especificado tem um número diferente de canais do "
-"que o número de canais padrão especificado."
+msgid "The specified default channel map has a different number of channels than the specified default number of channels."
+msgstr "O mapa padrão dos canais especificado tem um número diferente de canais do que o número de canais padrão especificado."
 
 #: ../src/daemon/daemon-conf.c:638
 #, c-format
@@ -772,13 +690,14 @@
 msgid "Start the PulseAudio Sound System"
 msgstr "Iniciar o sistema de som PulseAudio"
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
+#: ../src/pulse/channelmap.c:105
+#: ../src/pulse/channelmap.c:757
 msgid "Mono"
 msgstr "Mono"
 
 #: ../src/pulse/channelmap.c:107
 msgid "Front Center"
-msgstr "Fronto-cental"
+msgstr "Frontal central"
 
 #: ../src/pulse/channelmap.c:108
 msgid "Front Left"
@@ -950,35 +869,38 @@
 
 #: ../src/pulse/channelmap.c:156
 msgid "Top Center"
-msgstr "Central Superior"
+msgstr "Central superior"
 
 #: ../src/pulse/channelmap.c:158
 msgid "Top Front Center"
-msgstr "Central Frontal Superior"
+msgstr "Central frontal superior"
 
 #: ../src/pulse/channelmap.c:159
 msgid "Top Front Left"
-msgstr "Frontal Superior Esquerdo"
+msgstr "Frontal superior esquerdo"
 
 #: ../src/pulse/channelmap.c:160
 msgid "Top Front Right"
-msgstr "Fontal Superior Direito"
+msgstr "Fontal superior direito"
 
 #: ../src/pulse/channelmap.c:162
 msgid "Top Rear Center"
-msgstr "Central Superior Posterior"
+msgstr "Central superior posterior"
 
 #: ../src/pulse/channelmap.c:163
 msgid "Top Rear Left"
-msgstr "Posterior Superior Esquerdo"
+msgstr "Posterior superior esquerdo"
 
 #: ../src/pulse/channelmap.c:164
 msgid "Top Rear Right"
-msgstr "Posterior Superior Direito"
+msgstr "Posterior superior direito"
 
-#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:170
-#: ../src/pulse/volume.c:295 ../src/pulse/volume.c:321
-#: ../src/pulse/volume.c:341 ../src/pulse/volume.c:371
+#: ../src/pulse/channelmap.c:484
+#: ../src/pulse/sample.c:170
+#: ../src/pulse/volume.c:295
+#: ../src/pulse/volume.c:321
+#: ../src/pulse/volume.c:341
+#: ../src/pulse/volume.c:371
 msgid "(invalid)"
 msgstr "(Inválido)"
 
@@ -1012,7 +934,7 @@
 
 #: ../src/pulse/error.c:44
 msgid "Access denied"
-msgstr "Acesso Negado"
+msgstr "Acesso negado"
 
 #: ../src/pulse/error.c:45
 msgid "Unknown command"
@@ -1108,11 +1030,11 @@
 
 #: ../src/pulse/error.c:68
 msgid "Input/Output error"
-msgstr ""
+msgstr "Erro de entrada/saída"
 
 #: ../src/pulse/error.c:69
 msgid "Device or resource busy"
-msgstr ""
+msgstr "Dispositivo ou recurso ocupado"
 
 #: ../src/pulse/sample.c:172
 #, c-format
@@ -1139,7 +1061,8 @@
 msgid "%u B"
 msgstr "%u B"
 
-#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
+#: ../src/pulse/client-conf-x11.c:55
+#: ../src/utils/pax11publish.c:100
 msgid "XOpenDisplay() failed"
 msgstr "XOpenDisplay() falhou"
 
@@ -1199,7 +1122,8 @@
 msgid "pa_stream_begin_write() failed: %s"
 msgstr "pa_stream_begin_write() falhou: %s"
 
-#: ../src/utils/pacat.c:237 ../src/utils/pacat.c:267
+#: ../src/utils/pacat.c:237
+#: ../src/utils/pacat.c:267
 #, c-format
 msgid "pa_stream_peek() failed: %s"
 msgstr "pa_stream_peek() falhou: %s"
@@ -1297,7 +1221,8 @@
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() falhou: %s"
 
-#: ../src/utils/pacat.c:470 ../src/utils/pactl.c:857
+#: ../src/utils/pacat.c:470
+#: ../src/utils/pactl.c:857
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Falha na conexão: %s"
@@ -1321,9 +1246,9 @@
 msgstr "Falha ao obter a latência: %s"
 
 #: ../src/utils/pacat.c:580
-#, fuzzy, c-format
+#, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Tempo: %0.3f s; Latência: %0.0f us.  \r"
+msgstr "Tempo: %0.3f sec;; Latência: %0.0f usec."
 
 #: ../src/utils/pacat.c:599
 #, c-format
@@ -1343,48 +1268,29 @@
 "\n"
 "  -v, --verbose                         Enable verbose operations\n"
 "\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"  -d, --device=DEVICE                   The name of the sink/source to "
-"connect to\n"
-"  -n, --client-name=NAME                How to call this client on the "
-"server\n"
-"      --stream-name=NAME                How to call this stream on the "
-"server\n"
-"      --volume=VOLUME                   Specify the initial (linear) volume "
-"in range 0...65536\n"
-"      --rate=SAMPLERATE                 The sample rate in Hz (defaults to "
-"44100)\n"
-"      --format=SAMPLEFORMAT             The sample type, one of s16le, "
-"s16be, u8, float32le,\n"
-"                                        float32be, ulaw, alaw, s32le, s32be, "
-"s24le, s24be,\n"
-"                                        s24-32le, s24-32be (defaults to "
-"s16ne)\n"
-"      --channels=CHANNELS               The number of channels, 1 for mono, "
-"2 for stereo\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"  -d, --device=DEVICE                   The name of the sink/source to connect to\n"
+"  -n, --client-name=NAME                How to call this client on the server\n"
+"      --stream-name=NAME                How to call this stream on the server\n"
+"      --volume=VOLUME                   Specify the initial (linear) volume in range 0...65536\n"
+"      --rate=SAMPLERATE                 The sample rate in Hz (defaults to 44100)\n"
+"      --format=SAMPLEFORMAT             The sample type, one of s16le, s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, s24le, s24be,\n"
+"                                        s24-32le, s24-32be (defaults to s16ne)\n"
+"      --channels=CHANNELS               The number of channels, 1 for mono, 2 for stereo\n"
 "                                        (defaults to 2)\n"
-"      --channel-map=CHANNELMAP          Channel map to use instead of the "
-"default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --channel-map=CHANNELMAP          Channel map to use instead of the default\n"
+"      --fix-format                      Take the sample format from the sink the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink the stream is\n"
 "                                        being connected to.\n"
-"      --fix-channels                    Take the number of channels and the "
-"channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"      --fix-channels                    Take the number of channels and the channel map\n"
+"                                        from the sink the stream is being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
-"      --no-remap                        Map channels by index instead of "
-"name.\n"
-"      --latency=BYTES                   Request the specified latency in "
-"bytes.\n"
-"      --process-time=BYTES              Request the specified process time "
-"per request in bytes.\n"
-"      --property=PROPERTY=VALUE         Set the specified property to the "
-"specified value.\n"
+"      --no-remap                        Map channels by index instead of name.\n"
+"      --latency=BYTES                   Request the specified latency in bytes.\n"
+"      --process-time=BYTES              Request the specified process time per request in bytes.\n"
+"      --property=PROPERTY=VALUE         Set the specified property to the specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
 "      --file-format=FFORMAT             Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
@@ -1397,56 +1303,34 @@
 "  -r, --record                          Cria uma conexão para gravação\n"
 "  -p, --playback                        Cria uma conexão para reprodução\n"
 "\n"
-"  -v, --verbose                         Habilita operações no modo "
-"detalhado\n"
+"  -v, --verbose                         Habilita operações no modo detalhado\n"
 "\n"
 "  -s, --server=SERVIDOR                   Nome do servidor a conectar-se\n"
-"  -d, --device=DISPOSITIVO                   O nome do destino/fonte a "
-"conectar-se\n"
-"  -n, --client-name=NOME                Como chamar este cliente no "
-"servidor\n"
+"  -d, --device=DISPOSITIVO                   O nome do destino/fonte a conectar-se\n"
+"  -n, --client-name=NOME                Como chamar este cliente no servidor\n"
 "      --stream-name=NOME               Como chamar este fluxo no servidor\n"
-"      --volume=VOLUME                   Especifica a faixa (linear) inicial "
-"de volume no intervalo 0...65536\n"
-"      --rate=TAXA_DE_AMOSTRAGEM             Taxa de amostragem em Hz (o "
-"padrão é 44100)\n"
-"      --format=FORMATO_DE_AMOSTRAGEM       Tipo de amostragem, um de s16le, "
-"s16be, u8, float32le,\n"
-"                                        float32be, ulaw, alaw, s32le, s32be, "
-"s24le, s24be,\n"
-"                                        s24-32le, s24-32be (o padrão é "
-"s16ne)\n"
-"      --channels=CANAIS               O número de canais, 1 para mono, 2 "
-"para estéreo\n"
+"      --volume=VOLUME                   Especifica a faixa (linear) inicial de volume no intervalo 0...65536\n"
+"      --rate=TAXA_DE_AMOSTRAGEM             Taxa de amostragem em Hz (o padrão é 44100)\n"
+"      --format=FORMATO_DE_AMOSTRAGEM       Tipo de amostragem, um de s16le, s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, s24le, s24be,\n"
+"                                        s24-32le, s24-32be (o padrão é s16ne)\n"
+"      --channels=CANAIS               O número de canais, 1 para mono, 2 para estéreo\n"
 "                                        (o padrão é 2)\n"
-"      --channel-map=MAPA_DE_CANAIS          Mapeamento de canais a ser usado "
-"no lugar do padrão\n"
-"      --fix-format                      Obtém o formato da amostragem do "
-"destino onde o fluxo\n"
+"      --channel-map=MAPA_DE_CANAIS          Mapeamento de canais a ser usado no lugar do padrão\n"
+"      --fix-format                      Obtém o formato da amostragem do destino onde o fluxo\n"
 "                                             está sendo conectado.\n"
-"      --fix-rate                        Obtém a taxa de amostragem do "
-"destino onde o fluxo está\n"
+"      --fix-rate                        Obtém a taxa de amostragem do destino onde o fluxo está\n"
 "                                        sendo conectado.\n"
-"      --fix-channels                    Obtém o número de canais e o mapa de "
-"canais\n"
-"                                      do destino onde o fluxo está sendo "
-"conectado.\n"
-"      --no-remix                        Não realizar upmix nem downmix dos "
-"canais.\n"
-"      --no-remap                        Mapear os canais por índice em vez "
-"de nome.\n"
-"      --latency=BYTES                   Requisitar a latência especificada "
-"em bytes.\n"
-"      --process-time=BYTES              Requisitar o tempo de processo "
-"especificado por requisições em bytes.\n"
-"      --property=PROPRIEDADE=VALOR         Define a propriedade especificada "
-"para o valor especificado.\n"
-"      --raw                             Grava/reproduz dados PCM não "
-"tratados.\n"
-"      --file-format=FORMATO_DO_ARQ.             Grava/reproduz dados PCM "
-"formatados.\n"
-"      --list-file-formats               Lista os formatos de arquivo "
-"disponíveis.\n"
+"      --fix-channels                    Obtém o número de canais e o mapa de canais\n"
+"                                      do destino onde o fluxo está sendo conectado.\n"
+"      --no-remix                        Não realizar upmix nem downmix dos canais.\n"
+"      --no-remap                        Mapear os canais por índice em vez de nome.\n"
+"      --latency=BYTES                   Requisitar a latência especificada em bytes.\n"
+"      --process-time=BYTES              Requisitar o tempo de processo especificado por requisições em bytes.\n"
+"      --property=PROPRIEDADE=VALOR         Define a propriedade especificada para o valor especificado.\n"
+"      --raw                             Grava/reproduz dados PCM não tratados.\n"
+"      --file-format=FORMATO_DO_ARQ.             Grava/reproduz dados PCM formatados.\n"
+"      --list-file-formats               Lista os formatos de arquivo disponíveis.\n"
 
 #: ../src/utils/pacat.c:731
 #, c-format
@@ -1459,7 +1343,8 @@
 "Compilado com  libpulse %s\n"
 "Linkado com libpulse %s\n"
 
-#: ../src/utils/pacat.c:764 ../src/utils/pactl.c:953
+#: ../src/utils/pacat.c:764
+#: ../src/utils/pactl.c:953
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nome do cliente \"%s\" inválido"
@@ -1521,14 +1406,11 @@
 msgstr "Falha ao abrir o arquivo de áudio."
 
 #: ../src/utils/pacat.c:959
-msgid ""
-"Warning: specified sample specification will be overwritten with "
-"specification from file."
-msgstr ""
-"Aviso: a especificação de amostragem especificada será sobrescrita pela "
-"especificação do arquivo."
+msgid "Warning: specified sample specification will be overwritten with specification from file."
+msgstr "Aviso: a especificação de amostragem especificada será sobrescrita pela especificação do arquivo."
 
-#: ../src/utils/pacat.c:962 ../src/utils/pactl.c:997
+#: ../src/utils/pacat.c:962
+#: ../src/utils/pactl.c:997
 msgid "Failed to determine sample specification from file."
 msgstr "Falha ao determinar a especificação de amostragem a partir do arquivo."
 
@@ -1546,11 +1428,8 @@
 
 #: ../src/utils/pacat.c:1008
 #, c-format
-msgid ""
-"Opening a %s stream with sample specification '%s' and channel map '%s'."
-msgstr ""
-"Abrindo um fluxo %s com a especificação de amostragem \"%s\" e mapeamento de "
-"canais \"%s\"."
+msgid "Opening a %s stream with sample specification '%s' and channel map '%s'."
+msgstr "Abrindo um fluxo %s com a especificação de amostragem \"%s\" e mapeamento de canais \"%s\"."
 
 #: ../src/utils/pacat.c:1009
 msgid "recording"
@@ -1560,7 +1439,8 @@
 msgid "playback"
 msgstr "playback"
 
-#: ../src/utils/pacat.c:1035 ../src/utils/pactl.c:1267
+#: ../src/utils/pacat.c:1035
+#: ../src/utils/pactl.c:1267
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() falhou."
 
@@ -1568,11 +1448,13 @@
 msgid "io_new() failed."
 msgstr "io_new() falhou."
 
-#: ../src/utils/pacat.c:1061 ../src/utils/pactl.c:1279
+#: ../src/utils/pacat.c:1061
+#: ../src/utils/pactl.c:1279
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() falhou."
 
-#: ../src/utils/pacat.c:1069 ../src/utils/pactl.c:1285
+#: ../src/utils/pacat.c:1069
+#: ../src/utils/pactl.c:1285
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_new() falhou: %s"
@@ -1581,7 +1463,8 @@
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() falhou."
 
-#: ../src/utils/pacat.c:1082 ../src/utils/pactl.c:1290
+#: ../src/utils/pacat.c:1082
+#: ../src/utils/pactl.c:1290
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() falhou."
 
@@ -1608,9 +1491,7 @@
 #: ../src/utils/pasuspender.c:147
 #, c-format
 msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr ""
-"AVISO: O servidor de som não é local, Sound server is not local, não está em "
-"suspenso.\n"
+msgstr "AVISO: O servidor de som não é local, Sound server is not local, não está em suspenso.\n"
 
 #: ../src/utils/pasuspender.c:159
 #, c-format
@@ -1634,8 +1515,7 @@
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
 "\n"
 msgstr ""
 "%s [options] ... \n"
@@ -1672,9 +1552,9 @@
 msgstr "pa_mainloop_run() falhou.\n"
 
 #: ../src/utils/pactl.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get statistics: %s"
-msgstr "Falha em obter as estatísticas: %s\n"
+msgstr "Falha ao obter estatísticas: %s"
 
 #: ../src/utils/pactl.c:141
 #, c-format
@@ -1692,9 +1572,9 @@
 msgstr "Tamanho do cache para amostragem: %s\n"
 
 #: ../src/utils/pactl.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get server information: %s"
-msgstr "Falha em obter a informação do servidor: %s\n"
+msgstr "Falha ao obter informações do servidor: %s"
 
 #: ../src/utils/pactl.c:164
 #, c-format
@@ -1720,9 +1600,9 @@
 "Cookie: %08x\n"
 
 #: ../src/utils/pactl.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get sink information: %s"
-msgstr "Falha em obter a informação do destino: %s\n"
+msgstr "Falha ao obter informações do destino: %s"
 
 #: ../src/utils/pactl.c:221
 #, c-format
@@ -1763,20 +1643,22 @@
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:268 ../src/utils/pactl.c:360
+#: ../src/utils/pactl.c:268
+#: ../src/utils/pactl.c:360
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortas:\n"
 
-#: ../src/utils/pactl.c:274 ../src/utils/pactl.c:366
+#: ../src/utils/pactl.c:274
+#: ../src/utils/pactl.c:366
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPorta ativa: %s\n"
 
 #: ../src/utils/pactl.c:297
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get source information: %s"
-msgstr "Falha em obter a informação da fonte: %s\n"
+msgstr "Falha ao obter informações da fonte: %s"
 
 #: ../src/utils/pactl.c:313
 #, c-format
@@ -1817,18 +1699,26 @@
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:345 ../src/utils/pactl.c:401 ../src/utils/pactl.c:436
-#: ../src/utils/pactl.c:473 ../src/utils/pactl.c:532 ../src/utils/pactl.c:533
-#: ../src/utils/pactl.c:543 ../src/utils/pactl.c:587 ../src/utils/pactl.c:588
-#: ../src/utils/pactl.c:594 ../src/utils/pactl.c:637 ../src/utils/pactl.c:638
+#: ../src/utils/pactl.c:345
+#: ../src/utils/pactl.c:401
+#: ../src/utils/pactl.c:436
+#: ../src/utils/pactl.c:473
+#: ../src/utils/pactl.c:532
+#: ../src/utils/pactl.c:533
+#: ../src/utils/pactl.c:543
+#: ../src/utils/pactl.c:587
+#: ../src/utils/pactl.c:588
+#: ../src/utils/pactl.c:594
+#: ../src/utils/pactl.c:637
+#: ../src/utils/pactl.c:638
 #: ../src/utils/pactl.c:645
 msgid "n/a"
 msgstr "n/a"
 
 #: ../src/utils/pactl.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get module information: %s"
-msgstr "Falha em obter a informação do módulo: %s\n"
+msgstr "Falha ao obter informações do módulo: %s"
 
 #: ../src/utils/pactl.c:393
 #, c-format
@@ -1848,9 +1738,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:412
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get client information: %s"
-msgstr "Falhou ao obter a informação do cliente: %s\n"
+msgstr "Falha ao obter informações do cliente: %s"
 
 #: ../src/utils/pactl.c:430
 #, c-format
@@ -1868,9 +1758,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get card information: %s"
-msgstr "Falha ao obter as informações da placa: %s\n"
+msgstr "Falha ao obter informações da placa: %s"
 
 #: ../src/utils/pactl.c:465
 #, c-format
@@ -1900,9 +1790,9 @@
 msgstr "\tPerfil ativo: %s\n"
 
 #: ../src/utils/pactl.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get sink input information: %s"
-msgstr "Falha na obtenção da informação de entrada do destino: %s\n"
+msgstr "Falha ao obter informações da entrada do destino: %s"
 
 #: ../src/utils/pactl.c:515
 #, c-format
@@ -1942,9 +1832,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:554
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get source output information: %s"
-msgstr "Falha em obter informações sobre a saída da fonte: %s\n"
+msgstr "Falha ao obter informações da saída da fonte: %s"
 
 #: ../src/utils/pactl.c:574
 #, c-format
@@ -1976,9 +1866,9 @@
 "\t\t%s\n"
 
 #: ../src/utils/pactl.c:605
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get sample information: %s"
-msgstr "Falha em obter informações sobre a amostragem: %s\n"
+msgstr "Falha ao obter informações sobre a amostragem: %s"
 
 #: ../src/utils/pactl.c:623
 #, c-format
@@ -2011,28 +1901,27 @@
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:653 ../src/utils/pactl.c:663
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:653
+#: ../src/utils/pactl.c:663
+#, c-format
 msgid "Failure: %s"
-msgstr "Falha: %s\n"
+msgstr "Falha: %s"
 
 #: ../src/utils/pactl.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to upload sample: %s"
-msgstr "Falha em carregar a amostra: %s\n"
+msgstr "Falha ao enviar a amostra: %s"
 
 #: ../src/utils/pactl.c:704
-#, fuzzy
 msgid "Premature end of file"
-msgstr "Fim prematuro do arquivo\n"
+msgstr "Fim prematuro do arquivo"
 
 #: ../src/utils/pactl.c:863
-#, fuzzy
 msgid "Got SIGINT, exiting."
-msgstr "Recebido o SIGINT, saindo.\n"
+msgstr "SIGINT recebido, saindo."
 
 #: ../src/utils/pactl.c:869
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s [options] stat\n"
 "%s [options] list\n"
@@ -2059,10 +1948,8 @@
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"  -n, --client-name=NAME                How to call this client on the "
-"server\n"
+"  -s, --server=SERVER                   The name of the server to connect to\n"
+"  -n, --client-name=NAME                How to call this client on the server\n"
 msgstr ""
 "%s [opções] stat\n"
 "%s [opções] list\n"
@@ -2070,22 +1957,27 @@
 "%s [opções] upload-sample NOME_DO_ARQUIVO [NOME]\n"
 "%s [opções] play-sample NOME [DESTINO]\n"
 "%s [opções] remove-sample NOME\n"
-"%s [opções] move-sink-input ID DESTINO\n"
-"%s [opções] move-source-output ID FONTE\n"
+"%s [opções] move-sink-input ENTRADA DESTINO\n"
+"%s [opções] move-source-output SAÍDA FONTE\n"
 "%s [opções] load-module NOME [ARGS ...]\n"
-"%s [opções] unload-module ID\n"
+"%s [opções] unload-module MÓDULO\n"
 "%s [opções] suspend-sink [DESTINO] 1|0\n"
 "%s [opções] suspend-source [FONTE] 1|0\n"
-"%s [opções] set-card-profile [PLACA] [PERFIL] \n"
-"%s [opções] set-sink-port [DESTINO] [PORTA] \n"
-"%s [opções] set-source-port [FONTE] [PORTA] \n"
+"%s [opções] set-card-profile [PLACA] [PERFIL]\n"
+"%s [opções] set-sink-port [DESTINO] [PORTA]\n"
+"%s [opções] set-source-port [FONTE] [PORTA]\n"
+"%s [opções] set-sink-volume DESTINO VOLUME\n"
+"%s [opções] set-source-volume FONTE VOLUME\n"
+"%s [opções] set-sink-input-volume ENTRADA VOLUME\n"
+"%s [opções] set-sink-mute DESTINO 1|0\n"
+"%s [opções] set-source-mute FONTE 1|0\n"
+"%s [opções] set-sink-input-mute ENTRADA 1|0\n"
 "\n"
 "  -h, --help                            Mostra essa ajuda\n"
 "      --version                        Mostra a versão\n"
 "\n"
-"  -s, --server=SERVER                   O nome do servidor a ser conectado\n"
-"  -n, --client-name=NAME                Como chamar este cliente no "
-"servidor \n"
+"  -s, --server=SERVIDOR                   O nome do servidor a ser conectado\n"
+"  -n, --client-name=NOME                Como chamar este cliente no servidor \n"
 
 #: ../src/utils/pactl.c:933
 #, c-format
@@ -2099,134 +1991,105 @@
 "Linkado com libpulse %s\n"
 
 #: ../src/utils/pactl.c:979
-#, fuzzy
 msgid "Please specify a sample file to load"
-msgstr "Por favor, especifique o arquivo de amostra a ser carregado\n"
+msgstr "Por favor, especifique um arquivo de amostra a ser carregado"
 
 #: ../src/utils/pactl.c:992
-#, fuzzy
 msgid "Failed to open sound file."
-msgstr "Falha em abrir o arquivo de som.\n"
+msgstr "Falha ao abrir o arquivo de som."
 
 #: ../src/utils/pactl.c:1004
-#, fuzzy
 msgid "Warning: Failed to determine sample specification from file."
-msgstr ""
-"Aviso: falha ao determinar a especificação da amostragem a partir do "
-"arquivo.\n"
+msgstr "Aviso: falha ao determinar a especificação da amostragem a partir do arquivo."
 
 #: ../src/utils/pactl.c:1014
-#, fuzzy
 msgid "You have to specify a sample name to play"
-msgstr "Você deve especificar um nome da amostra para ser executada\n"
+msgstr "Você deve especificar um nome para amostra a ser reproduzida"
 
 #: ../src/utils/pactl.c:1026
-#, fuzzy
 msgid "You have to specify a sample name to remove"
-msgstr "Você deve especificar um nome da amostra para ser removida\n"
+msgstr "Você deve especificar um nome para a amostra a ser removida"
 
 #: ../src/utils/pactl.c:1035
-#, fuzzy
 msgid "You have to specify a sink input index and a sink"
-msgstr "Você tem que especificar a entrada para o destino e um destino\n"
+msgstr "Você deve especificar a entrada do destino e um destino"
 
 #: ../src/utils/pactl.c:1045
-#, fuzzy
 msgid "You have to specify a source output index and a source"
-msgstr "Você tem que especificar um índice de saída da fonte e uma fonte\n"
+msgstr "Você deve especificar um índice de saída da fonte e uma fonte"
 
 #: ../src/utils/pactl.c:1060
-#, fuzzy
 msgid "You have to specify a module name and arguments."
-msgstr "Você deve especificar um nome do módulo e seus argumentos\n"
+msgstr "Você deve especificar um nome para o módulo e seus argumentos."
 
 #: ../src/utils/pactl.c:1080
-#, fuzzy
 msgid "You have to specify a module index"
-msgstr "Você deve especificar um índice de um módulo\n"
+msgstr "Você deve especificar um índice do módulo"
 
 #: ../src/utils/pactl.c:1090
-#, fuzzy
-msgid ""
-"You may not specify more than one sink. You have to specify a boolean value."
-msgstr ""
-"Você não pode especificar mais de um destino. Você tem que especificar um "
-"valor booleano.\n"
+msgid "You may not specify more than one sink. You have to specify a boolean value."
+msgstr "Você não pode especificar mais de um destino. Você deve especificar um valor booleano."
 
 #: ../src/utils/pactl.c:1103
-#, fuzzy
-msgid ""
-"You may not specify more than one source. You have to specify a boolean "
-"value."
-msgstr ""
-"Você não pode especificar mais de uma fonte. Você tem que especificar um "
-"valor booleano.\n"
+msgid "You may not specify more than one source. You have to specify a boolean value."
+msgstr "Você não pode especificar mais de uma fonte. Você deve especificar um valor booleano."
 
 #: ../src/utils/pactl.c:1115
-#, fuzzy
 msgid "You have to specify a card name/index and a profile name"
-msgstr "Você tem que especificar um nome/índice da placa e um nome de perfil\n"
+msgstr "Você deve especificar um nome/índice para a placa e um nome de perfil"
 
 #: ../src/utils/pactl.c:1126
-#, fuzzy
 msgid "You have to specify a sink name/index and a port name"
-msgstr "Você tem que especificar um nome/índice do destino e o nome da porta\n"
+msgstr "Você deve especificar um nome/índice do destino e o nome da porta"
 
 #: ../src/utils/pactl.c:1137
-#, fuzzy
 msgid "You have to specify a source name/index and a port name"
-msgstr "Você tem que especificar um nome/índice da fonte e o nome da porta\n"
+msgstr "Você deve especificar um nome/índice da fonte e o nome da porta"
 
 #: ../src/utils/pactl.c:1149
-#, fuzzy
 msgid "You have to specify a sink name/index and a volume"
-msgstr "Você tem que especificar um nome/índice do destino e o nome da porta\n"
+msgstr "Você deve especificar um nome/índice do destino e um volume"
 
-#: ../src/utils/pactl.c:1154 ../src/utils/pactl.c:1171
-#: ../src/utils/pactl.c:1193 ../src/utils/pactl.c:1209
-#: ../src/utils/pactl.c:1226 ../src/utils/pactl.c:1248
-#, fuzzy
+#: ../src/utils/pactl.c:1154
+#: ../src/utils/pactl.c:1171
+#: ../src/utils/pactl.c:1193
+#: ../src/utils/pactl.c:1209
+#: ../src/utils/pactl.c:1226
+#: ../src/utils/pactl.c:1248
 msgid "Invalid volume specification"
-msgstr "Especificação de amostragem inválida"
+msgstr "Especificação de volume inválida"
 
 #: ../src/utils/pactl.c:1166
-#, fuzzy
 msgid "You have to specify a source name/index and a volume"
-msgstr "Você tem que especificar um nome/índice da fonte e o nome da porta\n"
+msgstr "Você deve especificar um nome/índice da fonte e um volume"
 
 #: ../src/utils/pactl.c:1183
-#, fuzzy
 msgid "You have to specify a sink input index and a volume"
-msgstr "Você tem que especificar a entrada para o destino e um destino\n"
+msgstr "Você deve especificar um índice de entrada para o destino e um volume"
 
 #: ../src/utils/pactl.c:1188
 msgid "Invalid sink input index"
-msgstr ""
+msgstr "Índice de entrada de destino inválido"
 
 #: ../src/utils/pactl.c:1204
-#, fuzzy
 msgid "You have to specify a sink name/index and a mute boolean"
-msgstr "Você tem que especificar um nome/índice do destino e o nome da porta\n"
+msgstr "Você deve especificar um nome/índice do destino e um booleano do mudo"
 
 #: ../src/utils/pactl.c:1221
-#, fuzzy
 msgid "You have to specify a source name/index and a mute boolean"
-msgstr "Você tem que especificar um nome/índice da fonte e o nome da porta\n"
+msgstr "Você deve especificar um nome/índice da fonte e um booleano do mudo"
 
 #: ../src/utils/pactl.c:1238
-#, fuzzy
 msgid "You have to specify a sink input index and a mute boolean"
-msgstr "Você tem que especificar a entrada para o destino e um destino\n"
+msgstr "Você deve especificar um índice de entrada para o destino e um booleano do mudo"
 
 #: ../src/utils/pactl.c:1243
-#, fuzzy
 msgid "Invalid sink input index specification"
-msgstr "Especificação de amostragem inválida"
+msgstr "Especificação do índice de entrada de destino inválida"
 
 #: ../src/utils/pactl.c:1262
-#, fuzzy
 msgid "No valid command specified."
-msgstr "Nenhum comando válido especificado.\n"
+msgstr "Nenhum comando válido especificado."
 
 #: ../src/utils/pax11publish.c:61
 #, c-format
@@ -2235,17 +2098,14 @@
 "\n"
 " -d    Show current PulseAudio data attached to X11 display (default)\n"
 " -e    Export local PulseAudio data to X11 display\n"
-" -i    Import PulseAudio data from X11 display to local environment "
-"variables and cookie file.\n"
+" -i    Import PulseAudio data from X11 display to local environment variables and cookie file.\n"
 " -r    Remove PulseAudio data from X11 display\n"
 msgstr ""
 "%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
 "\n"
-" -d    Mostra os dados atuais do PulseAudio associados ao display X11 "
-"(padrão)\n"
+" -d    Mostra os dados atuais do PulseAudio associados ao display X11 (padrão)\n"
 " -e    Exporta os dados locais do PulseAudio para um display X11 \n"
-" -i     Importa os dados do PulseAudio de um display X11 para as variáveis "
-"de ambiente locais e para o arquivo de cookie.\n"
+" -i     Importa os dados do PulseAudio de um display X11 para as variáveis de ambiente locais e para o arquivo de cookie.\n"
 " -r    Remove os dados do PulseAudio do display X11\n"
 
 #: ../src/utils/pax11publish.c:94
@@ -2310,9 +2170,7 @@
 
 #: ../src/utils/pacmd.c:69
 msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr ""
-"Nenhum daemon do PulseAudio em execução ou não está em execução como daemon "
-"de sessão."
+msgstr "Nenhum daemon do PulseAudio em execução ou não está em execução como daemon de sessão."
 
 #: ../src/utils/pacmd.c:74
 #, c-format
@@ -2337,53 +2195,46 @@
 msgid "poll(): %s"
 msgstr "poll(): %s"
 
-#: ../src/utils/pacmd.c:171 ../src/utils/pacmd.c:188
+#: ../src/utils/pacmd.c:171
+#: ../src/utils/pacmd.c:188
 #, c-format
 msgid "read(): %s"
 msgstr "read(): %s"
 
-#: ../src/utils/pacmd.c:207 ../src/utils/pacmd.c:223
+#: ../src/utils/pacmd.c:207
+#: ../src/utils/pacmd.c:223
 #, c-format
 msgid "write(): %s"
 msgstr "write(): %s"
 
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:219
+#: ../src/pulsecore/lock-autospawn.c:136
+#: ../src/pulsecore/lock-autospawn.c:219
 msgid "Cannot access autospawn lock."
 msgstr "Não foi possível acessar a trava de autogeração."
 
-#: ../src/modules/alsa/alsa-sink.c:530 ../src/modules/alsa/alsa-sink.c:689
+#: ../src/modules/alsa/alsa-sink.c:530
+#: ../src/modules/alsa/alsa-sink.c:689
 #, c-format
 msgid ""
-"ALSA woke us up to write new data to the device, but there was actually "
-"nothing to write!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
-"O ALSA nos acordou para gravar novos dados no dispositivo, mas não há nada a "
-"ser gravado!\n"
-"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
-"relate esse problema para os desenvolvedores do ALSA.\n"
-"Nós fomos acordados com o conjunto POLLOUT -- entretanto, a snd_pcm_avail() "
-"subseqüente retornou 0 ou outro valor < min_avail."
-
-#: ../src/modules/alsa/alsa-source.c:506 ../src/modules/alsa/alsa-source.c:656
-#, c-format
-msgid ""
-"ALSA woke us up to read new data from the device, but there was actually "
-"nothing to read!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
-"O ALSA nos acordou para ler novos dados no dispositivo, mas não há nada a "
-"ser lido!\n"
-"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
-"relate esse problema para os desenvolvedores do ALSA.\n"
-"Nós fomos acordados com o conjunto POLLIN -- entretanto, a snd_pcm_avail() "
-"subseqüente retornou 0 ou outro valor < min_avail."
+"ALSA woke us up to write new data to the device, but there was actually nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail."
+msgstr ""
+"O ALSA nos acordou para gravar novos dados no dispositivo, mas não há nada a ser gravado!\n"
+"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, relate esse problema para os desenvolvedores do ALSA.\n"
+"Nós fomos acordados com o conjunto POLLOUT -- entretanto, a snd_pcm_avail() subseqüente retornou 0 ou outro valor < min_avail."
+
+#: ../src/modules/alsa/alsa-source.c:506
+#: ../src/modules/alsa/alsa-source.c:656
+#, c-format
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail."
+msgstr ""
+"O ALSA nos acordou para ler novos dados no dispositivo, mas não há nada a ser lido!\n"
+"É mais provável que isso seja um erro no driver \"%s\" do ALSA. Por favor, relate esse problema para os desenvolvedores do ALSA.\n"
+"Nós fomos acordados com o conjunto POLLIN -- entretanto, a snd_pcm_avail() subseqüente retornou 0 ou outro valor < min_avail."
 
 #: ../src/modules/alsa/module-alsa-card.c:152
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2228
@@ -2396,9 +2247,8 @@
 msgstr "Reprodução de alta fidelidade (A2DP)"
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2198
-#, fuzzy
 msgid "High Fidelity Capture (A2DP)"
-msgstr "Reprodução de alta fidelidade (A2DP)"
+msgstr "Captura de alta fidelidade (A2DP)"
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2213
 msgid "Telephony Duplex (HSP/HFP)"
@@ -2411,350 +2261,301 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Dispositivos de saída"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
 msgid "Input Devices"
-msgstr ""
+msgstr "Dispositivos de entrada"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Áudio em @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
 msgid "Input"
-msgstr ""
+msgstr "Entrada"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Entrada da base de encaixe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Microfone da base de encaixe"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Entrada de linha"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Microfone"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Microfone externo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Áudio interno"
+msgstr "Microfone interno"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Rádio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Ganho de controle automático"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Sem ganho de controle automático"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Impulso"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Sem impulso"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Amplificador"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Sem amplificador"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
 msgid "Analog Input"
-msgstr ""
+msgstr "Entrada analógica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
 msgid "Analog Microphone"
-msgstr ""
+msgstr "Microfone analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
 msgid "Analog Line-In"
-msgstr ""
+msgstr "Entrada de linha analógica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
 msgid "Analog Radio"
-msgstr ""
+msgstr "Rádio analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
 msgid "Analog Video"
-msgstr ""
+msgstr "Vídeo analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
 msgid "Analog Output"
-msgstr ""
+msgstr "Saída analógica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
 msgid "Analog Headphones"
-msgstr ""
+msgstr "Fones de ouvido analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Saída analógica (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Saída analógica monofônica"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
-#: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#: ../src/modules/alsa/alsa-mixer.c:1984
+#: ../src/modules/alsa/alsa-mixer.c:3404
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
-msgstr ""
+msgstr "Monofônico analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2791
-#, fuzzy
 msgid "Analog Stereo"
-msgstr "Stereo"
+msgstr "Estéreo analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Surround 4.1"
+msgstr "Surround analógico 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Surround 4.0"
+msgstr "Surround analógico 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Surround 4.1"
+msgstr "Surround analógico 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
-#, fuzzy
 msgid "Analog Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Surround analógico 4.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2796
-#, fuzzy
 msgid "Analog Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Surround analógico 4.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2797
-#, fuzzy
 msgid "Analog Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Surround analógico 5.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2798
-#, fuzzy
 msgid "Analog Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Surround analógico 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Surround 4.0"
+msgstr "Surround analógico 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Surround 4.1"
+msgstr "Surround analógico 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Surround 4.0"
+msgstr "Surround analógico 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
-#, fuzzy
 msgid "Analog Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Surround analógico 7.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2803
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Estéreo digital (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr ""
+msgstr "Surround 4.0 digital (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Surround digital 4.0 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2806
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Surround digital 5.1 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2807
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Estéreo digital (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Duplex monofônico analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Duplex estéreo analógico"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Duplex estéreo digital (IEC958)"
 
 #~ msgid "Invalid client name '%s'\n"
 #~ msgstr "Nome do cliente \"%s\" inválido\n"
-
 #~ msgid "Failed to determine sample specification from file.\n"
 #~ msgstr ""
 #~ "Falha ao determinar a especificação de amostragem a partir do arquivo.\n"
-
 #~ msgid "select(): %s"
 #~ msgstr "select(): %s"
-
 #~ msgid "Cannot connect to system bus: %s"
 #~ msgstr "Não foi possível conectar com o barramento do sistema: %s"
-
 #~ msgid "Cannot get caller from PID: %s"
 #~ msgstr "Não foi possível obter quem chamou pelo PID: %s"
-
 #~ msgid "Cannot set UID on caller object."
 #~ msgstr "Não foi possível definir o UID sobre o objeto que chamou."
-
 #~ msgid "Failed to get CK session."
 #~ msgstr "Falha em obter a sessão CK."
-
 #~ msgid "Cannot set UID on session object."
 #~ msgstr "Não foi possível definir o UID do objeto da sessão."
-
 #~ msgid "Cannot allocate PolKitAction."
 #~ msgstr "Não foi possível alocar o PolKitAction."
-
 #~ msgid "Cannot set action_id"
 #~ msgstr "Não foi possível definir a action_id"
-
 #~ msgid "Cannot allocate PolKitContext."
 #~ msgstr "Não foi possível alocar o PolKitContext."
-
 #~ msgid "Cannot initialize PolKitContext: %s"
 #~ msgstr "Não foi possível iniciar o PolKitContext: %s"
-
 #~ msgid "Could not determine whether caller is authorized: %s"
 #~ msgstr "Não foi possível determinar se o solicitante está autorizado: %s"
-
 #~ msgid "Cannot obtain auth: %s"
 #~ msgstr "Não foi possível obter auth: %s"
-
 #~ msgid "PolicyKit responded with '%s'"
 #~ msgstr "PolicyKit respondeu com '%s'"
-
 #~ msgid ""
 #~ "High-priority scheduling (negative Unix nice level) for the PulseAudio "
 #~ "daemon"
 #~ msgstr ""
 #~ "Escalonamento de alta prioridade (nível de nice Unix negativo) para o "
 #~ "daemon do PulseAudio"
-
 #~ msgid "Real-time scheduling for the PulseAudio daemon"
 #~ msgstr "Escalonamento em tempo real para o daemon do PulseAudio"
-
 #~ msgid ""
 #~ "System policy prevents PulseAudio from acquiring high-priority scheduling."
 #~ msgstr ""
 #~ "Uma política do sistema impede que o PulseAudio adquira escalonamento de "
 #~ "alta prioridade."
-
 #~ msgid ""
 #~ "System policy prevents PulseAudio from acquiring real-time scheduling."
 #~ msgstr ""
 #~ "Uma política do sistema impede que o PulseAudio adquira o escalonamento "
 #~ "em tempo real."
-
 #~ msgid "read() failed: %s\n"
 #~ msgstr "read() falhou: %s\n"
-
 #~ msgid "pa_context_connect() failed: %s\n"
 #~ msgstr "pa_context_connect() falhou: %s\n"
-
 #~ msgid "We're in the group '%s', allowing high-priority scheduling."
 #~ msgstr "Estamos no grupo '%s', permitindo escalonamento de alta prioridade."
-
 #~ msgid "We're in the group '%s', allowing real-time scheduling."
 #~ msgstr "Estamos no grupo '%s', permitindo escalonamento em tempo real."
-
 #~ msgid "PolicyKit grants us acquire-high-priority privilege."
 #~ msgstr ""
 #~ "O PolicyKit assegura-nos a aquisição de privilégio de alta prioridade."
-
 #~ msgid "PolicyKit refuses acquire-high-priority privilege."
 #~ msgstr "O PolicyKit recusa a aquisição de privilégios de alta prioridade."
-
 #~ msgid "PolicyKit grants us acquire-real-time privilege."
 #~ msgstr "O PolicyKit assegura-nos a aquisição de privilégios de tempo-real."
-
 #~ msgid "PolicyKit refuses acquire-real-time privilege."
 #~ msgstr "O PolicyKit recusa a aquisição de privilégios de tempo real."
-
 #~ msgid ""
 #~ "High-priority scheduling enabled in configuration but not allowed by "
 #~ "policy."
 #~ msgstr ""
 #~ "O escalonamento de alta prioridade foi habilitado para esta configuração, "
 #~ "mas não é permitida pela política."
-
 #~ msgid "Successfully increased RLIMIT_RTPRIO"
 #~ msgstr "RLIMIT_RTPRIO aumentado com sucesso"
-
 #~ msgid "RLIMIT_RTPRIO failed: %s"
 #~ msgstr "RLIMIT_RTPRIO falhou: %s"
-
 #~ msgid "Giving up CAP_NICE"
 #~ msgstr "Abandonando CAP_NICE"
-
 #~ msgid ""
 #~ "Real-time scheduling enabled in configuration but not allowed by policy."
 #~ msgstr ""
 #~ "O escalonamento de tempo real foi habilitado pela configuração, mas não é "
 #~ "permitido pela política."
-
 #~ msgid "Limited capabilities successfully to CAP_SYS_NICE."
 #~ msgstr "As capacidades foram limitadas com sucesso para CAP_SYS_NICE."
-
 #~ msgid "time_new() failed.\n"
 #~ msgstr "time_new() falhou.\n"
-
 #~ msgid "Stream successfully created\n"
 #~ msgstr "Fluxo criado com sucesso\n"
-
 #~ msgid "Stream errror: %s\n"
 #~ msgstr "Erro de fluxo: %s\n"
-
 #~ msgid "Connection established.\n"
 #~ msgstr "Conexão estabelecida.\n"
-
 #~ msgid ""
 #~ "%s [options] [FILE]\n"
 #~ "\n"
@@ -2793,7 +2594,6 @@
 #~ "      --volume=VOLUME                   Especifica o volume inicial "
 #~ "(linear) no intervalo 0...65536\n"
 #~ "      --channel-map=CHANNELMAP          Define o mapa do canal para uso\n"
-
 #~ msgid ""
 #~ "paplay %s\n"
 #~ "Compiled with libpulse %s\n"
@@ -2802,16 +2602,12 @@
 #~ "paplay %s\n"
 #~ "Compilado com libpulse %s\n"
 #~ "Linkado com  libpulse %s\n"
-
 #~ msgid "Invalid channel map\n"
 #~ msgstr "Mapa de canais inválido\n"
-
 #~ msgid "Failed to open file '%s'\n"
 #~ msgstr "Falha ao abrir o arquivo '%s'\n"
-
 #~ msgid "Channel map doesn't match file.\n"
 #~ msgstr "O mapa dos canais não coincide com o arquivo.\n"
-
 #~ msgid "Using sample spec '%s'\n"
 #~ msgstr "Usando a especificação da amostragem '%s'\n"
 
@@ -2830,19 +2626,14 @@
 #, fuzzy
 #~ msgid "--log-time boolean argument"
 #~ msgstr "--disallow-exit argumento booleano"
-
 #~ msgid "Default sink name (%s) does not exist in name register."
 #~ msgstr "O nome padrão do destino (%s) não existe no registro de nomes."
-
 #~ msgid "Buffer overrun, dropping incoming data\n"
 #~ msgstr "Houve estouro de buffer, os dados que chegaram foram descartados\n"
-
 #~ msgid "pa_stream_drop() failed: %s\n"
 #~ msgstr "pa_stream_drop() falhou: %s\n"
-
 #~ msgid "muted"
 #~ msgstr "mudo"
-
 #~ msgid ""
 #~ "*** Autoload Entry #%u ***\n"
 #~ "Name: %s\n"
@@ -2855,13 +2646,10 @@
 #~ "Tipo: %s\n"
 #~ "Módulo: %s\n"
 #~ "Argumento: %s\n"
-
 #~ msgid "sink"
 #~ msgstr "destino"
-
 #~ msgid "source"
 #~ msgstr "fonte"
-
 #~ msgid ""
 #~ "' and PolicyKit refuse to grant us priviliges. Dropping SUID again.\n"
 #~ "For enabling real-time scheduling please acquire the appropriate "
@@ -2871,13 +2659,12 @@
 #~ "outra vez.\n"
 #~ " Para habilitar o escalonamento em tempo real, por favo, adquira os "
 #~ "privilégios adequados pelo PolicyKit, ou torne-se membro do'"
-
 #~ msgid ""
 #~ "', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this "
 #~ "user."
 #~ msgstr ""
 #~ "', ou eleve o RLIMIT_NICE/RLIMIT_RTPRIO dos limites do recurso para este "
 #~ "usuário."
-
 #~ msgid "socketpair(): %s"
 #~ msgstr "socketpair(): %s"
+
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/sr@latin.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/sr@latin.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/sr@latin.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/sr@latin.po	2010-01-15 23:21:18.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-16 22:10+0100\n"
+"POT-Creation-Date: 2009-10-30 10:22+0000\n"
+"PO-Revision-Date: 2009-10-30 22:51+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -2371,7 +2371,7 @@
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2213
 msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Dvostrano telefoniranje (HSP/HFP)"
+msgstr "Dvosmerno telefoniranje (HSP/HFP)"
 
 #: ../src/modules/reserve-wrap.c:151
 msgid "PulseAudio Sound Server"
@@ -2380,217 +2380,203 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Izlazni uređaji"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
 msgid "Input Devices"
-msgstr ""
+msgstr "Ulazni uređaji"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Audio na @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
 msgid "Input"
-msgstr ""
+msgstr "Ulaz"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Ulaz priključne stanice"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Mikrofon priključne stanice"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Linija u"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Spoljni mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Unutrašnji zvuk"
+msgstr "Unutrašnji mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Samostalna kontrola pojačanja"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Bez samostalne kontrole pojačanja"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Podizanje"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Bez podizanja"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Pojačalo"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Bez pojačala"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
 msgid "Analog Input"
-msgstr ""
+msgstr "Analogni ulaz"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
 msgid "Analog Microphone"
-msgstr ""
+msgstr "Analogni mikrofon"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
 msgid "Analog Line-In"
-msgstr ""
+msgstr "Analogna linija u"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
 msgid "Analog Radio"
-msgstr ""
+msgstr "Analogni radio"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
 msgid "Analog Video"
-msgstr ""
+msgstr "Analogni video"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Prazan izlaz"
+msgstr "Analogni izlaz"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
 msgid "Analog Headphones"
-msgstr ""
+msgstr "Analogne slušalice"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Analogni izlaz (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Analogni mono izlaz"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
-msgstr ""
+msgstr "Analogni mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:2791
-#, fuzzy
 msgid "Analog Stereo"
-msgstr "Stereo"
+msgstr "Analogni stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Okružujući 4.1"
+msgstr "Analogni okružujući 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Okružujući 4.0"
+msgstr "Analogni okružujući 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Okružujući 4.1"
+msgstr "Analogni okružujući 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
-#, fuzzy
 msgid "Analog Surround 4.0"
-msgstr "Okružujući 4.0"
+msgstr "Analogni okružujući 4.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2796
-#, fuzzy
 msgid "Analog Surround 4.1"
-msgstr "Okružujući 4.1"
+msgstr "Analogni okružujući 4.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2797
-#, fuzzy
 msgid "Analog Surround 5.0"
-msgstr "Okružujući 5.0"
+msgstr "Analogni okružujući 5.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2798
-#, fuzzy
 msgid "Analog Surround 5.1"
-msgstr "Okružujući 5.1"
+msgstr "Analogni okružujući 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Okružujući 4.0"
+msgstr "Analogni okružujući 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Okružujući 4.1"
+msgstr "Analogni okružujući 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Okružujući 4.0"
+msgstr "Analogni okružujući 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
-#, fuzzy
 msgid "Analog Surround 7.1"
-msgstr "Okružujući 7.1"
+msgstr "Analogni okružujući 7.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2803
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Digitalni stereo (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr ""
+msgstr "Digitalni okružujući 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Digitalni okružujući 4.0 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2806
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Digitalni okružujući 5.1 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2807
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Digitalni stereo (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Dvosmerni analogni mono"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Dvosmerni analogni stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Dvosmerni digitalni stereo (IEC958)"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/sr.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/sr.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/sr.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/sr.po	2010-01-15 23:21:18.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-16 22:10+0100\n"
+"POT-Creation-Date: 2009-10-30 10:22+0000\n"
+"PO-Revision-Date: 2009-10-30 22:51+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -2368,7 +2368,7 @@
 
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2213
 msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Двострано телефонирање (HSP/HFP)"
+msgstr "Двосмерно телефонирање (HSP/HFP)"
 
 #: ../src/modules/reserve-wrap.c:151
 msgid "PulseAudio Sound Server"
@@ -2377,217 +2377,203 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Излазни уређаји"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
 msgid "Input Devices"
-msgstr ""
+msgstr "Улазни уређаји"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Аудио на @HOSTNAME@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
 msgid "Input"
-msgstr ""
+msgstr "Улаз"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Улаз прикључне станице"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Микрофон прикључне станице"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Линија у"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Микрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Спољни микрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Унутрашњи звук"
+msgstr "Унутрашњи микрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Радио"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Видео"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Самостална контрола појачања"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Без самосталне контроле појачања"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Подизање"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Без подизања"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Појачало"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Без појачала"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
 msgid "Analog Input"
-msgstr ""
+msgstr "Аналогни улаз"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
 msgid "Analog Microphone"
-msgstr ""
+msgstr "Аналогни микрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
 msgid "Analog Line-In"
-msgstr ""
+msgstr "Аналогна линија у"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
 msgid "Analog Radio"
-msgstr ""
+msgstr "Аналогни радио"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
 msgid "Analog Video"
-msgstr ""
+msgstr "Аналогни видео"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Празан излаз"
+msgstr "Аналогни излаз"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
 msgid "Analog Headphones"
-msgstr ""
+msgstr "Аналогне слушалице"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Аналогни излаз (LFE)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Аналогни моно излаз"
 
 #: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
 #: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
-msgstr ""
+msgstr "Аналогни моно"
 
 #: ../src/modules/alsa/alsa-mixer.c:2791
-#, fuzzy
 msgid "Analog Stereo"
-msgstr "Стерео"
+msgstr "Аналогни стерео"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Окружујући 4.1"
+msgstr "Аналогни окружујући 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Окружујући 4.0"
+msgstr "Аналогни окружујући 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Окружујући 4.1"
+msgstr "Аналогни окружујући 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
-#, fuzzy
 msgid "Analog Surround 4.0"
-msgstr "Окружујући 4.0"
+msgstr "Аналогни окружујући 4.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2796
-#, fuzzy
 msgid "Analog Surround 4.1"
-msgstr "Окружујући 4.1"
+msgstr "Аналогни окружујући 4.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2797
-#, fuzzy
 msgid "Analog Surround 5.0"
-msgstr "Окружујући 5.0"
+msgstr "Аналогни окружујући 5.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2798
-#, fuzzy
 msgid "Analog Surround 5.1"
-msgstr "Окружујући 5.1"
+msgstr "Аналогни окружујући 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Окружујући 4.0"
+msgstr "Аналогни окружујући 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Окружујући 4.1"
+msgstr "Аналогни окружујући 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Окружујући 4.0"
+msgstr "Аналогни окружујући 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
-#, fuzzy
 msgid "Analog Surround 7.1"
-msgstr "Окружујући 7.1"
+msgstr "Аналогни окружујући 7.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2803
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Дигитални стерео (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr ""
+msgstr "Дигитални окружујући 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Дигитални окружујући 4.0 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2806
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Дигитални окружујући 5.1 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2807
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Дигитални стерео (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Двосмерни аналогни моно"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Двосмерни аналогни стерео"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Двосмерни дигитални стерео (IEC958)"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/po/uk.po pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/uk.po
--- pulseaudio-0.9.22~0.9.21+341-g62bf/po/uk.po	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/po/uk.po	2010-01-15 23:21:18.000000000 +0000
@@ -6,16 +6,16 @@
 msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 23:47+0200\n"
-"PO-Revision-Date: 2009-09-11 17:38+0300\n"
+"POT-Creation-Date: 2009-10-03 10:02+0000\n"
+"PO-Revision-Date: 2009-10-03 19:28+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 "
+"&& (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../src/modules/alsa/alsa-util.c:858 ../src/pulsecore/sink.c:2629
 #, c-format
@@ -224,8 +224,7 @@
 
 #: ../src/daemon/main.c:583
 msgid "Running in system mode, but --disallow-exit not set!"
-msgstr ""
-"Запуск у загальносистемному режимі, але не встановлено --disallow-exit!"
+msgstr "Запуск у загальносистемному режимі, але не встановлено --disallow-exit!"
 
 #: ../src/daemon/main.c:586
 msgid "Running in system mode, but --disallow-module-loading not set!"
@@ -1168,8 +1167,7 @@
 
 #: ../src/pulse/context.c:550
 msgid "No cookie loaded. Attempting to connect without."
-msgstr ""
-"Куків не завантажено. Буде виконано спробу з’єднання за їх відсутності."
+msgstr "Куків не завантажено. Буде виконано спробу з’єднання за їх відсутності."
 
 #: ../src/pulse/context.c:693
 #, c-format
@@ -1343,8 +1341,7 @@
 #: ../src/utils/pacat.c:599
 #, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
-msgstr ""
-"Спроба виконання pa_stream_update_timing_info() завершилася невдало: %s"
+msgstr "Спроба виконання pa_stream_update_timing_info() завершилася невдало: %s"
 
 #: ../src/utils/pacat.c:609
 #, c-format
@@ -1558,10 +1555,8 @@
 
 #: ../src/utils/pacat.c:1008
 #, c-format
-msgid ""
-"Opening a %s stream with sample specification '%s' and channel map '%s'."
-msgstr ""
-"Відкриття потоку %s з частотною специфікацією «%s» і картою каналів «%s»."
+msgid "Opening a %s stream with sample specification '%s' and channel map '%s'."
+msgstr "Відкриття потоку %s з частотною специфікацією «%s» і картою каналів «%s»."
 
 #: ../src/utils/pacat.c:1009
 msgid "recording"
@@ -1635,8 +1630,7 @@
 #: ../src/utils/pasuspender.c:194
 #, c-format
 msgid "WARNING: Child process terminated by signal %u\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: виконання дочірнього процесу було перервано з сигналом %u\n"
+msgstr "ПОПЕРЕДЖЕННЯ: виконання дочірнього процесу було перервано з сигналом %u\n"
 
 #: ../src/utils/pasuspender.c:212
 #, c-format
@@ -1696,8 +1690,7 @@
 #: ../src/utils/pactl.c:144
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
-msgstr ""
-"Виділено протягом виконання загалом: %u блоків, що містять %s байтів.\n"
+msgstr "Виділено протягом виконання загалом: %u блоків, що містять %s байтів.\n"
 
 #: ../src/utils/pactl.c:147
 #, c-format
@@ -2203,18 +2196,15 @@
 
 #: ../src/utils/pactl.c:1204
 msgid "You have to specify a sink name/index and a mute boolean"
-msgstr ""
-"Вам слід вказати назву/індекс приймача і булеве значення вимикання звуку"
+msgstr "Вам слід вказати назву/індекс приймача і булеве значення вимикання звуку"
 
 #: ../src/utils/pactl.c:1221
 msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
-"Вам слід вказати назву/індекс джерела і булеве значення вимикання звуку"
+msgstr "Вам слід вказати назву/індекс джерела і булеве значення вимикання звуку"
 
 #: ../src/utils/pactl.c:1238
 msgid "You have to specify a sink input index and a mute boolean"
-msgstr ""
-"Вам слід вказати індекс приймача даних і булеве значення вимикання звуку"
+msgstr "Вам слід вказати індекс приймача даних і булеве значення вимикання звуку"
 
 #: ../src/utils/pactl.c:1243
 msgid "Invalid sink input index specification"
@@ -2323,8 +2313,7 @@
 
 #: ../src/utils/pacmd.c:99
 msgid "Failed to kill PulseAudio daemon."
-msgstr ""
-"Спроба завершення роботи фонової служби PulseAudio завершилася невдало."
+msgstr "Спроба завершення роботи фонової служби PulseAudio завершилася невдало."
 
 #: ../src/utils/pacmd.c:107
 msgid "Daemon not responding."
@@ -2408,217 +2397,202 @@
 #: ../src/modules/module-rygel-media-server.c:569
 #: ../src/modules/module-rygel-media-server.c:583
 msgid "Output Devices"
-msgstr ""
+msgstr "Пристрої відтворення"
 
 #: ../src/modules/module-rygel-media-server.c:570
 #: ../src/modules/module-rygel-media-server.c:584
 msgid "Input Devices"
-msgstr ""
+msgstr "Пристрої отримання"
 
 #: ../src/modules/module-rygel-media-server.c:774
 msgid "Audio on @HOSTNAME@"
-msgstr ""
+msgstr "Звук на @НАЗВАВУЗЛА@"
 
 #: ../src/modules/alsa/alsa-mixer.c:1701
 msgid "Input"
-msgstr ""
+msgstr "Вхід"
 
 #: ../src/modules/alsa/alsa-mixer.c:1702
 msgid "Docking Station Input"
-msgstr ""
+msgstr "Вхідний канал стикувальної станції"
 
 #: ../src/modules/alsa/alsa-mixer.c:1703
 msgid "Docking Station Microphone"
-msgstr ""
+msgstr "Мікрофон стикувальної станції"
 
 #: ../src/modules/alsa/alsa-mixer.c:1704
 msgid "Line-In"
-msgstr ""
+msgstr "Лінійний вхід"
 
 #: ../src/modules/alsa/alsa-mixer.c:1705
 msgid "Microphone"
-msgstr ""
+msgstr "Мікрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1706
 msgid "External Microphone"
-msgstr ""
+msgstr "Зовнішній мікрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1707
-#, fuzzy
 msgid "Internal Microphone"
-msgstr "Вбудоване аудіо"
+msgstr "Вбудований мікрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1708
 msgid "Radio"
-msgstr ""
+msgstr "Радіо"
 
 #: ../src/modules/alsa/alsa-mixer.c:1709
 msgid "Video"
-msgstr ""
+msgstr "Відео"
 
 #: ../src/modules/alsa/alsa-mixer.c:1710
 msgid "Automatic Gain Control"
-msgstr ""
+msgstr "Автоматичне керування підсиленням"
 
 #: ../src/modules/alsa/alsa-mixer.c:1711
 msgid "No Automatic Gain Control"
-msgstr ""
+msgstr "Без автоматичного керування підсиленням"
 
 #: ../src/modules/alsa/alsa-mixer.c:1712
 msgid "Boost"
-msgstr ""
+msgstr "Підсилення"
 
 #: ../src/modules/alsa/alsa-mixer.c:1713
 msgid "No Boost"
-msgstr ""
+msgstr "Без пісилення"
 
 #: ../src/modules/alsa/alsa-mixer.c:1714
 msgid "Amplifier"
-msgstr ""
+msgstr "Підсилювач"
 
 #: ../src/modules/alsa/alsa-mixer.c:1715
 msgid "No Amplifier"
-msgstr ""
+msgstr "Без підсилювача"
 
 #: ../src/modules/alsa/alsa-mixer.c:1773
 msgid "Analog Input"
-msgstr ""
+msgstr "Аналогових вхід"
 
 #: ../src/modules/alsa/alsa-mixer.c:1774
 msgid "Analog Microphone"
-msgstr ""
+msgstr "Аналоговий мікрофон"
 
 #: ../src/modules/alsa/alsa-mixer.c:1775
 msgid "Analog Line-In"
-msgstr ""
+msgstr "Аналоговий лінійний вхід"
 
 #: ../src/modules/alsa/alsa-mixer.c:1776
 msgid "Analog Radio"
-msgstr ""
+msgstr "Аналогове радіо"
 
 #: ../src/modules/alsa/alsa-mixer.c:1777
 msgid "Analog Video"
-msgstr ""
+msgstr "Аналогове відео"
 
 #: ../src/modules/alsa/alsa-mixer.c:1778
-#, fuzzy
 msgid "Analog Output"
-msgstr "Нуль-відтворення"
+msgstr "Аналогове відтворення"
 
 #: ../src/modules/alsa/alsa-mixer.c:1779
 msgid "Analog Headphones"
-msgstr ""
+msgstr "Аналогові навушники"
 
 #: ../src/modules/alsa/alsa-mixer.c:1780
 msgid "Analog Output (LFE)"
-msgstr ""
+msgstr "Аналоговий вихід (сабвуфер)"
 
 #: ../src/modules/alsa/alsa-mixer.c:1781
 msgid "Analog Mono Output"
-msgstr ""
+msgstr "Аналоговий моно-вихід"
 
-#: ../src/modules/alsa/alsa-mixer.c:1981
-#, fuzzy, c-format
+#: ../src/modules/alsa/alsa-mixer.c:1981, c-format
 msgid "%s+%s"
-msgstr "%s %s"
+msgstr "%s+%s"
 
-#: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404
-#, fuzzy, c-format
+#: ../src/modules/alsa/alsa-mixer.c:1984 ../src/modules/alsa/alsa-mixer.c:3404, c-format
 msgid "%s / %s"
-msgstr "%s %s"
+msgstr "%s / %s"
 
 #: ../src/modules/alsa/alsa-mixer.c:2790
 msgid "Analog Mono"
-msgstr ""
+msgstr "Аналогове моно"
 
 #: ../src/modules/alsa/alsa-mixer.c:2791
-#, fuzzy
 msgid "Analog Stereo"
-msgstr "Стерео"
+msgstr "Аналогове стерео"
 
 #: ../src/modules/alsa/alsa-mixer.c:2792
-#, fuzzy
 msgid "Analog Surround 2.1"
-msgstr "Об'ємний 4.1"
+msgstr "Аналоговий об'ємний 2.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2793
-#, fuzzy
 msgid "Analog Surround 3.0"
-msgstr "Об'ємний 4.0"
+msgstr "Аналоговий об'ємний 3.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2794
-#, fuzzy
 msgid "Analog Surround 3.1"
-msgstr "Об'ємний 4.1"
+msgstr "Аналоговий об'ємний 3.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2795
-#, fuzzy
 msgid "Analog Surround 4.0"
-msgstr "Об'ємний 4.0"
+msgstr "Аналоговий об'ємний 4.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2796
-#, fuzzy
 msgid "Analog Surround 4.1"
-msgstr "Об'ємний 4.1"
+msgstr "Аналоговий об'ємний 4.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2797
-#, fuzzy
 msgid "Analog Surround 5.0"
-msgstr "Об'ємний 5.0"
+msgstr "Аналоговий об'ємний 5.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2798
-#, fuzzy
 msgid "Analog Surround 5.1"
-msgstr "Об'ємний 5.1"
+msgstr "Аналоговий об'ємний 5.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2799
-#, fuzzy
 msgid "Analog Surround 6.0"
-msgstr "Об'ємний 4.0"
+msgstr "Аналоговий об'ємний 6.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2800
-#, fuzzy
 msgid "Analog Surround 6.1"
-msgstr "Об'ємний 4.1"
+msgstr "Аналоговий об'ємний 6.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2801
-#, fuzzy
 msgid "Analog Surround 7.0"
-msgstr "Об'ємний 4.0"
+msgstr "Аналоговий об'ємний 7.0"
 
 #: ../src/modules/alsa/alsa-mixer.c:2802
-#, fuzzy
 msgid "Analog Surround 7.1"
-msgstr "Об'ємний 7.1"
+msgstr "Аналоговий об'ємний 7.1"
 
 #: ../src/modules/alsa/alsa-mixer.c:2803
 msgid "Digital Stereo (IEC958)"
-msgstr ""
+msgstr "Цифрове стерео (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2804
 msgid "Digital Surround 4.0 (IEC958)"
-msgstr ""
+msgstr "Цифровий об’ємний 4.0 (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2805
 msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr ""
+msgstr "Цифровий об’ємний 4.0 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2806
 msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr ""
+msgstr "Цифровий об’ємний 5.1 (IEC958/AC3)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2807
 msgid "Digital Stereo (HDMI)"
-msgstr ""
+msgstr "Цифровий стерео (HDMI)"
 
 #: ../src/modules/alsa/alsa-mixer.c:2928
 msgid "Analog Mono Duplex"
-msgstr ""
+msgstr "Аналогове двобічне моно"
 
 #: ../src/modules/alsa/alsa-mixer.c:2929
 msgid "Analog Stereo Duplex"
-msgstr ""
+msgstr "Аналогове двобічне стерео"
 
 #: ../src/modules/alsa/alsa-mixer.c:2930
 msgid "Digital Stereo Duplex (IEC958)"
-msgstr ""
+msgstr "Цифрове двобічне стерео (IEC958)"
+
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/PROTOCOL pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/PROTOCOL
--- pulseaudio-0.9.22~0.9.21+341-g62bf/PROTOCOL	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/PROTOCOL	2010-01-15 23:21:18.000000000 +0000
@@ -188,9 +188,3 @@
 
   PA_COMMAND_SET_SINK_PORT
   PA_COMMAND_SET_SOURCE_PORT
-
-## v17, implemented by >= 0.9.20
-
-new flag at end of CREATE_PLAYBACK_STREAM:
-
-    bool relative_volume
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/cpulimit.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/cpulimit.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/cpulimit.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/cpulimit.c	2010-01-15 23:21:18.000000000 +0000
@@ -188,13 +188,15 @@
     last_time = pa_rtclock_now();
 
     /* Prepare the main loop pipe */
-    if (pa_pipe_cloexec(the_pipe) < 0) {
+    if (pipe(the_pipe) < 0) {
         pa_log("pipe() failed: %s", pa_cstrerror(errno));
         return -1;
     }
 
     pa_make_fd_nonblock(the_pipe[0]);
     pa_make_fd_nonblock(the_pipe[1]);
+    pa_make_fd_cloexec(the_pipe[0]);
+    pa_make_fd_cloexec(the_pipe[1]);
 
     api = m;
     io_event = api->io_new(m, the_pipe[0], PA_IO_EVENT_INPUT, callback, NULL);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon-conf.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon-conf.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon-conf.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon-conf.c	2010-01-15 23:21:18.000000000 +0000
@@ -83,9 +83,6 @@
     .config_file = NULL,
     .use_pid_file = TRUE,
     .system_instance = FALSE,
-#ifdef HAVE_DBUS
-    .local_server_type = PA_SERVER_TYPE_UNSET, /* The actual default is _USER, but we have to detect when the user doesn't specify this option. */
-#endif
     .no_cpu_limit = TRUE,
     .disable_shm = FALSE,
     .lock_memory = FALSE,
@@ -223,22 +220,6 @@
     return 0;
 }
 
-int pa_daemon_conf_set_local_server_type(pa_daemon_conf *c, const char *string) {
-    pa_assert(c);
-    pa_assert(string);
-
-    if (!strcmp(string, "user"))
-        c->local_server_type = PA_SERVER_TYPE_USER;
-    else if (!strcmp(string, "system")) {
-        c->local_server_type = PA_SERVER_TYPE_SYSTEM;
-    } else if (!strcmp(string, "none")) {
-        c->local_server_type = PA_SERVER_TYPE_NONE;
-    } else
-        return -1;
-
-    return 0;
-}
-
 static int parse_log_target(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
     pa_daemon_conf *c = data;
 
@@ -466,24 +447,6 @@
     return 0;
 }
 
-#ifdef HAVE_DBUS
-static int parse_server_type(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
-    pa_daemon_conf *c = data;
-
-    pa_assert(filename);
-    pa_assert(lvalue);
-    pa_assert(rvalue);
-    pa_assert(data);
-
-    if (pa_daemon_conf_set_local_server_type(c, rvalue) < 0) {
-        pa_log(_("[%s:%u] Invalid server type '%s'."), filename, line, rvalue);
-        return -1;
-    }
-
-    return 0;
-}
-#endif
-
 int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
     int r = -1;
     FILE *f = NULL;
@@ -499,9 +462,6 @@
         { "allow-exit",                 pa_config_parse_not_bool, &c->disallow_exit, NULL },
         { "use-pid-file",               pa_config_parse_bool,     &c->use_pid_file, NULL },
         { "system-instance",            pa_config_parse_bool,     &c->system_instance, NULL },
-#ifdef HAVE_DBUS
-        { "local-server-type",          parse_server_type,        c, NULL },
-#endif
         { "no-cpu-limit",               pa_config_parse_bool,     &c->no_cpu_limit, NULL },
         { "cpu-limit",                  pa_config_parse_not_bool, &c->no_cpu_limit, NULL },
         { "disable-shm",                pa_config_parse_bool,     &c->disable_shm, NULL },
@@ -579,7 +539,7 @@
     c->config_file = NULL;
 
     f = filename ?
-        pa_fopen_cloexec(c->config_file = pa_xstrdup(filename), "r") :
+        fopen(c->config_file = pa_xstrdup(filename), "r") :
         pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file);
 
     if (!f && errno != ENOENT) {
@@ -654,7 +614,7 @@
         else
             f = pa_open_config_file(DEFAULT_SCRIPT_FILE, DEFAULT_SCRIPT_FILE_USER, ENV_SCRIPT_FILE, &c->default_script_file);
     } else
-        f = pa_fopen_cloexec(c->default_script_file, "r");
+        f = fopen(c->default_script_file, "r");
 
     return f;
 }
@@ -667,16 +627,6 @@
         [PA_LOG_WARN] = "warning",
         [PA_LOG_ERROR] = "error"
     };
-
-#ifdef HAVE_DBUS
-    static const char* const server_type_to_string[] = {
-        [PA_SERVER_TYPE_UNSET] = "!!UNSET!!",
-        [PA_SERVER_TYPE_USER] = "user",
-        [PA_SERVER_TYPE_SYSTEM] = "system",
-        [PA_SERVER_TYPE_NONE] = "none"
-    };
-#endif
-
     pa_strbuf *s;
     char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
 
@@ -699,9 +649,6 @@
     pa_strbuf_printf(s, "allow-exit = %s\n", pa_yes_no(!c->disallow_exit));
     pa_strbuf_printf(s, "use-pid-file = %s\n", pa_yes_no(c->use_pid_file));
     pa_strbuf_printf(s, "system-instance = %s\n", pa_yes_no(c->system_instance));
-#ifdef HAVE_DBUS
-    pa_strbuf_printf(s, "local-server-type = %s\n", server_type_to_string[c->local_server_type]);
-#endif
     pa_strbuf_printf(s, "cpu-limit = %s\n", pa_yes_no(!c->no_cpu_limit));
     pa_strbuf_printf(s, "enable-shm = %s\n", pa_yes_no(!c->disable_shm));
     pa_strbuf_printf(s, "flat-volumes = %s\n", pa_yes_no(c->flat_volumes));
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon-conf.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon-conf.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon-conf.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon-conf.h	2010-01-15 23:21:18.000000000 +0000
@@ -28,7 +28,6 @@
 
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
-#include <pulsecore/core.h>
 #include <pulsecore/core-util.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
@@ -76,7 +75,6 @@
         log_time,
         flat_volumes,
         lock_memory;
-    pa_server_type_t local_server_type;
     int exit_idle_time,
         scache_idle_time,
         auto_log_target,
@@ -154,7 +152,6 @@
 int pa_daemon_conf_set_log_target(pa_daemon_conf *c, const char *string);
 int pa_daemon_conf_set_log_level(pa_daemon_conf *c, const char *string);
 int pa_daemon_conf_set_resample_method(pa_daemon_conf *c, const char *string);
-int pa_daemon_conf_set_local_server_type(pa_daemon_conf *c, const char *string);
 
 const char *pa_daemon_conf_get_default_script_file(pa_daemon_conf *c);
 FILE *pa_daemon_conf_open_default_script_file(pa_daemon_conf *c);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon.conf.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/daemon.conf.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/daemon.conf.in	2010-01-15 23:21:18.000000000 +0000
@@ -25,7 +25,6 @@
 ; allow-exit = yes
 ; use-pid-file = yes
 ; system-instance = no
-; local-server-type = user
 ; enable-shm = yes
 ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
 ; lock-memory = no
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/default.pa.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/default.pa.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/default.pa.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/default.pa.in	2010-01-15 23:21:18.000000000 +0000
@@ -66,9 +66,6 @@
 .ifexists module-esound-protocol-unix@PA_SOEXT@
 load-module module-esound-protocol-unix
 .endif
-.ifexists module-dbus-protocol@PA_SOEXT@
-load-module module-dbus-protocol
-.endif
 load-module module-native-protocol-unix
 
 ### Network access (may be configured with paprefs, so leave this commented
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/.gitignore pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/.gitignore
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/.gitignore	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/.gitignore	2010-01-15 23:21:18.000000000 +0000
@@ -1,3 +1,2 @@
 org.pulseaudio.policy
 pulseaudio.desktop
-pulseaudio-kde.desktop
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/main.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/main.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/main.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/main.c	2010-01-15 23:21:18.000000000 +0000
@@ -63,10 +63,6 @@
 #include <dbus/dbus.h>
 #endif
 
-#include <pulse/client-conf.h>
-#ifdef HAVE_X11
-#include <pulse/client-conf-x11.h>
-#endif
 #include <pulse/mainloop.h>
 #include <pulse/mainloop-signal.h>
 #include <pulse/timeval.h>
@@ -106,7 +102,6 @@
 #include "dumpmodules.h"
 #include "caps.h"
 #include "ltdl-bind-now.h"
-#include "server-lookup.h"
 
 #ifdef HAVE_LIBWRAP
 /* Only one instance of these variables */
@@ -347,50 +342,34 @@
 }
 #endif
 
-static char *check_configured_address(void) {
-    char *default_server = NULL;
-    pa_client_conf *c = pa_client_conf_new();
-
-    pa_client_conf_load(c, NULL);
-#ifdef HAVE_X11
-    pa_client_conf_from_x11(c, NULL);
-#endif
-    pa_client_conf_env(c);
-
-    if (c->default_server && *c->default_server)
-        default_server = pa_xstrdup(c->default_server);
-
-    pa_client_conf_free(c);
-
-    return default_server;
-}
-
 #ifdef HAVE_DBUS
-static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const char* name) {
+static pa_dbus_connection *register_dbus(pa_core *c) {
     DBusError error;
     pa_dbus_connection *conn;
 
     dbus_error_init(&error);
 
-    if (!(conn = pa_dbus_bus_get(c, bus, &error)) || dbus_error_is_set(&error)) {
+    if (!(conn = pa_dbus_bus_get(c, pa_in_system_mode() ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
         pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
         goto fail;
     }
 
-    if (dbus_bus_request_name(pa_dbus_connection_get(conn), name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-        pa_log_debug("Got %s!", name);
+    if (dbus_bus_request_name(pa_dbus_connection_get(conn), "org.pulseaudio.Server", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+        pa_log_debug("Got org.pulseaudio.Server!");
         return conn;
     }
 
     if (dbus_error_is_set(&error))
-        pa_log_error("Failed to acquire %s: %s: %s", name, error.name, error.message);
+        pa_log_warn("Failed to acquire org.pulseaudio.Server: %s: %s", error.name, error.message);
     else
-        pa_log_error("D-Bus name %s already taken. Weird shit!", name);
+        pa_log_warn("D-Bus name org.pulseaudio.Server already taken. Weird shit!");
 
     /* PA cannot be started twice by the same user and hence we can
-     * ignore mostly the case that a name is already taken. */
+     * ignore mostly the case that org.pulseaudio.Server is already
+     * taken. */
 
 fail:
+
     if (conn)
         pa_dbus_connection_unref(conn);
 
@@ -405,7 +384,6 @@
     pa_daemon_conf *conf = NULL;
     pa_mainloop *mainloop = NULL;
     char *s;
-    char *configured_address;
     int r = 0, retval = 1, d = 0;
     pa_bool_t valid_pid_file = FALSE;
     pa_bool_t ltdl_init = FALSE;
@@ -421,10 +399,7 @@
     int autospawn_fd = -1;
     pa_bool_t autospawn_locked = FALSE;
 #ifdef HAVE_DBUS
-    pa_dbusobj_server_lookup *server_lookup = NULL; /* /org/pulseaudio/server_lookup */
-    pa_dbus_connection *lookup_service_bus = NULL; /* Always the user bus. */
-    pa_dbus_connection *server_bus = NULL; /* The bus where we reserve org.pulseaudio.Server, either the user or the system bus. */
-    pa_bool_t start_server;
+    pa_dbus_connection *dbus = NULL;
 #endif
 
     pa_log_set_ident("pulseaudio");
@@ -511,32 +486,6 @@
         pa_log_set_flags(PA_LOG_PRINT_TIME, PA_LOG_SET);
     pa_log_set_show_backtrace(conf->log_backtrace);
 
-#ifdef HAVE_DBUS
-    /* conf->system_instance and conf->local_server_type control almost the
-     * same thing; make them agree about what is requested. */
-    switch (conf->local_server_type) {
-        case PA_SERVER_TYPE_UNSET:
-            conf->local_server_type = conf->system_instance ? PA_SERVER_TYPE_SYSTEM : PA_SERVER_TYPE_USER;
-            break;
-        case PA_SERVER_TYPE_USER:
-        case PA_SERVER_TYPE_NONE:
-            conf->system_instance = FALSE;
-            break;
-        case PA_SERVER_TYPE_SYSTEM:
-            conf->system_instance = TRUE;
-            break;
-        default:
-            pa_assert_not_reached();
-    }
-
-    start_server = conf->local_server_type == PA_SERVER_TYPE_USER || (getuid() == 0 && conf->local_server_type == PA_SERVER_TYPE_SYSTEM);
-
-    if (!start_server && conf->local_server_type == PA_SERVER_TYPE_SYSTEM) {
-        pa_log_notice(_("System mode refused for non-root user. Only starting the D-Bus server lookup service."));
-        conf->system_instance = FALSE;
-    }
-#endif
-
     LTDL_SET_PRELOADED_SYMBOLS();
     pa_ltdl_init();
     ltdl_init = TRUE;
@@ -660,25 +609,16 @@
 
     if (getuid() == 0 && !conf->system_instance)
         pa_log_warn(_("This program is not intended to be run as root (unless --system is specified)."));
-#ifndef HAVE_DBUS /* A similar, only a notice worthy check was done earlier, if D-Bus is enabled. */
     else if (getuid() != 0 && conf->system_instance) {
         pa_log(_("Root privileges required."));
         goto finish;
     }
-#endif
 
     if (conf->cmd == PA_CMD_START && conf->system_instance) {
         pa_log(_("--start not supported for system instances."));
         goto finish;
     }
 
-    if (conf->cmd == PA_CMD_START && (configured_address = check_configured_address())) {
-        pa_log_notice(_("User-configured server at %s, not autospawning."), configured_address);
-        pa_xfree(configured_address);
-        retval = 0;
-        goto finish;
-    }
-
     if (conf->system_instance && !conf->disallow_exit)
         pa_log_warn(_("Running in system mode, but --disallow-exit not set!"));
 
@@ -715,6 +655,7 @@
 
     if (conf->daemonize) {
         pid_t child;
+        int tty_fd;
 
         if (pa_stdio_acquire() < 0) {
             pa_log(_("Failed to acquire stdio."));
@@ -723,7 +664,7 @@
 
 #ifdef HAVE_FORK
         if (pipe(daemon_pipe) < 0) {
-            pa_log(_("pipe() failed: %s"), pa_cstrerror(errno));
+            pa_log(_("pipe failed: %s"), pa_cstrerror(errno));
             goto finish;
         }
 
@@ -774,27 +715,22 @@
             pa_log_set_target(PA_LOG_SYSLOG);
 
 #ifdef HAVE_SETSID
-        if (setsid() < 0) {
-            pa_log(_("setsid() failed: %s"), pa_cstrerror(errno));
-            goto finish;
-        }
+        setsid();
+#endif
+#ifdef HAVE_SETPGID
+        setpgid(0,0);
 #endif
 
-        /* We now are a session and process group leader. Let's fork
-         * again and let the father die, so that we'll become a
-         * process that can never acquire a TTY again, in a session and
-         * process group without leader */
+#ifndef OS_IS_WIN32
+        pa_close(0);
+        pa_close(1);
+        pa_close(2);
 
-#ifdef HAVE_FORK
-        if ((child = fork()) < 0) {
-            pa_log(_("fork() failed: %s"), pa_cstrerror(errno));
-            goto finish;
-        }
-
-        if (child != 0) {
-            retval = 0;
-            goto finish;
-        }
+        pa_assert_se(open("/dev/null", O_RDONLY) == 0);
+        pa_assert_se(open("/dev/null", O_WRONLY) == 1);
+        pa_assert_se(open("/dev/null", O_WRONLY) == 2);
+#else
+        FreeConsole();
 #endif
 
 #ifdef SIGTTOU
@@ -807,7 +743,12 @@
         signal(SIGTSTP, SIG_IGN);
 #endif
 
-        pa_nullify_stdfds();
+#ifdef TIOCNOTTY
+        if ((tty_fd = open("/dev/tty", O_RDWR)) >= 0) {
+            ioctl(tty_fd, TIOCNOTTY, (char*) 0);
+            pa_assert_se(pa_close(tty_fd) == 0);
+        }
+#endif
     }
 
     pa_set_env_and_record("PULSE_INTERNAL", "1");
@@ -960,9 +901,6 @@
     c->running_as_daemon = !!conf->daemonize;
     c->disallow_exit = conf->disallow_exit;
     c->flat_volumes = conf->flat_volumes;
-#ifdef HAVE_DBUS
-    c->server_type = conf->local_server_type;
-#endif
 
     pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);
     pa_signal_new(SIGINT, signal_callback, c);
@@ -985,48 +923,39 @@
         pa_assert_se(pa_cpu_limit_init(pa_mainloop_get_api(mainloop)) == 0);
 
     buf = pa_strbuf_new();
+    if (conf->load_default_script_file) {
+        FILE *f;
 
-#ifdef HAVE_DBUS
-    if (start_server) {
-#endif
-        if (conf->load_default_script_file) {
-            FILE *f;
-
-            if ((f = pa_daemon_conf_open_default_script_file(conf))) {
-                r = pa_cli_command_execute_file_stream(c, f, buf, &conf->fail);
-                fclose(f);
-            }
+        if ((f = pa_daemon_conf_open_default_script_file(conf))) {
+            r = pa_cli_command_execute_file_stream(c, f, buf, &conf->fail);
+            fclose(f);
         }
+    }
 
-        if (r >= 0)
-            r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail);
-
-        pa_log_error("%s", s = pa_strbuf_tostring_free(buf));
-        pa_xfree(s);
-
-        if (r < 0 && conf->fail) {
-            pa_log(_("Failed to initialize daemon."));
-            goto finish;
-        }
+    if (r >= 0)
+        r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail);
 
-        if (!c->modules || pa_idxset_size(c->modules) == 0) {
-            pa_log(_("Daemon startup without any loaded modules, refusing to work."));
-            goto finish;
-        }
-#ifdef HAVE_DBUS
-    } else {
-        /* When we just provide the D-Bus server lookup service, we don't want
-         * any modules to be loaded. We haven't loaded any so far, so one might
-         * think there's no way to contact the server, but receiving certain
-         * signals could still cause modules to load. */
-        conf->disallow_module_loading = TRUE;
-    }
-#endif
+    pa_log_error("%s", s = pa_strbuf_tostring_free(buf));
+    pa_xfree(s);
 
     /* We completed the initial module loading, so let's disable it
      * from now on, if requested */
     c->disallow_module_loading = !!conf->disallow_module_loading;
 
+    if (r < 0 && conf->fail) {
+        pa_log(_("Failed to initialize daemon."));
+        goto finish;
+    }
+
+    if (!c->modules || pa_idxset_size(c->modules) == 0) {
+        pa_log(_("Daemon startup without any loaded modules, refusing to work."));
+        goto finish;
+    }
+
+#ifdef HAVE_DBUS
+    dbus = register_dbus(c);
+#endif
+
 #ifdef HAVE_FORK
     if (daemon_pipe[1] >= 0) {
         int ok = 0;
@@ -1036,18 +965,6 @@
     }
 #endif
 
-#ifdef HAVE_DBUS
-    if (!conf->system_instance) {
-        if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
-            goto finish;
-        if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
-            goto finish;
-    }
-
-    if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
-        goto finish;
-#endif
-
     pa_log_info(_("Daemon startup complete."));
 
     retval = 0;
@@ -1058,12 +975,8 @@
 
 finish:
 #ifdef HAVE_DBUS
-    if (server_bus)
-        pa_dbus_connection_unref(server_bus);
-    if (lookup_service_bus)
-        pa_dbus_connection_unref(lookup_service_bus);
-    if (server_lookup)
-        pa_dbusobj_server_lookup_free(server_lookup);
+    if (dbus)
+        pa_dbus_connection_unref(dbus);
 #endif
 
     if (autospawn_fd >= 0) {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/server-lookup.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/server-lookup.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/server-lookup.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/server-lookup.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,522 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulse/client-conf.h>
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/core.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-shared.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "server-lookup.h"
-
-#define OBJECT_PATH "/org/pulseaudio/server_lookup1"
-#define INTERFACE "org.PulseAudio.ServerLookup1"
-
-struct pa_dbusobj_server_lookup {
-    pa_core *core;
-    pa_dbus_connection *conn;
-    pa_bool_t path_registered;
-};
-
-static const char introspection[] =
-    DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
-    "<node>"
-    " <!-- If you are looking for documentation make sure to check out\n"
-    "      http://pulseaudio.org/wiki/DBusInterface -->\n"
-    " <interface name=\"" INTERFACE "\">\n"
-    "  <property name=\"Address\" type=\"s\" access=\"read\"/>\n"
-    " </interface>\n"
-    " <interface name=\"" DBUS_INTERFACE_INTROSPECTABLE "\">\n"
-    "  <method name=\"Introspect\">\n"
-    "   <arg name=\"data\" type=\"s\" direction=\"out\"/>\n"
-    "  </method>\n"
-    " </interface>\n"
-    " <interface name=\"" DBUS_INTERFACE_PROPERTIES "\">\n"
-    "  <method name=\"Get\">\n"
-    "   <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n"
-    "   <arg name=\"property_name\" type=\"s\" direction=\"in\"/>\n"
-    "   <arg name=\"value\" type=\"v\" direction=\"out\"/>\n"
-    "  </method>\n"
-    "  <method name=\"Set\">\n"
-    "   <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n"
-    "   <arg name=\"property_name\" type=\"s\" direction=\"in\"/>\n"
-    "   <arg name=\"value\" type=\"v\" direction=\"in\"/>\n"
-    "  </method>\n"
-    "  <method name=\"GetAll\">\n"
-    "   <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n"
-    "   <arg name=\"props\" type=\"a{sv}\" direction=\"out\"/>\n"
-    "  </method>\n"
-    " </interface>\n"
-    "</node>\n";
-
-static void unregister_cb(DBusConnection *conn, void *user_data) {
-    pa_dbusobj_server_lookup *sl = user_data;
-
-    pa_assert(sl);
-    pa_assert(sl->path_registered);
-
-    sl->path_registered = FALSE;
-}
-
-static DBusHandlerResult handle_introspect(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
-    DBusHandlerResult r = DBUS_HANDLER_RESULT_HANDLED;
-    const char *i = introspection;
-    DBusMessage *reply = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    if (!(reply = dbus_message_new_method_return(msg))) {
-        r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        goto finish;
-    }
-    if (!dbus_message_append_args(reply, DBUS_TYPE_STRING, &i, DBUS_TYPE_INVALID)) {
-        r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        goto finish;
-    }
-    if (!dbus_connection_send(conn, reply, NULL)) {
-        r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-        goto finish;
-    }
-
-finish:
-    if (reply)
-        dbus_message_unref(reply);
-
-    return r;
-}
-
-enum get_address_result_t {
-    SUCCESS,
-    FAILED_TO_LOAD_CLIENT_CONF,
-    SERVER_FROM_TYPE_FAILED
-};
-
-/* Caller frees the returned address. */
-static enum get_address_result_t get_address(pa_server_type_t server_type, char **address) {
-    enum get_address_result_t r = SUCCESS;
-    pa_client_conf *conf = pa_client_conf_new();
-
-    *address = NULL;
-
-    if (pa_client_conf_load(conf, NULL) < 0) {
-        r = FAILED_TO_LOAD_CLIENT_CONF;
-        goto finish;
-    }
-
-    if (conf->default_dbus_server)
-        *address = pa_xstrdup(conf->default_dbus_server);
-    else if (!(*address = pa_get_dbus_address_from_server_type(server_type))) {
-        r = SERVER_FROM_TYPE_FAILED;
-        goto finish;
-    }
-
-finish:
-    pa_client_conf_free(conf);
-    return r;
-}
-
-static DBusHandlerResult handle_get_address(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
-    DBusHandlerResult r = DBUS_HANDLER_RESULT_HANDLED;
-    DBusMessage *reply = NULL;
-    char *address = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter variant_iter;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(sl);
-
-    switch (get_address(sl->core->server_type, &address)) {
-        case SUCCESS:
-            if (!(reply = dbus_message_new_method_return(msg))) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            dbus_message_iter_init_append(reply, &msg_iter);
-            if (!dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_VARIANT, "s", &variant_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &address)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_close_container(&msg_iter, &variant_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
-        case FAILED_TO_LOAD_CLIENT_CONF:
-            if (!(reply = dbus_message_new_error(msg, "org.pulseaudio.ClientConfLoadError", "Failed to load client.conf."))) {
-                r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
-        case SERVER_FROM_TYPE_FAILED:
-            if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "PulseAudio internal error: get_dbus_server_from_type() failed."))) {
-                r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
-        default:
-            pa_assert_not_reached();
-    }
-
-finish:
-    pa_xfree(address);
-    if (reply)
-        dbus_message_unref(reply);
-
-    return r;
-}
-
-static DBusHandlerResult handle_get(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
-    DBusHandlerResult r = DBUS_HANDLER_RESULT_HANDLED;
-    const char* interface;
-    const char* property;
-    DBusMessage *reply = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(sl);
-
-    if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &property, DBUS_TYPE_INVALID)) {
-        if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, "Invalid arguments"))) {
-            r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-            goto finish;
-        }
-        if (!dbus_connection_send(conn, reply, NULL)) {
-            r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-            goto finish;
-        }
-        r = DBUS_HANDLER_RESULT_HANDLED;
-        goto finish;
-    }
-
-    if (*interface && !pa_streq(interface, INTERFACE)) {
-        r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        goto finish;
-    }
-
-    if (!pa_streq(property, "Address")) {
-        if (!(reply = dbus_message_new_error_printf(msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "%s: No such property", property))) {
-            r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-            goto finish;
-        }
-        if (!dbus_connection_send(conn, reply, NULL)) {
-            r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-            goto finish;
-        }
-        r = DBUS_HANDLER_RESULT_HANDLED;
-        goto finish;
-    }
-
-    r = handle_get_address(conn, msg, sl);
-
-finish:
-    if (reply)
-        dbus_message_unref(reply);
-
-    return r;
-}
-
-static DBusHandlerResult handle_set(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
-    DBusHandlerResult r = DBUS_HANDLER_RESULT_HANDLED;
-    const char* interface;
-    const char* property;
-    DBusMessage *reply = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(sl);
-
-    if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &property, DBUS_TYPE_INVALID)) {
-        if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, "Invalid arguments"))) {
-            r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-            goto finish;
-        }
-        if (!dbus_connection_send(conn, reply, NULL)) {
-            r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-            goto finish;
-        }
-        r = DBUS_HANDLER_RESULT_HANDLED;
-        goto finish;
-    }
-
-    if (*interface && !pa_streq(interface, INTERFACE)) {
-        r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        goto finish;
-    }
-
-    if (!pa_streq(property, "Address")) {
-        if (!(reply = dbus_message_new_error_printf(msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "%s: No such property", property))) {
-            r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-            goto finish;
-        }
-        if (!dbus_connection_send(conn, reply, NULL)) {
-            r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-            goto finish;
-        }
-        r = DBUS_HANDLER_RESULT_HANDLED;
-        goto finish;
-    }
-
-    if (!(reply = dbus_message_new_error_printf(msg, DBUS_ERROR_ACCESS_DENIED, "%s: Property not settable", property))) {
-        r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        goto finish;
-    }
-    if (!dbus_connection_send(conn, reply, NULL)) {
-        r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-        goto finish;
-    }
-    r = DBUS_HANDLER_RESULT_HANDLED;
-
-finish:
-    if (reply)
-        dbus_message_unref(reply);
-
-    return r;
-}
-
-static DBusHandlerResult handle_get_all(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
-    DBusHandlerResult r = DBUS_HANDLER_RESULT_HANDLED;
-    DBusMessage *reply = NULL;
-    const char *property = "Address";
-    char *interface = NULL;
-    char *address = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    DBusMessageIter variant_iter;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(sl);
-
-    if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &interface, DBUS_TYPE_INVALID)) {
-        if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, "Invalid arguments"))) {
-            r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-            goto finish;
-        }
-        if (!dbus_connection_send(conn, reply, NULL)) {
-            r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-            goto finish;
-        }
-        r = DBUS_HANDLER_RESULT_HANDLED;
-        goto finish;
-    }
-
-    switch (get_address(sl->core->server_type, &address)) {
-        case SUCCESS:
-            if (!(reply = dbus_message_new_method_return(msg))) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            dbus_message_iter_init_append(reply, &msg_iter);
-            if (!dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &property)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_open_container(&dict_entry_iter, DBUS_TYPE_VARIANT, "s", &variant_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &address)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_close_container(&dict_entry_iter, &variant_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_close_container(&dict_iter, &dict_entry_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_message_iter_close_container(&msg_iter, &dict_iter)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
-        case FAILED_TO_LOAD_CLIENT_CONF:
-            if (!(reply = dbus_message_new_error(msg, "org.pulseaudio.ClientConfLoadError", "Failed to load client.conf."))) {
-                r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
-        case SERVER_FROM_TYPE_FAILED:
-            if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "PulseAudio internal error: get_dbus_server_from_type() failed."))) {
-                r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
-        default:
-            pa_assert_not_reached();
-    }
-
-finish:
-    pa_xfree(address);
-    if (reply)
-        dbus_message_unref(reply);
-
-    return r;
-}
-
-static DBusHandlerResult message_cb(DBusConnection *conn, DBusMessage *msg, void *user_data) {
-    pa_dbusobj_server_lookup *sl = user_data;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(sl);
-
-    /* pa_log("Got message! type = %s   path = %s   iface = %s   member = %s   dest = %s", dbus_message_type_to_string(dbus_message_get_type(msg)), dbus_message_get_path(msg), dbus_message_get_interface(msg), dbus_message_get_member(msg), dbus_message_get_destination(msg)); */
-
-    if (dbus_message_get_type(msg) != DBUS_MESSAGE_TYPE_METHOD_CALL)
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-    if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, "Introspect") ||
-        (!dbus_message_get_interface(msg) && dbus_message_has_member(msg, "Introspect")))
-        return handle_introspect(conn, msg, sl);
-
-    if (dbus_message_is_method_call(msg, DBUS_INTERFACE_PROPERTIES, "Get") ||
-        (!dbus_message_get_interface(msg) && dbus_message_has_member(msg, "Get")))
-        return handle_get(conn, msg, sl);
-
-    if (dbus_message_is_method_call(msg, DBUS_INTERFACE_PROPERTIES, "Set") ||
-        (!dbus_message_get_interface(msg) && dbus_message_has_member(msg, "Set")))
-        return handle_set(conn, msg, sl);
-
-    if (dbus_message_is_method_call(msg, DBUS_INTERFACE_PROPERTIES, "GetAll") ||
-        (!dbus_message_get_interface(msg) && dbus_message_has_member(msg, "GetAll")))
-        return handle_get_all(conn, msg, sl);
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static DBusObjectPathVTable vtable = {
-    .unregister_function = unregister_cb,
-    .message_function = message_cb,
-    .dbus_internal_pad1 = NULL,
-    .dbus_internal_pad2 = NULL,
-    .dbus_internal_pad3 = NULL,
-    .dbus_internal_pad4 = NULL
-};
-
-pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
-    pa_dbusobj_server_lookup *sl;
-    DBusError error;
-
-    dbus_error_init(&error);
-
-    sl = pa_xnew(pa_dbusobj_server_lookup, 1);
-    sl->core = c;
-    sl->path_registered = FALSE;
-
-    if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
-        pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
-        goto fail;
-    }
-
-    if (!dbus_connection_register_object_path(pa_dbus_connection_get(sl->conn), OBJECT_PATH, &vtable, sl)) {
-        pa_log("dbus_connection_register_object_path() failed for " OBJECT_PATH ".");
-        goto fail;
-    }
-
-    sl->path_registered = TRUE;
-
-    return sl;
-
-fail:
-    dbus_error_free(&error);
-
-    pa_dbusobj_server_lookup_free(sl);
-
-    return NULL;
-}
-
-void pa_dbusobj_server_lookup_free(pa_dbusobj_server_lookup *sl) {
-    pa_assert(sl);
-
-    if (sl->path_registered) {
-        pa_assert(sl->conn);
-        if (!dbus_connection_unregister_object_path(pa_dbus_connection_get(sl->conn), OBJECT_PATH))
-            pa_log_debug("dbus_connection_unregister_object_path() failed for " OBJECT_PATH ".");
-    }
-
-    if (sl->conn)
-        pa_dbus_connection_unref(sl->conn);
-
-    pa_xfree(sl);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/server-lookup.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/server-lookup.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/server-lookup.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/server-lookup.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-#ifndef fooserverlookuphfoo
-#define fooserverlookuphfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus object at path
- * /org/pulseaudio/server_lookup. Implemented interfaces
- * are org.pulseaudio.ServerLookup and org.freedesktop.DBus.Introspectable.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the ServerLookup interface
- * documentation.
- */
-
-#include <pulsecore/core.h>
-
-typedef struct pa_dbusobj_server_lookup pa_dbusobj_server_lookup;
-
-pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c);
-void pa_dbusobj_server_lookup_free(pa_dbusobj_server_lookup *sl);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/start-pulseaudio-x11.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/start-pulseaudio-x11.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/start-pulseaudio-x11.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/start-pulseaudio-x11.in	2010-01-15 23:21:18.000000000 +0000
@@ -19,6 +19,8 @@
 
 set -e
 
+[ -z "$PULSE_SERVER" ]
+
 @PA_BINARY@ --start "$@"
 
 if [ x"$DISPLAY" != x ] ; then
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/system.pa.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/system.pa.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/daemon/system.pa.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/daemon/system.pa.in	2010-01-15 23:21:18.000000000 +0000
@@ -32,10 +32,6 @@
 .ifexists module-esound-protocol-unix@PA_SOEXT@
 load-module module-esound-protocol-unix
 .endif
-.ifexists module-dbus-protocol@PA_SOEXT@
-### If you want to allow TCP connections, set access to "remote" or "local,remote".
-load-module module-dbus-protocol access=local
-.endif
 load-module module-native-protocol-unix
 
 ### Automatically restore the volume of streams and devices
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/.gitignore pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/.gitignore
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/.gitignore	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/.gitignore	2010-01-15 23:21:18.000000000 +0000
@@ -1,4 +1,3 @@
-once-test
 usergroup-test
 sigbus-test
 TAGS
@@ -64,5 +63,4 @@
 utf8-test
 voltest
 start-pulseaudio-x11
-start-pulseaudio-kde
 vector-test
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/Makefile.am pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/Makefile.am
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/Makefile.am	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/Makefile.am	2010-01-15 23:21:18.000000000 +0000
@@ -31,6 +31,7 @@
 xdgautostartdir=$(sysconfdir)/xdg/autostart
 alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
 alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
+udevrulesdir=/lib/udev/rules.d
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
 
 ###################################
@@ -69,8 +70,6 @@
 	-I$(top_builddir)/src/modules/x11 \
 	-I$(top_srcdir)/src/modules/jack \
 	-I$(top_builddir)/src/modules/jack \
-	-I$(top_srcdir)/src/modules/dbus \
-	-I$(top_builddir)/src/modules/dbus \
 	$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
 	$(LIBSAMPLERATE_CFLAGS) \
 	$(LIBSNDFILE_CFLAGS) \
@@ -108,6 +107,30 @@
 #          Extra files            #
 ###################################
 
+ALSA_PROFILES = \
+		modules/alsa/mixer/profile-sets/default.conf \
+		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
+		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+
+ALSA_PATHS = \
+		modules/alsa/mixer/paths/analog-input-aux.conf \
+		modules/alsa/mixer/paths/analog-input.conf \
+		modules/alsa/mixer/paths/analog-input.conf.common \
+		modules/alsa/mixer/paths/analog-input-fm.conf \
+		modules/alsa/mixer/paths/analog-input-linein.conf \
+		modules/alsa/mixer/paths/analog-input-mic.conf \
+		modules/alsa/mixer/paths/analog-input-mic.conf.common \
+		modules/alsa/mixer/paths/analog-input-mic-line.conf \
+		modules/alsa/mixer/paths/analog-input-tvtuner.conf \
+		modules/alsa/mixer/paths/analog-input-video.conf \
+		modules/alsa/mixer/paths/analog-output.conf \
+		modules/alsa/mixer/paths/analog-output-speaker.conf \
+		modules/alsa/mixer/paths/analog-output.conf.common \
+		modules/alsa/mixer/paths/analog-output-headphones.conf \
+		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
+		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
+		modules/alsa/mixer/paths/analog-output-mono.conf
+
 EXTRA_DIST = \
 		pulse/client.conf.in \
 		pulse/version.h.in \
@@ -124,7 +147,10 @@
 		daemon/pulseaudio.desktop.in \
 		daemon/pulseaudio-kde.desktop.in \
 		map-file \
-		daemon/pulseaudio-system.conf
+		daemon/pulseaudio-system.conf \
+		modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
+		${ALSA_PROFILES} \
+		${ALSA_PATHS}
 
 pulseconf_DATA = \
 		default.pa \
@@ -154,7 +180,7 @@
 bin_PROGRAMS = pulseaudio
 
 pulseaudio_SOURCES = \
-		daemon/caps.c daemon/caps.h \
+		daemon/caps.h daemon/caps.c \
 		daemon/cmdline.c daemon/cmdline.h \
 		daemon/cpulimit.c daemon/cpulimit.h \
 		daemon/daemon-conf.c daemon/daemon-conf.h \
@@ -162,17 +188,11 @@
 		daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \
 		daemon/main.c
 
-pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS)
-pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS)
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS)
+pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS)
 # This is needed because automake doesn't properly expand the foreach below
 pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS)
 
-if HAVE_DBUS
-pulseaudio_CFLAGS += $(DBUS_CFLAGS)
-pulseaudio_SOURCES += daemon/server-lookup.c daemon/server-lookup.h
-pulseaudio_LDADD += $(DBUS_LIBS)
-endif
-
 if PREOPEN_MODS
 PREOPEN_LIBS = $(PREOPEN_MODS)
 else
@@ -294,7 +314,6 @@
 		hook-list-test \
 		memblock-test \
 		thread-test \
-		once-test \
 		flist-test \
 		asyncq-test \
 		asyncmsgq-test \
@@ -386,11 +405,6 @@
 thread_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 thread_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-once_test_SOURCES = tests/once-test.c
-once_test_CFLAGS = $(AM_CFLAGS)
-once_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
-once_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-
 flist_test_SOURCES = tests/flist-test.c
 flist_test_CFLAGS = $(AM_CFLAGS)
 flist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
@@ -633,12 +647,6 @@
 libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
 
-if HAVE_X11
-libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES += pulse/client-conf-x11.c pulse/client-conf-x11.h
-libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS += $(X11_CFLAGS)
-libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS += $(X11_LIBS)
-endif
-
 # proplist-util.h uses these header files, but not the library itself!
 libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS += $(GLIB20_CFLAGS) $(GTK20_CFLAGS)
 
@@ -652,21 +660,12 @@
 		pulsecore/mutex-win32.c pulsecore/mutex.h \
 		pulsecore/thread-win32.c pulsecore/thread.h \
 		pulsecore/semaphore-win32.c pulsecore/semaphore.h
-else !OS_IS_WIN32
-if OS_IS_DARWIN
-libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES += \
-		pulsecore/mutex-posix.c pulsecore/mutex.h \
-		pulsecore/thread-posix.c pulsecore/thread.h \
-		pulsecore/semaphore-osx.c pulsecore/semaphore.h
-libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS += "-I/Developer/Headers/FlatCarbon/"
-#libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS += "-framework CoreServices"
-else !OS_IS_DARWIN
+else
 libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES += \
 		pulsecore/mutex-posix.c pulsecore/mutex.h \
 		pulsecore/thread-posix.c pulsecore/thread.h \
 		pulsecore/semaphore-posix.c pulsecore/semaphore.h
-endif !OS_IS_DARWIN
-endif !OS_IS_WIN32
+endif
 
 if HAVE_X11
 libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES += pulsecore/x11prop.c pulsecore/x11prop.h
@@ -779,6 +778,12 @@
 libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la
 libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
 
+if HAVE_X11
+libpulse_la_SOURCES += pulse/client-conf-x11.c pulse/client-conf-x11.h
+libpulse_la_CFLAGS += $(X11_CFLAGS)
+libpulse_la_LDFLAGS += $(X11_LIBS)
+endif
+
 libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
 libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
 libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la
@@ -877,9 +882,7 @@
 endif
 
 if HAVE_DBUS
-libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES += \
-		pulsecore/dbus-shared.c pulsecore/dbus-shared.h \
-		pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h
+libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES += pulsecore/dbus-shared.c pulsecore/dbus-shared.h
 libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS += $(DBUS_CFLAGS)
 libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD += $(DBUS_LIBS)
 endif
@@ -1072,12 +1075,6 @@
 		module-oss.la
 endif
 
-if HAVE_COREAUDIO
-modlibexec_LTLIBRARIES += \
-		module-coreaudio-detect.la \
-		module-coreaudio-device.la
-endif
-
 pulselibexec_PROGRAMS =
 
 if HAVE_ALSA
@@ -1087,34 +1084,14 @@
 		module-alsa-source.la \
 		module-alsa-card.la
 
-dist_alsaprofilesets_DATA = \
-		modules/alsa/mixer/profile-sets/default.conf \
-		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+alsaprofilesets_DATA = ${ALSA_PROFILES}
 
 if HAVE_UDEV
-dist_udevrules_DATA = \
+udevrules_DATA = \
 		modules/alsa/mixer/profile-sets/90-pulseaudio.rules
 endif
 
-dist_alsapaths_DATA = \
-		modules/alsa/mixer/paths/analog-input-aux.conf \
-		modules/alsa/mixer/paths/analog-input.conf \
-		modules/alsa/mixer/paths/analog-input.conf.common \
-		modules/alsa/mixer/paths/analog-input-fm.conf \
-		modules/alsa/mixer/paths/analog-input-linein.conf \
-		modules/alsa/mixer/paths/analog-input-mic.conf \
-		modules/alsa/mixer/paths/analog-input-mic.conf.common \
-		modules/alsa/mixer/paths/analog-input-mic-line.conf \
-		modules/alsa/mixer/paths/analog-input-tvtuner.conf \
-		modules/alsa/mixer/paths/analog-input-video.conf \
-		modules/alsa/mixer/paths/analog-output.conf \
-		modules/alsa/mixer/paths/analog-output-speaker.conf \
-		modules/alsa/mixer/paths/analog-output.conf.common \
-		modules/alsa/mixer/paths/analog-output-headphones.conf \
-		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
-		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
-		modules/alsa/mixer/paths/analog-output-mono.conf
+alsapaths_DATA = ${ALSA_PATHS}
 
 endif
 
@@ -1129,11 +1106,6 @@
 		module-zeroconf-discover.la
 endif
 
-if HAVE_BONJOUR
-modlibexec_LTLIBRARIES += \
-		module-bonjour-publish.la
-endif
-
 if HAVE_LIRC
 modlibexec_LTLIBRARIES += \
 		module-lirc.la
@@ -1180,8 +1152,7 @@
 
 if HAVE_DBUS
 modlibexec_LTLIBRARIES += \
-		module-rygel-media-server.la \
-		module-dbus-protocol.la
+		module-rygel-media-server.la
 endif
 
 if HAVE_BLUEZ
@@ -1207,12 +1178,6 @@
 endif
 endif
 
-if HAVE_FFTW
-modlibexec_LTLIBRARIES += \
-		module-equalizer-sink.la
-bin_SCRIPTS += utils/qpaeq
-endif
-
 # These are generated by an M4 script
 SYMDEF_FILES = \
 		modules/module-cli-symdef.h \
@@ -1231,7 +1196,6 @@
 		modules/module-combine-symdef.h \
 		modules/module-remap-sink-symdef.h \
 		modules/module-ladspa-sink-symdef.h \
-		modules/module-equalizer-sink-symdef.h \
 		modules/module-esound-compat-spawnfd-symdef.h \
 		modules/module-esound-compat-spawnpid-symdef.h \
 		modules/module-match-symdef.h \
@@ -1242,7 +1206,6 @@
 		modules/module-esound-sink-symdef.h \
 		modules/module-zeroconf-publish-symdef.h \
 		modules/module-zeroconf-discover-symdef.h \
-		modules/module-bonjour-publish-symdef.h \
 		modules/module-lirc-symdef.h \
 		modules/module-mmkbd-evdev-symdef.h \
 		modules/module-http-protocol-tcp-symdef.h \
@@ -1256,8 +1219,6 @@
 		modules/alsa/module-alsa-sink-symdef.h \
 		modules/alsa/module-alsa-source-symdef.h \
 		modules/alsa/module-alsa-card-symdef.h \
-		modules/coreaudio/module-coreaudio-detect-symdef.h \
-		modules/coreaudio/module-coreaudio-device-symdef.h \
 		modules/module-solaris-symdef.h \
 		modules/module-waveout-symdef.h \
 		modules/module-detect-symdef.h \
@@ -1287,7 +1248,6 @@
 		modules/module-augment-properties-symdef.h \
 		modules/module-cork-music-on-phone-symdef.h \
 		modules/module-console-kit-symdef.h \
-		modules/dbus/module-dbus-protocol-symdef.h \
 		modules/module-loopback-symdef.h
 
 EXTRA_DIST += $(SYMDEF_FILES)
@@ -1337,24 +1297,6 @@
 module_http_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libprotocol-http.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
-# D-Bus protocol
-
-module_dbus_protocol_la_SOURCES = \
-		modules/dbus/iface-card.c modules/dbus/iface-card.h \
-		modules/dbus/iface-card-profile.c modules/dbus/iface-card-profile.h \
-		modules/dbus/iface-client.c modules/dbus/iface-client.h \
-		modules/dbus/iface-core.c modules/dbus/iface-core.h \
-		modules/dbus/iface-device.c modules/dbus/iface-device.h \
-		modules/dbus/iface-device-port.c modules/dbus/iface-device-port.h \
-		modules/dbus/iface-memstats.c modules/dbus/iface-memstats.h \
-		modules/dbus/iface-module.c modules/dbus/iface-module.h \
-		modules/dbus/iface-sample.c modules/dbus/iface-sample.h \
-		modules/dbus/iface-stream.c modules/dbus/iface-stream.h \
-		modules/dbus/module-dbus-protocol.c
-module_dbus_protocol_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-module_dbus_protocol_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_dbus_protocol_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-
 # Native protocol
 
 module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
@@ -1435,11 +1377,6 @@
 module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_ladspa_sink_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
-module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
-module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS)
-module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-
 module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_match_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -1489,19 +1426,6 @@
 module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_oss_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
-# COREAUDIO
-
-module_coreaudio_detect_la_SOURCES = modules/coreaudio/module-coreaudio-detect.c
-module_coreaudio_detect_la_LDFLAGS = $(MODULE_LDFLAGS) \
-			-Wl,-framework -Wl,Cocoa -framework CoreAudio \
-			-Wl,-framework -Wl,AudioUnit -framework AudioUnit
-module_coreaudio_detect_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-
-module_coreaudio_device_la_SOURCES = modules/coreaudio/module-coreaudio-device.c
-module_coreaudio_device_la_LDFLAGS = $(MODULE_LDFLAGS) \
-			-Wl,-framework -Wl,Cocoa -framework CoreAudio \
-			-Wl,-framework -Wl,AudioUnit -framework AudioUnit
-module_coreaudio_device_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 # ALSA
 
 libalsa_util_la_SOURCES = modules/alsa/alsa-util.c modules/alsa/alsa-util.h modules/alsa/alsa-mixer.c modules/alsa/alsa-mixer.h modules/alsa/alsa-sink.c modules/alsa/alsa-sink.h modules/alsa/alsa-source.c modules/alsa/alsa-source.h modules/reserve-wrap.c modules/reserve-wrap.h
@@ -1560,13 +1484,6 @@
 module_zeroconf_discover_la_LIBADD = $(AM_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
 
-# Bonjour
-
-module_bonjour_publish_la_SOURCES = modules/module-bonjour-publish.c
-module_bonjour_publish_la_LDFLAGS = $(MODULE_LDFLAGS) \
-			-Wl,-framework -Wl,CoreFoundation -framework CoreFoundation
-module_bonjour_publish_la_LIBADD = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-
 # LIRC
 
 module_lirc_la_SOURCES = modules/module-lirc.c
@@ -1637,11 +1554,6 @@
 module_stream_restore_la_LIBADD = $(AM_LIBADD) libprotocol-native.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 module_stream_restore_la_CFLAGS = $(AM_CFLAGS)
 
-if HAVE_DBUS
-module_stream_restore_la_LIBADD += $(DBUS_LIBS)
-module_stream_restore_la_CFLAGS += $(DBUS_CFLAGS)
-endif
-
 # Card profile restore module
 module_card_restore_la_SOURCES = modules/module-card-restore.c
 module_card_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/Makefile.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/Makefile.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/Makefile.in	2010-01-15 01:27:35.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/Makefile.in	2010-01-15 23:52:35.000000000 +0000
@@ -67,12 +67,9 @@
 bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \
 	pasuspender$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
 	$(am__EXEEXT_3)
-@HAVE_DBUS_TRUE@am__append_2 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_3 = daemon/server-lookup.c daemon/server-lookup.h
-@HAVE_DBUS_TRUE@am__append_4 = $(DBUS_LIBS)
-@HAVE_AF_UNIX_TRUE@am__append_5 = pacmd
-@HAVE_X11_TRUE@am__append_6 = pax11publish
-@HAVE_AVAHI_TRUE@am__append_7 = pabrowse
+@HAVE_AF_UNIX_TRUE@am__append_2 = pacmd
+@HAVE_X11_TRUE@am__append_3 = pax11publish
+@HAVE_AVAHI_TRUE@am__append_4 = pabrowse
 TESTS = mainloop-test$(EXEEXT) strlist-test$(EXEEXT) \
 	close-test$(EXEEXT) voltest$(EXEEXT) vector-test$(EXEEXT) \
 	memblockq-test$(EXEEXT) channelmap-test$(EXEEXT) \
@@ -90,95 +87,86 @@
 #TESTS += \
 #		cpulimit-test \
 #		cpulimit-test2
-@HAVE_SIGXCPU_TRUE@am__append_8 = \
+@HAVE_SIGXCPU_TRUE@am__append_5 = \
 @HAVE_SIGXCPU_TRUE@		cpulimit-test \
 @HAVE_SIGXCPU_TRUE@		cpulimit-test2
 
-@HAVE_GLIB20_TRUE@am__append_9 = \
+@HAVE_GLIB20_TRUE@am__append_6 = \
 @HAVE_GLIB20_TRUE@		mainloop-test-glib
 
-@HAVE_GLIB20_TRUE@am__append_10 = \
+@HAVE_GLIB20_TRUE@am__append_7 = \
 @HAVE_GLIB20_TRUE@		mainloop-test-glib
 
-@HAVE_GTK20_TRUE@am__append_11 = \
+@HAVE_GTK20_TRUE@am__append_8 = \
 @HAVE_GTK20_TRUE@		gtk-test
 
-@HAVE_ALSA_TRUE@am__append_12 = \
+@HAVE_ALSA_TRUE@am__append_9 = \
 @HAVE_ALSA_TRUE@		alsa-time-test
 
 @BUILD_TESTS_DEFAULT_TRUE@noinst_PROGRAMS = $(am__EXEEXT_8)
 @BUILD_TESTS_DEFAULT_FALSE@check_PROGRAMS = $(am__EXEEXT_8)
-@HAVE_X11_TRUE@am__append_13 = pulse/client-conf-x11.c pulse/client-conf-x11.h
-@HAVE_X11_TRUE@am__append_14 = $(X11_CFLAGS)
-@HAVE_X11_TRUE@am__append_15 = $(X11_LIBS) $(X11_LIBS)
-@OS_IS_WIN32_TRUE@am__append_16 = \
+@OS_IS_WIN32_TRUE@am__append_10 = \
 @OS_IS_WIN32_TRUE@		pulsecore/mutex-win32.c pulsecore/mutex.h \
 @OS_IS_WIN32_TRUE@		pulsecore/thread-win32.c pulsecore/thread.h \
 @OS_IS_WIN32_TRUE@		pulsecore/semaphore-win32.c pulsecore/semaphore.h
 
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_17 = \
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/semaphore-osx.c pulsecore/semaphore.h
-
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_18 = "-I/Developer/Headers/FlatCarbon/"
-#libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS += "-framework CoreServices"
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_19 = \
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/semaphore-posix.c pulsecore/semaphore.h
-
-@HAVE_X11_TRUE@am__append_20 = pulsecore/x11prop.c pulsecore/x11prop.h
-@HAVE_X11_TRUE@am__append_21 = $(X11_CFLAGS)
-@HAVE_LIBASYNCNS_TRUE@am__append_22 = $(LIBASYNCNS_CFLAGS)
-@HAVE_LIBASYNCNS_TRUE@am__append_23 = $(LIBASYNCNS_LIBS)
-@OS_IS_WIN32_TRUE@am__append_24 = pulsecore/dllmain.c
-@HAVE_DBUS_TRUE@am__append_25 = \
+@OS_IS_WIN32_FALSE@am__append_11 = \
+@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
+@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
+@OS_IS_WIN32_FALSE@		pulsecore/semaphore-posix.c pulsecore/semaphore.h
+
+@HAVE_X11_TRUE@am__append_12 = pulsecore/x11prop.c pulsecore/x11prop.h
+@HAVE_X11_TRUE@am__append_13 = $(X11_CFLAGS)
+@HAVE_X11_TRUE@am__append_14 = $(X11_LIBS)
+@HAVE_LIBASYNCNS_TRUE@am__append_15 = $(LIBASYNCNS_CFLAGS)
+@HAVE_LIBASYNCNS_TRUE@am__append_16 = $(LIBASYNCNS_LIBS)
+@OS_IS_WIN32_TRUE@am__append_17 = pulsecore/dllmain.c
+@HAVE_DBUS_TRUE@am__append_18 = \
 @HAVE_DBUS_TRUE@		pulsecore/dbus-util.c pulsecore/dbus-util.h \
 @HAVE_DBUS_TRUE@		pulsecore/rtkit.c pulsecore/rtkit.h
 
-@HAVE_DBUS_TRUE@am__append_26 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_27 = $(DBUS_LIBS)
-@HAVE_AVAHI_TRUE@am__append_28 = \
+@HAVE_DBUS_TRUE@am__append_19 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_20 = $(DBUS_LIBS)
+@HAVE_AVAHI_TRUE@am__append_21 = \
 @HAVE_AVAHI_TRUE@		pulse/browser.h
 
-@HAVE_AVAHI_TRUE@am__append_29 = \
+@HAVE_AVAHI_TRUE@am__append_22 = \
 @HAVE_AVAHI_TRUE@		libpulse-browse.la
 
-@HAVE_GLIB20_TRUE@am__append_30 = \
+@HAVE_GLIB20_TRUE@am__append_23 = \
 @HAVE_GLIB20_TRUE@		pulse/glib-mainloop.h
 
-@HAVE_GLIB20_TRUE@am__append_31 = \
+@HAVE_GLIB20_TRUE@am__append_24 = \
 @HAVE_GLIB20_TRUE@		libpulse-mainloop-glib.la
 
+@HAVE_X11_TRUE@am__append_25 = pulse/client-conf-x11.c pulse/client-conf-x11.h
+@HAVE_X11_TRUE@am__append_26 = $(X11_CFLAGS)
+@HAVE_X11_TRUE@am__append_27 = $(X11_LIBS)
 
 ###################################
 #         OSS emulation           #
 ###################################
-@HAVE_OSS_WRAPPER_TRUE@am__append_32 = libpulsedsp.la
-@HAVE_OSS_WRAPPER_TRUE@am__append_33 = utils/padsp
-@HAVE_X11_TRUE@am__append_34 = pulsecore/x11wrap.c pulsecore/x11wrap.h
-@HAVE_X11_TRUE@am__append_35 = $(X11_CFLAGS)
-@HAVE_X11_TRUE@am__append_36 = $(X11_LIBS)
-@HAVE_DBUS_TRUE@am__append_37 = \
-@HAVE_DBUS_TRUE@		pulsecore/dbus-shared.c pulsecore/dbus-shared.h \
-@HAVE_DBUS_TRUE@		pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h
-
-@HAVE_DBUS_TRUE@am__append_38 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_39 = $(DBUS_LIBS)
-@HAVE_GDBM_TRUE@am__append_40 = pulsecore/database-gdbm.c
-@HAVE_GDBM_TRUE@am__append_41 = $(GDBM_CFLAGS)
-@HAVE_GDBM_TRUE@am__append_42 = $(GDBM_LIBS)
-@HAVE_TDB_TRUE@am__append_43 = pulsecore/database-tdb.c
-@HAVE_TDB_TRUE@am__append_44 = $(TDB_CFLAGS)
-@HAVE_TDB_TRUE@am__append_45 = $(TDB_LIBS)
-@HAVE_SIMPLEDB_TRUE@am__append_46 = pulsecore/database-simple.c
+@HAVE_OSS_WRAPPER_TRUE@am__append_28 = libpulsedsp.la
+@HAVE_OSS_WRAPPER_TRUE@am__append_29 = utils/padsp
+@HAVE_X11_TRUE@am__append_30 = pulsecore/x11wrap.c pulsecore/x11wrap.h
+@HAVE_X11_TRUE@am__append_31 = $(X11_CFLAGS)
+@HAVE_X11_TRUE@am__append_32 = $(X11_LIBS)
+@HAVE_DBUS_TRUE@am__append_33 = pulsecore/dbus-shared.c pulsecore/dbus-shared.h
+@HAVE_DBUS_TRUE@am__append_34 = $(DBUS_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_35 = $(DBUS_LIBS)
+@HAVE_GDBM_TRUE@am__append_36 = pulsecore/database-gdbm.c
+@HAVE_GDBM_TRUE@am__append_37 = $(GDBM_CFLAGS)
+@HAVE_GDBM_TRUE@am__append_38 = $(GDBM_LIBS)
+@HAVE_TDB_TRUE@am__append_39 = pulsecore/database-tdb.c
+@HAVE_TDB_TRUE@am__append_40 = $(TDB_CFLAGS)
+@HAVE_TDB_TRUE@am__append_41 = $(TDB_LIBS)
+@HAVE_SIMPLEDB_TRUE@am__append_42 = pulsecore/database-simple.c
 
 # We need to emulate sendmsg/recvmsg to support this on Win32
-@OS_IS_WIN32_FALSE@am__append_47 = \
+@OS_IS_WIN32_FALSE@am__append_43 = \
 @OS_IS_WIN32_FALSE@		librtp.la
 
-@HAVE_AVAHI_TRUE@am__append_48 = \
+@HAVE_AVAHI_TRUE@am__append_44 = \
 @HAVE_AVAHI_TRUE@		libavahi-wrap.la
 
 
@@ -187,78 +175,71 @@
 ###################################
 
 # Serveral module (e.g. libalsa-util.la)
-@HAVE_DBUS_TRUE@am__append_49 = \
+@HAVE_DBUS_TRUE@am__append_45 = \
 @HAVE_DBUS_TRUE@		module-console-kit.la
 
 
 # See comment at librtp.la above
-@OS_IS_WIN32_FALSE@am__append_50 = \
+@OS_IS_WIN32_FALSE@am__append_46 = \
 @OS_IS_WIN32_FALSE@		module-rtp-send.la \
 @OS_IS_WIN32_FALSE@		module-rtp-recv.la
 
-@HAVE_AF_UNIX_TRUE@am__append_51 = \
+@HAVE_AF_UNIX_TRUE@am__append_47 = \
 @HAVE_AF_UNIX_TRUE@		module-cli-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-simple-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-http-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-native-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-esound-protocol-unix.la
 
-@HAVE_MKFIFO_TRUE@am__append_52 = \
+@HAVE_MKFIFO_TRUE@am__append_48 = \
 @HAVE_MKFIFO_TRUE@		module-pipe-sink.la \
 @HAVE_MKFIFO_TRUE@		module-pipe-source.la
 
-@OS_IS_WIN32_FALSE@am__append_53 = \
+@OS_IS_WIN32_FALSE@am__append_49 = \
 @OS_IS_WIN32_FALSE@		module-esound-compat-spawnfd.la \
 @OS_IS_WIN32_FALSE@		module-esound-compat-spawnpid.la
 
-@HAVE_REGEX_TRUE@am__append_54 = \
+@HAVE_REGEX_TRUE@am__append_50 = \
 @HAVE_REGEX_TRUE@		module-match.la
 
-@HAVE_X11_TRUE@am__append_55 = \
+@HAVE_X11_TRUE@am__append_51 = \
 @HAVE_X11_TRUE@		module-x11-bell.la \
 @HAVE_X11_TRUE@		module-x11-publish.la \
 @HAVE_X11_TRUE@		module-x11-xsmp.la \
 @HAVE_X11_TRUE@		module-x11-cork-request.la
 
-@HAVE_OSS_OUTPUT_TRUE@am__append_56 = \
+@HAVE_OSS_OUTPUT_TRUE@am__append_52 = \
 @HAVE_OSS_OUTPUT_TRUE@		liboss-util.la \
 @HAVE_OSS_OUTPUT_TRUE@		module-oss.la
 
-@HAVE_COREAUDIO_TRUE@am__append_57 = \
-@HAVE_COREAUDIO_TRUE@		module-coreaudio-detect.la \
-@HAVE_COREAUDIO_TRUE@		module-coreaudio-device.la
-
 pulselibexec_PROGRAMS = $(am__EXEEXT_9) $(am__EXEEXT_10)
-@HAVE_ALSA_TRUE@am__append_58 = \
+@HAVE_ALSA_TRUE@am__append_53 = \
 @HAVE_ALSA_TRUE@		libalsa-util.la \
 @HAVE_ALSA_TRUE@		module-alsa-sink.la \
 @HAVE_ALSA_TRUE@		module-alsa-source.la \
 @HAVE_ALSA_TRUE@		module-alsa-card.la
 
-@HAVE_SOLARIS_TRUE@am__append_59 = \
+@HAVE_SOLARIS_TRUE@am__append_54 = \
 @HAVE_SOLARIS_TRUE@		module-solaris.la
 
-@HAVE_AVAHI_TRUE@am__append_60 = \
+@HAVE_AVAHI_TRUE@am__append_55 = \
 @HAVE_AVAHI_TRUE@		module-zeroconf-publish.la \
 @HAVE_AVAHI_TRUE@		module-zeroconf-discover.la
 
-@HAVE_BONJOUR_TRUE@am__append_61 = \
-@HAVE_BONJOUR_TRUE@		module-bonjour-publish.la
-
-@HAVE_LIRC_TRUE@am__append_62 = \
+@HAVE_LIRC_TRUE@am__append_56 = \
 @HAVE_LIRC_TRUE@		module-lirc.la
 
-@HAVE_EVDEV_TRUE@am__append_63 = \
+@HAVE_EVDEV_TRUE@am__append_57 = \
 @HAVE_EVDEV_TRUE@		module-mmkbd-evdev.la
 
-@HAVE_JACK_TRUE@am__append_64 = \
+@HAVE_JACK_TRUE@am__append_58 = \
 @HAVE_JACK_TRUE@		module-jack-sink.la \
 @HAVE_JACK_TRUE@		module-jack-source.la
 
-@HAVE_GCONF_TRUE@am__append_65 = \
+@HAVE_GCONF_TRUE@am__append_59 = \
 @HAVE_GCONF_TRUE@		module-gconf.la
 
-@HAVE_GCONF_TRUE@am__append_66 = \
+@HAVE_GCONF_TRUE@am__append_60 = \
 @HAVE_GCONF_TRUE@		gconf-helper
 
 
@@ -266,20 +247,19 @@
 #modlibexec_LTLIBRARIES += \
 #		module-waveout.la
 #endif
-@HAVE_HAL_TRUE@am__append_67 = \
+@HAVE_HAL_TRUE@am__append_61 = \
 @HAVE_HAL_TRUE@		module-hal-detect.la
 
-@HAVE_HAL_COMPAT_TRUE@am__append_68 = \
+@HAVE_HAL_COMPAT_TRUE@am__append_62 = \
 @HAVE_HAL_COMPAT_TRUE@		module-hal-detect.la
 
-@HAVE_UDEV_TRUE@am__append_69 = \
+@HAVE_UDEV_TRUE@am__append_63 = \
 @HAVE_UDEV_TRUE@		module-udev-detect.la
 
-@HAVE_DBUS_TRUE@am__append_70 = \
-@HAVE_DBUS_TRUE@		module-rygel-media-server.la \
-@HAVE_DBUS_TRUE@		module-dbus-protocol.la
+@HAVE_DBUS_TRUE@am__append_64 = \
+@HAVE_DBUS_TRUE@		module-rygel-media-server.la
 
-@HAVE_BLUEZ_TRUE@am__append_71 = \
+@HAVE_BLUEZ_TRUE@am__append_65 = \
 @HAVE_BLUEZ_TRUE@		libbluetooth-util.la \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-proximity.la \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-discover.la \
@@ -287,36 +267,27 @@
 @HAVE_BLUEZ_TRUE@		libbluetooth-sbc.la \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-device.la
 
-@HAVE_BLUEZ_TRUE@am__append_72 = \
+@HAVE_BLUEZ_TRUE@am__append_66 = \
 @HAVE_BLUEZ_TRUE@		proximity-helper
 
-@HAVE_OPENSSL_TRUE@am__append_73 = \
+@HAVE_OPENSSL_TRUE@am__append_67 = \
 @HAVE_OPENSSL_TRUE@		libraop.la \
 @HAVE_OPENSSL_TRUE@		module-raop-sink.la
 
-@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@am__append_74 = \
+@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@am__append_68 = \
 @HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@		module-raop-discover.la
 
-@HAVE_FFTW_TRUE@am__append_75 = \
-@HAVE_FFTW_TRUE@		module-equalizer-sink.la
-
-@HAVE_FFTW_TRUE@am__append_76 = utils/qpaeq
-@HAVE_HAL_TRUE@am__append_77 = modules/hal-util.h modules/hal-util.c
-@HAVE_HAL_TRUE@am__append_78 = $(HAL_LIBS)
-@HAVE_HAL_TRUE@am__append_79 = $(HAL_CFLAGS)
-@HAVE_UDEV_TRUE@am__append_80 = modules/udev-util.h modules/udev-util.c
-@HAVE_UDEV_TRUE@am__append_81 = $(UDEV_LIBS)
-@HAVE_UDEV_TRUE@am__append_82 = $(UDEV_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_83 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
-@HAVE_DBUS_TRUE@am__append_84 = $(DBUS_LIBS)
-@HAVE_DBUS_TRUE@am__append_85 = $(DBUS_CFLAGS)
-@HAVE_DBUS_TRUE@am__append_86 = $(DBUS_LIBS)
-@HAVE_DBUS_TRUE@am__append_87 = $(DBUS_CFLAGS)
+@HAVE_HAL_TRUE@am__append_69 = modules/hal-util.h modules/hal-util.c
+@HAVE_HAL_TRUE@am__append_70 = $(HAL_LIBS)
+@HAVE_HAL_TRUE@am__append_71 = $(HAL_CFLAGS)
+@HAVE_UDEV_TRUE@am__append_72 = modules/udev-util.h modules/udev-util.c
+@HAVE_UDEV_TRUE@am__append_73 = $(UDEV_LIBS)
+@HAVE_UDEV_TRUE@am__append_74 = $(UDEV_CFLAGS)
+@HAVE_DBUS_TRUE@am__append_75 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
+@HAVE_DBUS_TRUE@am__append_76 = $(DBUS_LIBS)
+@HAVE_DBUS_TRUE@am__append_77 = $(DBUS_CFLAGS)
 subdir = src
-DIST_COMMON = $(am__dist_alsapaths_DATA_DIST) \
-	$(am__dist_alsaprofilesets_DATA_DIST) \
-	$(am__dist_udevrules_DATA_DIST) \
-	$(am__pulseinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__pulseinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
@@ -358,9 +329,9 @@
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" \
-	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" \
-	"$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" \
-	"$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(pulseconfdir)" \
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(alsapathsdir)" \
+	"$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(dbuspolicydir)" \
+	"$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(udevrulesdir)" \
 	"$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(modlibexec_LTLIBRARIES) \
 	$(noinst_LTLIBRARIES)
@@ -543,6 +514,24 @@
 	$(libpulse_simple_la_LDFLAGS) $(LDFLAGS) -o $@
 libpulse_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libpulsecommon-@PA_MAJORMINORMICRO@.la
+am__libpulse_la_SOURCES_DIST = pulse/cdecl.h pulse/channelmap.c \
+	pulse/channelmap.h pulse/context.c pulse/context.h pulse/def.h \
+	pulse/error.c pulse/error.h pulse/ext-device-manager.c \
+	pulse/ext-device-manager.h pulse/ext-stream-restore.c \
+	pulse/ext-stream-restore.h pulse/gccmacro.h pulse/internal.h \
+	pulse/introspect.c pulse/introspect.h pulse/mainloop-api.c \
+	pulse/mainloop-api.h pulse/mainloop-signal.c \
+	pulse/mainloop-signal.h pulse/mainloop.c pulse/mainloop.h \
+	pulse/operation.c pulse/operation.h pulse/proplist.c \
+	pulse/proplist.h pulse/pulseaudio.h pulse/rtclock.c \
+	pulse/rtclock.h pulse/sample.c pulse/sample.h pulse/scache.c \
+	pulse/scache.h pulse/stream.c pulse/stream.h pulse/subscribe.c \
+	pulse/subscribe.h pulse/thread-mainloop.c \
+	pulse/thread-mainloop.h pulse/timeval.c pulse/timeval.h \
+	pulse/utf8.c pulse/utf8.h pulse/util.c pulse/util.h \
+	pulse/volume.c pulse/volume.h pulse/xmalloc.c pulse/xmalloc.h \
+	pulse/client-conf-x11.c pulse/client-conf-x11.h
+@HAVE_X11_TRUE@am__objects_4 = libpulse_la-client-conf-x11.lo
 am_libpulse_la_OBJECTS = libpulse_la-channelmap.lo \
 	libpulse_la-context.lo libpulse_la-error.lo \
 	libpulse_la-ext-device-manager.lo \
@@ -554,7 +543,7 @@
 	libpulse_la-stream.lo libpulse_la-subscribe.lo \
 	libpulse_la-thread-mainloop.lo libpulse_la-timeval.lo \
 	libpulse_la-utf8.lo libpulse_la-util.lo libpulse_la-volume.lo \
-	libpulse_la-xmalloc.lo
+	libpulse_la-xmalloc.lo $(am__objects_4)
 libpulse_la_OBJECTS = $(am_libpulse_la_OBJECTS)
 libpulse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpulse_la_CFLAGS) \
@@ -610,28 +599,22 @@
 	pulsecore/tokenizer.h pulsecore/usergroup.c \
 	pulsecore/usergroup.h pulsecore/sndfile-util.c \
 	pulsecore/sndfile-util.h pulsecore/winsock.h \
-	pulse/client-conf-x11.c pulse/client-conf-x11.h \
 	pulsecore/mutex-win32.c pulsecore/mutex.h \
 	pulsecore/thread-win32.c pulsecore/thread.h \
 	pulsecore/semaphore-win32.c pulsecore/semaphore.h \
 	pulsecore/mutex-posix.c pulsecore/thread-posix.c \
-	pulsecore/semaphore-osx.c pulsecore/semaphore-posix.c \
-	pulsecore/x11prop.c pulsecore/x11prop.h pulsecore/dllmain.c \
-	pulsecore/dbus-util.c pulsecore/dbus-util.h pulsecore/rtkit.c \
-	pulsecore/rtkit.h
-@HAVE_X11_TRUE@am__objects_4 = libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.lo
+	pulsecore/semaphore-posix.c pulsecore/x11prop.c \
+	pulsecore/x11prop.h pulsecore/dllmain.c pulsecore/dbus-util.c \
+	pulsecore/dbus-util.h pulsecore/rtkit.c pulsecore/rtkit.h
 @OS_IS_WIN32_TRUE@am__objects_5 = libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.lo \
 @OS_IS_WIN32_TRUE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-thread-win32.lo \
 @OS_IS_WIN32_TRUE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-win32.lo
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__objects_6 = libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-posix.lo \
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-thread-posix.lo \
-@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.lo
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__objects_7 = libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-posix.lo \
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-thread-posix.lo \
-@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.lo
-@HAVE_X11_TRUE@am__objects_8 = libpulsecommon_@PA_MAJORMINORMICRO@_la-x11prop.lo
-@OS_IS_WIN32_TRUE@am__objects_9 = libpulsecommon_@PA_MAJORMINORMICRO@_la-dllmain.lo
-@HAVE_DBUS_TRUE@am__objects_10 = libpulsecommon_@PA_MAJORMINORMICRO@_la-dbus-util.lo \
+@OS_IS_WIN32_FALSE@am__objects_6 = libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-posix.lo \
+@OS_IS_WIN32_FALSE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-thread-posix.lo \
+@OS_IS_WIN32_FALSE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.lo
+@HAVE_X11_TRUE@am__objects_7 = libpulsecommon_@PA_MAJORMINORMICRO@_la-x11prop.lo
+@OS_IS_WIN32_TRUE@am__objects_8 = libpulsecommon_@PA_MAJORMINORMICRO@_la-dllmain.lo
+@HAVE_DBUS_TRUE@am__objects_9 = libpulsecommon_@PA_MAJORMINORMICRO@_la-dbus-util.lo \
 @HAVE_DBUS_TRUE@	libpulsecommon_@PA_MAJORMINORMICRO@_la-rtkit.lo
 am_libpulsecommon_@PA_MAJORMINORMICRO@_la_OBJECTS =  \
 	libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.lo \
@@ -685,9 +668,8 @@
 	libpulsecommon_@PA_MAJORMINORMICRO@_la-tokenizer.lo \
 	libpulsecommon_@PA_MAJORMINORMICRO@_la-usergroup.lo \
 	libpulsecommon_@PA_MAJORMINORMICRO@_la-sndfile-util.lo \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
-	$(am__objects_10)
+	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
+	$(am__objects_8) $(am__objects_9)
 libpulsecommon_@PA_MAJORMINORMICRO@_la_OBJECTS =  \
 	$(am_libpulsecommon_@PA_MAJORMINORMICRO@_la_OBJECTS)
 libpulsecommon_@PA_MAJORMINORMICRO@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -747,15 +729,13 @@
 	pulsecore/time-smoother.h pulsecore/database.h \
 	pulsecore/x11wrap.c pulsecore/x11wrap.h \
 	pulsecore/dbus-shared.c pulsecore/dbus-shared.h \
-	pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h \
 	pulsecore/database-gdbm.c pulsecore/database-tdb.c \
 	pulsecore/database-simple.c
-@HAVE_X11_TRUE@am__objects_11 = libpulsecore_@PA_MAJORMINORMICRO@_la-x11wrap.lo
-@HAVE_DBUS_TRUE@am__objects_12 = libpulsecore_@PA_MAJORMINORMICRO@_la-dbus-shared.lo \
-@HAVE_DBUS_TRUE@	libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.lo
-@HAVE_GDBM_TRUE@am__objects_13 = libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.lo
-@HAVE_TDB_TRUE@am__objects_14 = libpulsecore_@PA_MAJORMINORMICRO@_la-database-tdb.lo
-@HAVE_SIMPLEDB_TRUE@am__objects_15 = libpulsecore_@PA_MAJORMINORMICRO@_la-database-simple.lo
+@HAVE_X11_TRUE@am__objects_10 = libpulsecore_@PA_MAJORMINORMICRO@_la-x11wrap.lo
+@HAVE_DBUS_TRUE@am__objects_11 = libpulsecore_@PA_MAJORMINORMICRO@_la-dbus-shared.lo
+@HAVE_GDBM_TRUE@am__objects_12 = libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.lo
+@HAVE_TDB_TRUE@am__objects_13 = libpulsecore_@PA_MAJORMINORMICRO@_la-database-tdb.lo
+@HAVE_SIMPLEDB_TRUE@am__objects_14 = libpulsecore_@PA_MAJORMINORMICRO@_la-database-simple.lo
 am_libpulsecore_@PA_MAJORMINORMICRO@_la_OBJECTS =  \
 	libpulsecore_@PA_MAJORMINORMICRO@_la-asyncmsgq.lo \
 	libpulsecore_@PA_MAJORMINORMICRO@_la-asyncq.lo \
@@ -808,8 +788,8 @@
 	libpulsecore_@PA_MAJORMINORMICRO@_la-start-child.lo \
 	libpulsecore_@PA_MAJORMINORMICRO@_la-thread-mq.lo \
 	libpulsecore_@PA_MAJORMINORMICRO@_la-time-smoother.lo \
-	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
-	$(am__objects_14) $(am__objects_15)
+	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+	$(am__objects_13) $(am__objects_14)
 libpulsecore_@PA_MAJORMINORMICRO@_la_OBJECTS =  \
 	$(am_libpulsecore_@PA_MAJORMINORMICRO@_la_OBJECTS)
 libpulsecore_@PA_MAJORMINORMICRO@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -953,18 +933,6 @@
 	$(module_bluetooth_proximity_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_BLUEZ_TRUE@am_module_bluetooth_proximity_la_rpath = -rpath \
 @HAVE_BLUEZ_TRUE@	$(modlibexecdir)
-module_bonjour_publish_la_DEPENDENCIES =  \
-	libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-am_module_bonjour_publish_la_OBJECTS = module-bonjour-publish.lo
-module_bonjour_publish_la_OBJECTS =  \
-	$(am_module_bonjour_publish_la_OBJECTS)
-module_bonjour_publish_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_bonjour_publish_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@HAVE_BONJOUR_TRUE@am_module_bonjour_publish_la_rpath = -rpath \
-@HAVE_BONJOUR_TRUE@	$(modlibexecdir)
 module_card_restore_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libpulsecore-@PA_MAJORMINORMICRO@.la \
 	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -1028,30 +996,6 @@
 	$(module_console_kit_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_DBUS_TRUE@am_module_console_kit_la_rpath = -rpath \
 @HAVE_DBUS_TRUE@	$(modlibexecdir)
-module_coreaudio_detect_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-am_module_coreaudio_detect_la_OBJECTS = module-coreaudio-detect.lo
-module_coreaudio_detect_la_OBJECTS =  \
-	$(am_module_coreaudio_detect_la_OBJECTS)
-module_coreaudio_detect_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_coreaudio_detect_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@HAVE_COREAUDIO_TRUE@am_module_coreaudio_detect_la_rpath = -rpath \
-@HAVE_COREAUDIO_TRUE@	$(modlibexecdir)
-module_coreaudio_device_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-am_module_coreaudio_device_la_OBJECTS = module-coreaudio-device.lo
-module_coreaudio_device_la_OBJECTS =  \
-	$(am_module_coreaudio_device_la_OBJECTS)
-module_coreaudio_device_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(module_coreaudio_device_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@HAVE_COREAUDIO_TRUE@am_module_coreaudio_device_la_rpath = -rpath \
-@HAVE_COREAUDIO_TRUE@	$(modlibexecdir)
 module_cork_music_on_phone_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libpulsecore-@PA_MAJORMINORMICRO@.la \
 	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -1063,29 +1007,6 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_cork_music_on_phone_la_CFLAGS) $(CFLAGS) \
 	$(module_cork_music_on_phone_la_LDFLAGS) $(LDFLAGS) -o $@
-module_dbus_protocol_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1) libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-am_module_dbus_protocol_la_OBJECTS =  \
-	module_dbus_protocol_la-iface-card.lo \
-	module_dbus_protocol_la-iface-card-profile.lo \
-	module_dbus_protocol_la-iface-client.lo \
-	module_dbus_protocol_la-iface-core.lo \
-	module_dbus_protocol_la-iface-device.lo \
-	module_dbus_protocol_la-iface-device-port.lo \
-	module_dbus_protocol_la-iface-memstats.lo \
-	module_dbus_protocol_la-iface-module.lo \
-	module_dbus_protocol_la-iface-sample.lo \
-	module_dbus_protocol_la-iface-stream.lo \
-	module_dbus_protocol_la-module-dbus-protocol.lo
-module_dbus_protocol_la_OBJECTS =  \
-	$(am_module_dbus_protocol_la_OBJECTS)
-module_dbus_protocol_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(module_dbus_protocol_la_CFLAGS) $(CFLAGS) \
-	$(module_dbus_protocol_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_DBUS_TRUE@am_module_dbus_protocol_la_rpath = -rpath \
-@HAVE_DBUS_TRUE@	$(modlibexecdir)
 module_default_device_restore_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libpulsecore-@PA_MAJORMINORMICRO@.la \
 	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -1127,20 +1048,6 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_device_restore_la_CFLAGS) $(CFLAGS) \
 	$(module_device_restore_la_LDFLAGS) $(LDFLAGS) -o $@
-module_equalizer_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-am_module_equalizer_sink_la_OBJECTS =  \
-	module_equalizer_sink_la-module-equalizer-sink.lo
-module_equalizer_sink_la_OBJECTS =  \
-	$(am_module_equalizer_sink_la_OBJECTS)
-module_equalizer_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(module_equalizer_sink_la_CFLAGS) $(CFLAGS) \
-	$(module_equalizer_sink_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_FFTW_TRUE@am_module_equalizer_sink_la_rpath = -rpath \
-@HAVE_FFTW_TRUE@	$(modlibexecdir)
 module_esound_compat_spawnfd_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libpulsecore-@PA_MAJORMINORMICRO@.la \
 	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -1563,8 +1470,7 @@
 @HAVE_SOLARIS_TRUE@	$(modlibexecdir)
 module_stream_restore_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libprotocol-native.la libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la \
-	$(am__DEPENDENCIES_5)
+	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 am_module_stream_restore_la_OBJECTS =  \
 	module_stream_restore_la-module-stream-restore.lo
 module_stream_restore_la_OBJECTS =  \
@@ -1717,7 +1623,7 @@
 	channelmap-test$(EXEEXT) thread-mainloop-test$(EXEEXT) \
 	utf8-test$(EXEEXT) get-binary-name-test$(EXEEXT) \
 	ipacl-test$(EXEEXT) hook-list-test$(EXEEXT) \
-	memblock-test$(EXEEXT) thread-test$(EXEEXT) once-test$(EXEEXT) \
+	memblock-test$(EXEEXT) thread-test$(EXEEXT) \
 	flist-test$(EXEEXT) asyncq-test$(EXEEXT) \
 	asyncmsgq-test$(EXEEXT) queue-test$(EXEEXT) \
 	rtpoll-test$(EXEEXT) sig2str-test$(EXEEXT) \
@@ -1869,8 +1775,8 @@
 mainloop_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mainloop_test_CFLAGS) \
 	$(CFLAGS) $(mainloop_test_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_16 = mainloop_test_glib-mainloop-test.$(OBJEXT)
-am_mainloop_test_glib_OBJECTS = $(am__objects_16)
+am__objects_15 = mainloop_test_glib-mainloop-test.$(OBJEXT)
+am_mainloop_test_glib_OBJECTS = $(am__objects_15)
 mainloop_test_glib_OBJECTS = $(am_mainloop_test_glib_OBJECTS)
 am__DEPENDENCIES_9 = $(am__DEPENDENCIES_2) libpulse.la
 mainloop_test_glib_DEPENDENCIES = $(am__DEPENDENCIES_9) \
@@ -1912,14 +1818,6 @@
 mix_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mix_test_CFLAGS) \
 	$(CFLAGS) $(mix_test_LDFLAGS) $(LDFLAGS) -o $@
-am_once_test_OBJECTS = once_test-once-test.$(OBJEXT)
-once_test_OBJECTS = $(am_once_test_OBJECTS)
-once_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la
-once_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(once_test_CFLAGS) \
-	$(CFLAGS) $(once_test_LDFLAGS) $(LDFLAGS) -o $@
 am_pabrowse_OBJECTS = pabrowse-pabrowse.$(OBJEXT)
 pabrowse_OBJECTS = $(am_pabrowse_OBJECTS)
 pabrowse_DEPENDENCIES = $(am__DEPENDENCIES_2) libpulse.la \
@@ -2001,19 +1899,11 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(proximity_helper_CFLAGS) $(CFLAGS) \
 	$(proximity_helper_LDFLAGS) $(LDFLAGS) -o $@
-am__pulseaudio_SOURCES_DIST = daemon/caps.c daemon/caps.h \
-	daemon/cmdline.c daemon/cmdline.h daemon/cpulimit.c \
-	daemon/cpulimit.h daemon/daemon-conf.c daemon/daemon-conf.h \
-	daemon/dumpmodules.c daemon/dumpmodules.h \
-	daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h daemon/main.c \
-	daemon/server-lookup.c daemon/server-lookup.h
-@HAVE_DBUS_TRUE@am__objects_17 = pulseaudio-server-lookup.$(OBJEXT)
 am_pulseaudio_OBJECTS = pulseaudio-caps.$(OBJEXT) \
 	pulseaudio-cmdline.$(OBJEXT) pulseaudio-cpulimit.$(OBJEXT) \
 	pulseaudio-daemon-conf.$(OBJEXT) \
 	pulseaudio-dumpmodules.$(OBJEXT) \
-	pulseaudio-ltdl-bind-now.$(OBJEXT) pulseaudio-main.$(OBJEXT) \
-	$(am__objects_17)
+	pulseaudio-ltdl-bind-now.$(OBJEXT) pulseaudio-main.$(OBJEXT)
 pulseaudio_OBJECTS = $(am_pulseaudio_OBJECTS)
 pulseaudio_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pulseaudio_CFLAGS) \
@@ -2201,21 +2091,16 @@
 	$(module_bluetooth_device_la_SOURCES) \
 	$(module_bluetooth_discover_la_SOURCES) \
 	$(module_bluetooth_proximity_la_SOURCES) \
-	$(module_bonjour_publish_la_SOURCES) \
 	$(module_card_restore_la_SOURCES) \
 	$(module_cli_protocol_tcp_la_SOURCES) \
 	$(module_cli_protocol_unix_la_SOURCES) \
 	$(module_cli_la_SOURCES) $(module_combine_la_SOURCES) \
 	$(module_console_kit_la_SOURCES) \
-	$(module_coreaudio_detect_la_SOURCES) \
-	$(module_coreaudio_device_la_SOURCES) \
 	$(module_cork_music_on_phone_la_SOURCES) \
-	$(module_dbus_protocol_la_SOURCES) \
 	$(module_default_device_restore_la_SOURCES) \
 	$(module_detect_la_SOURCES) \
 	$(module_device_manager_la_SOURCES) \
 	$(module_device_restore_la_SOURCES) \
-	$(module_equalizer_sink_la_SOURCES) \
 	$(module_esound_compat_spawnfd_la_SOURCES) \
 	$(module_esound_compat_spawnpid_la_SOURCES) \
 	$(module_esound_protocol_tcp_la_SOURCES) \
@@ -2268,20 +2153,19 @@
 	$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
 	$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
 	$(memblockq_test_SOURCES) $(mix_test_SOURCES) \
-	$(once_test_SOURCES) $(pabrowse_SOURCES) $(pacat_SOURCES) \
-	$(pacat_simple_SOURCES) $(pacmd_SOURCES) $(pactl_SOURCES) \
-	$(parec_simple_SOURCES) $(pasuspender_SOURCES) \
-	$(pax11publish_SOURCES) $(prioq_test_SOURCES) \
-	$(proplist_test_SOURCES) $(proximity_helper_SOURCES) \
-	$(pulseaudio_SOURCES) $(queue_test_SOURCES) \
-	$(remix_test_SOURCES) $(resampler_test_SOURCES) \
-	$(rtpoll_test_SOURCES) $(rtstutter_SOURCES) \
-	$(sig2str_test_SOURCES) $(sigbus_test_SOURCES) \
-	$(smoother_test_SOURCES) $(stripnul_SOURCES) \
-	$(strlist_test_SOURCES) $(sync_playback_SOURCES) \
-	$(thread_mainloop_test_SOURCES) $(thread_test_SOURCES) \
-	$(usergroup_test_SOURCES) $(utf8_test_SOURCES) \
-	$(vector_test_SOURCES) $(voltest_SOURCES)
+	$(pabrowse_SOURCES) $(pacat_SOURCES) $(pacat_simple_SOURCES) \
+	$(pacmd_SOURCES) $(pactl_SOURCES) $(parec_simple_SOURCES) \
+	$(pasuspender_SOURCES) $(pax11publish_SOURCES) \
+	$(prioq_test_SOURCES) $(proplist_test_SOURCES) \
+	$(proximity_helper_SOURCES) $(pulseaudio_SOURCES) \
+	$(queue_test_SOURCES) $(remix_test_SOURCES) \
+	$(resampler_test_SOURCES) $(rtpoll_test_SOURCES) \
+	$(rtstutter_SOURCES) $(sig2str_test_SOURCES) \
+	$(sigbus_test_SOURCES) $(smoother_test_SOURCES) \
+	$(stripnul_SOURCES) $(strlist_test_SOURCES) \
+	$(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
+	$(thread_test_SOURCES) $(usergroup_test_SOURCES) \
+	$(utf8_test_SOURCES) $(vector_test_SOURCES) $(voltest_SOURCES)
 DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(libavahi_wrap_la_SOURCES) $(libbluetooth_ipc_la_SOURCES) \
 	$(libbluetooth_sbc_la_SOURCES) $(libbluetooth_util_la_SOURCES) \
@@ -2291,7 +2175,7 @@
 	$(libprotocol_native_la_SOURCES) \
 	$(libprotocol_simple_la_SOURCES) $(libpulse_browse_la_SOURCES) \
 	$(libpulse_mainloop_glib_la_SOURCES) \
-	$(libpulse_simple_la_SOURCES) $(libpulse_la_SOURCES) \
+	$(libpulse_simple_la_SOURCES) $(am__libpulse_la_SOURCES_DIST) \
 	$(am__libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES_DIST) \
 	$(am__libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES_DIST) \
 	$(libpulsecore_foreign_la_SOURCES) $(libpulsedsp_la_SOURCES) \
@@ -2303,21 +2187,16 @@
 	$(module_bluetooth_device_la_SOURCES) \
 	$(module_bluetooth_discover_la_SOURCES) \
 	$(module_bluetooth_proximity_la_SOURCES) \
-	$(module_bonjour_publish_la_SOURCES) \
 	$(module_card_restore_la_SOURCES) \
 	$(module_cli_protocol_tcp_la_SOURCES) \
 	$(module_cli_protocol_unix_la_SOURCES) \
 	$(module_cli_la_SOURCES) $(module_combine_la_SOURCES) \
 	$(module_console_kit_la_SOURCES) \
-	$(module_coreaudio_detect_la_SOURCES) \
-	$(module_coreaudio_device_la_SOURCES) \
 	$(module_cork_music_on_phone_la_SOURCES) \
-	$(module_dbus_protocol_la_SOURCES) \
 	$(module_default_device_restore_la_SOURCES) \
 	$(module_detect_la_SOURCES) \
 	$(module_device_manager_la_SOURCES) \
 	$(module_device_restore_la_SOURCES) \
-	$(module_equalizer_sink_la_SOURCES) \
 	$(module_esound_compat_spawnfd_la_SOURCES) \
 	$(module_esound_compat_spawnpid_la_SOURCES) \
 	$(module_esound_protocol_tcp_la_SOURCES) \
@@ -2370,47 +2249,21 @@
 	$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
 	$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
 	$(memblockq_test_SOURCES) $(mix_test_SOURCES) \
-	$(once_test_SOURCES) $(pabrowse_SOURCES) $(pacat_SOURCES) \
-	$(pacat_simple_SOURCES) $(pacmd_SOURCES) $(pactl_SOURCES) \
-	$(parec_simple_SOURCES) $(pasuspender_SOURCES) \
-	$(pax11publish_SOURCES) $(prioq_test_SOURCES) \
-	$(proplist_test_SOURCES) $(proximity_helper_SOURCES) \
-	$(am__pulseaudio_SOURCES_DIST) $(queue_test_SOURCES) \
-	$(remix_test_SOURCES) $(resampler_test_SOURCES) \
-	$(rtpoll_test_SOURCES) $(rtstutter_SOURCES) \
-	$(sig2str_test_SOURCES) $(sigbus_test_SOURCES) \
-	$(smoother_test_SOURCES) $(stripnul_SOURCES) \
-	$(strlist_test_SOURCES) $(sync_playback_SOURCES) \
-	$(thread_mainloop_test_SOURCES) $(thread_test_SOURCES) \
-	$(usergroup_test_SOURCES) $(utf8_test_SOURCES) \
-	$(vector_test_SOURCES) $(voltest_SOURCES)
-am__dist_alsapaths_DATA_DIST =  \
-	modules/alsa/mixer/paths/analog-input-aux.conf \
-	modules/alsa/mixer/paths/analog-input.conf \
-	modules/alsa/mixer/paths/analog-input.conf.common \
-	modules/alsa/mixer/paths/analog-input-fm.conf \
-	modules/alsa/mixer/paths/analog-input-linein.conf \
-	modules/alsa/mixer/paths/analog-input-mic.conf \
-	modules/alsa/mixer/paths/analog-input-mic.conf.common \
-	modules/alsa/mixer/paths/analog-input-mic-line.conf \
-	modules/alsa/mixer/paths/analog-input-tvtuner.conf \
-	modules/alsa/mixer/paths/analog-input-video.conf \
-	modules/alsa/mixer/paths/analog-output.conf \
-	modules/alsa/mixer/paths/analog-output-speaker.conf \
-	modules/alsa/mixer/paths/analog-output.conf.common \
-	modules/alsa/mixer/paths/analog-output-headphones.conf \
-	modules/alsa/mixer/paths/analog-output-headphones-2.conf \
-	modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
-	modules/alsa/mixer/paths/analog-output-mono.conf
-am__dist_alsaprofilesets_DATA_DIST =  \
-	modules/alsa/mixer/profile-sets/default.conf \
-	modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-	modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
-am__dist_udevrules_DATA_DIST =  \
-	modules/alsa/mixer/profile-sets/90-pulseaudio.rules
-DATA = $(dbuspolicy_DATA) $(dist_alsapaths_DATA) \
-	$(dist_alsaprofilesets_DATA) $(dist_udevrules_DATA) \
-	$(pulseconf_DATA) $(xdgautostart_DATA)
+	$(pabrowse_SOURCES) $(pacat_SOURCES) $(pacat_simple_SOURCES) \
+	$(pacmd_SOURCES) $(pactl_SOURCES) $(parec_simple_SOURCES) \
+	$(pasuspender_SOURCES) $(pax11publish_SOURCES) \
+	$(prioq_test_SOURCES) $(proplist_test_SOURCES) \
+	$(proximity_helper_SOURCES) $(pulseaudio_SOURCES) \
+	$(queue_test_SOURCES) $(remix_test_SOURCES) \
+	$(resampler_test_SOURCES) $(rtpoll_test_SOURCES) \
+	$(rtstutter_SOURCES) $(sig2str_test_SOURCES) \
+	$(sigbus_test_SOURCES) $(smoother_test_SOURCES) \
+	$(stripnul_SOURCES) $(strlist_test_SOURCES) \
+	$(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
+	$(thread_test_SOURCES) $(usergroup_test_SOURCES) \
+	$(utf8_test_SOURCES) $(vector_test_SOURCES) $(voltest_SOURCES)
+DATA = $(alsapaths_DATA) $(alsaprofilesets_DATA) $(dbuspolicy_DATA) \
+	$(pulseconf_DATA) $(udevrules_DATA) $(xdgautostart_DATA)
 am__pulseinclude_HEADERS_DIST = pulse/cdecl.h pulse/channelmap.h \
 	pulse/context.h pulse/def.h pulse/error.h \
 	pulse/ext-device-manager.h pulse/ext-stream-restore.h \
@@ -2465,8 +2318,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFTW_CFLAGS = @FFTW_CFLAGS@
-FFTW_LIBS = @FFTW_LIBS@
 FGREP = @FGREP@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
@@ -2485,8 +2336,6 @@
 HAVE_ALSA = @HAVE_ALSA@
 HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
-HAVE_BONJOUR = @HAVE_BONJOUR@
-HAVE_COREAUDIO = @HAVE_COREAUDIO@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GCONF = @HAVE_GCONF@
 HAVE_GDBM = @HAVE_GDBM@
@@ -2595,7 +2444,6 @@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-STOW = @STOW@
 STRIP = @STRIP@
 TDB_CFLAGS = @TDB_CFLAGS@
 TDB_LIBS = @TDB_LIBS@
@@ -2662,7 +2510,6 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-udevrulesdir = @udevrulesdir@
 pulseincludedir = $(includedir)/pulse
 pulsecoreincludedir = $(includedir)/pulsecore
 pulseconfdir = $(sysconfdir)/pulse
@@ -2670,6 +2517,7 @@
 xdgautostartdir = $(sysconfdir)/xdg/autostart
 alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
 alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
+udevrulesdir = /lib/udev/rules.d
 dbuspolicydir = $(sysconfdir)/dbus-1/system.d
 
 ###################################
@@ -2703,8 +2551,6 @@
 	-I$(top_builddir)/src/modules/x11 \
 	-I$(top_srcdir)/src/modules/jack \
 	-I$(top_builddir)/src/modules/jack \
-	-I$(top_srcdir)/src/modules/dbus \
-	-I$(top_builddir)/src/modules/dbus \
 	$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
 	$(LIBSAMPLERATE_CFLAGS) \
 	$(LIBSNDFILE_CFLAGS) \
@@ -2733,13 +2579,39 @@
 ###################################
 #          Extra files            #
 ###################################
+ALSA_PROFILES = \
+		modules/alsa/mixer/profile-sets/default.conf \
+		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
+		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+
+ALSA_PATHS = \
+		modules/alsa/mixer/paths/analog-input-aux.conf \
+		modules/alsa/mixer/paths/analog-input.conf \
+		modules/alsa/mixer/paths/analog-input.conf.common \
+		modules/alsa/mixer/paths/analog-input-fm.conf \
+		modules/alsa/mixer/paths/analog-input-linein.conf \
+		modules/alsa/mixer/paths/analog-input-mic.conf \
+		modules/alsa/mixer/paths/analog-input-mic.conf.common \
+		modules/alsa/mixer/paths/analog-input-mic-line.conf \
+		modules/alsa/mixer/paths/analog-input-tvtuner.conf \
+		modules/alsa/mixer/paths/analog-input-video.conf \
+		modules/alsa/mixer/paths/analog-output.conf \
+		modules/alsa/mixer/paths/analog-output-speaker.conf \
+		modules/alsa/mixer/paths/analog-output.conf.common \
+		modules/alsa/mixer/paths/analog-output-headphones.conf \
+		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
+		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
+		modules/alsa/mixer/paths/analog-output-mono.conf
+
 EXTRA_DIST = pulse/client.conf.in pulse/version.h.in \
 	daemon/daemon.conf.in daemon/default.pa.in daemon/system.pa.in \
 	daemon/default.pa.win32 depmod.py daemon/esdcompat.in \
 	daemon/start-pulseaudio-x11.in daemon/start-pulseaudio-kde.in \
 	utils/padsp modules/module-defs.h.m4 \
 	daemon/pulseaudio.desktop.in daemon/pulseaudio-kde.desktop.in \
-	map-file daemon/pulseaudio-system.conf $(SYMDEF_FILES)
+	map-file daemon/pulseaudio-system.conf \
+	modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
+	${ALSA_PROFILES} ${ALSA_PATHS} $(SYMDEF_FILES)
 pulseconf_DATA = \
 		default.pa \
 		system.pa \
@@ -2755,18 +2627,17 @@
 
 xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 BUILT_SOURCES = pulse/version.h $(SYMDEF_FILES)
-pulseaudio_SOURCES = daemon/caps.c daemon/caps.h daemon/cmdline.c \
-	daemon/cmdline.h daemon/cpulimit.c daemon/cpulimit.h \
-	daemon/daemon-conf.c daemon/daemon-conf.h daemon/dumpmodules.c \
-	daemon/dumpmodules.h daemon/ltdl-bind-now.c \
-	daemon/ltdl-bind-now.h daemon/main.c $(am__append_3)
-pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) \
-	$(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) \
-	$(am__append_2)
-pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) \
-	$(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) \
-	$(CAP_LIBS) $(am__append_4)
+pulseaudio_SOURCES = \
+		daemon/caps.h daemon/caps.c \
+		daemon/cmdline.c daemon/cmdline.h \
+		daemon/cpulimit.c daemon/cpulimit.h \
+		daemon/daemon-conf.c daemon/daemon-conf.h \
+		daemon/dumpmodules.c daemon/dumpmodules.h \
+		daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \
+		daemon/main.c
+
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS)
+pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS)
 # This is needed because automake doesn't properly expand the foreach below
 pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS)
 @PREOPEN_MODS_FALSE@PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
@@ -2774,7 +2645,7 @@
 @FORCE_PREOPEN_FALSE@pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
 @FORCE_PREOPEN_TRUE@pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
 bin_SCRIPTS = esdcompat start-pulseaudio-x11 start-pulseaudio-kde \
-	$(am__append_33) $(am__append_76)
+	$(am__append_29)
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la $(LIBSNDFILE_LIBS)
 pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -2803,12 +2674,12 @@
 	strlist-test close-test voltest vector-test memblockq-test \
 	sync-playback interpol-test channelmap-test \
 	thread-mainloop-test utf8-test get-binary-name-test ipacl-test \
-	hook-list-test memblock-test thread-test once-test flist-test \
+	hook-list-test memblock-test thread-test flist-test \
 	asyncq-test asyncmsgq-test queue-test rtpoll-test sig2str-test \
 	resampler-test smoother-test mix-test remix-test envelope-test \
 	proplist-test rtstutter stripnul lock-autospawn-test \
-	prioq-test sigbus-test usergroup-test $(am__append_8) \
-	$(am__append_10) $(am__append_11) $(am__append_12)
+	prioq-test sigbus-test usergroup-test $(am__append_5) \
+	$(am__append_7) $(am__append_8) $(am__append_9)
 mainloop_test_SOURCES = tests/mainloop-test.c
 mainloop_test_CFLAGS = $(AM_CFLAGS)
 mainloop_test_LDADD = $(AM_LDADD) libpulse.la
@@ -2841,10 +2712,6 @@
 thread_test_CFLAGS = $(AM_CFLAGS)
 thread_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 thread_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-once_test_SOURCES = tests/once-test.c
-once_test_CFLAGS = $(AM_CFLAGS)
-once_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
-once_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 flist_test_SOURCES = tests/flist-test.c
 flist_test_CFLAGS = $(AM_CFLAGS)
 flist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
@@ -2990,8 +2857,8 @@
 #      Daemon core library        #
 ###################################
 lib_LTLIBRARIES = libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la \
-	libpulse-simple.la $(am__append_29) $(am__append_31) \
-	$(am__append_32) libpulsecore-@PA_MAJORMINORMICRO@.la
+	libpulse-simple.la $(am__append_22) $(am__append_24) \
+	$(am__append_28) libpulsecore-@PA_MAJORMINORMICRO@.la
 libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES = pulse/client-conf.c \
 	pulse/client-conf.h pulse/i18n.c pulse/i18n.h \
 	pulse/fork-detect.c pulse/fork-detect.h pulsecore/atomic.h \
@@ -3036,20 +2903,19 @@
 	pulsecore/time-smoother.h pulsecore/tokenizer.c \
 	pulsecore/tokenizer.h pulsecore/usergroup.c \
 	pulsecore/usergroup.h pulsecore/sndfile-util.c \
-	pulsecore/sndfile-util.h pulsecore/winsock.h $(am__append_13) \
-	$(am__append_16) $(am__append_17) $(am__append_19) \
-	$(am__append_20) $(am__append_24) $(am__append_25)
+	pulsecore/sndfile-util.h pulsecore/winsock.h $(am__append_10) \
+	$(am__append_11) $(am__append_12) $(am__append_17) \
+	$(am__append_18)
 
 # proplist-util.h uses these header files, but not the library itself!
 libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) \
-	$(am__append_14) $(GLIB20_CFLAGS) $(GTK20_CFLAGS) \
-	$(am__append_18) $(am__append_21) $(am__append_22) \
-	$(am__append_26)
+	$(GLIB20_CFLAGS) $(GTK20_CFLAGS) $(am__append_13) \
+	$(am__append_15) $(am__append_19)
 libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \
-	-avoid-version $(am__append_15)
+	-avoid-version $(am__append_14)
 libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \
 	$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
-	$(LIBSNDFILE_LIBS) $(am__append_23) $(am__append_27)
+	$(LIBSNDFILE_LIBS) $(am__append_16) $(am__append_20)
 
 ###################################
 #         Client library          #
@@ -3063,41 +2929,30 @@
 	pulse/sample.h pulse/scache.h pulse/simple.h pulse/stream.h \
 	pulse/subscribe.h pulse/thread-mainloop.h pulse/timeval.h \
 	pulse/utf8.h pulse/util.h pulse/version.h pulse/volume.h \
-	pulse/xmalloc.h $(am__append_28) $(am__append_30)
+	pulse/xmalloc.h $(am__append_21) $(am__append_23)
 
 # Public interface
-libpulse_la_SOURCES = \
-		pulse/cdecl.h \
-		pulse/channelmap.c pulse/channelmap.h \
-		pulse/context.c pulse/context.h \
-		pulse/def.h \
-		pulse/error.c pulse/error.h \
-		pulse/ext-device-manager.c pulse/ext-device-manager.h \
-		pulse/ext-stream-restore.c pulse/ext-stream-restore.h \
-		pulse/gccmacro.h \
-		pulse/internal.h \
-		pulse/introspect.c pulse/introspect.h \
-		pulse/mainloop-api.c pulse/mainloop-api.h \
-		pulse/mainloop-signal.c pulse/mainloop-signal.h \
-		pulse/mainloop.c pulse/mainloop.h \
-		pulse/operation.c pulse/operation.h \
-		pulse/proplist.c pulse/proplist.h \
-		pulse/pulseaudio.h \
-		pulse/rtclock.c pulse/rtclock.h \
-		pulse/sample.c pulse/sample.h \
-		pulse/scache.c pulse/scache.h \
-		pulse/stream.c pulse/stream.h \
-		pulse/subscribe.c pulse/subscribe.h \
-		pulse/thread-mainloop.c pulse/thread-mainloop.h \
-		pulse/timeval.c pulse/timeval.h \
-		pulse/utf8.c pulse/utf8.h \
-		pulse/util.c pulse/util.h \
-		pulse/volume.c pulse/volume.h \
-		pulse/xmalloc.c pulse/xmalloc.h
-
-libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libpulse_la_SOURCES = pulse/cdecl.h pulse/channelmap.c \
+	pulse/channelmap.h pulse/context.c pulse/context.h pulse/def.h \
+	pulse/error.c pulse/error.h pulse/ext-device-manager.c \
+	pulse/ext-device-manager.h pulse/ext-stream-restore.c \
+	pulse/ext-stream-restore.h pulse/gccmacro.h pulse/internal.h \
+	pulse/introspect.c pulse/introspect.h pulse/mainloop-api.c \
+	pulse/mainloop-api.h pulse/mainloop-signal.c \
+	pulse/mainloop-signal.h pulse/mainloop.c pulse/mainloop.h \
+	pulse/operation.c pulse/operation.h pulse/proplist.c \
+	pulse/proplist.h pulse/pulseaudio.h pulse/rtclock.c \
+	pulse/rtclock.h pulse/sample.c pulse/sample.h pulse/scache.c \
+	pulse/scache.h pulse/stream.c pulse/stream.h pulse/subscribe.c \
+	pulse/subscribe.h pulse/thread-mainloop.c \
+	pulse/thread-mainloop.h pulse/timeval.c pulse/timeval.h \
+	pulse/utf8.c pulse/utf8.h pulse/util.c pulse/util.h \
+	pulse/volume.c pulse/volume.h pulse/xmalloc.c pulse/xmalloc.h \
+	$(am__append_25)
+libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(am__append_26)
 libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la
-libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
+libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) \
+	-version-info $(LIBPULSE_VERSION_INFO) $(am__append_27)
 libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
 libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
 libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la
@@ -3156,19 +3011,19 @@
 	pulsecore/start-child.h pulsecore/thread-mq.c \
 	pulsecore/thread-mq.h pulsecore/time-smoother.c \
 	pulsecore/time-smoother.h pulsecore/database.h \
-	$(am__append_34) $(am__append_37) $(am__append_40) \
-	$(am__append_43) $(am__append_46)
+	$(am__append_30) $(am__append_33) $(am__append_36) \
+	$(am__append_39) $(am__append_42)
 libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) \
 	$(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(WINSOCK_CFLAGS) \
-	$(am__append_35) $(am__append_38) $(am__append_41) \
-	$(am__append_44)
+	$(am__append_31) $(am__append_34) $(am__append_37) \
+	$(am__append_40)
 libpulsecore_@PA_MAJORMINORMICRO@_la_LDFLAGS = -avoid-version \
-	$(am__append_36)
+	$(am__append_32)
 libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) \
 	$(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(WINSOCK_LIBS) \
 	$(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la \
-	libpulse.la libpulsecore-foreign.la $(am__append_39) \
-	$(am__append_42) $(am__append_45)
+	libpulse.la libpulsecore-foreign.la $(am__append_35) \
+	$(am__append_38) $(am__append_41)
 
 # We split the foreign code off to not be annoyed by warnings we don't care about
 noinst_LTLIBRARIES = libpulsecore-foreign.la
@@ -3187,8 +3042,8 @@
 ### the head, and not the other way!
 modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \
 	libprotocol-simple.la libprotocol-http.la \
-	libprotocol-native.la libprotocol-esound.la $(am__append_47) \
-	$(am__append_48) $(am__append_49) module-cli.la \
+	libprotocol-native.la libprotocol-esound.la $(am__append_43) \
+	$(am__append_44) $(am__append_45) module-cli.la \
 	module-cli-protocol-tcp.la module-simple-protocol-tcp.la \
 	module-null-sink.la module-sine-source.la module-detect.la \
 	module-volume-restore.la module-device-manager.la \
@@ -3203,15 +3058,14 @@
 	module-esound-sink.la module-tunnel-sink.la \
 	module-tunnel-source.la module-position-event-sounds.la \
 	module-augment-properties.la module-cork-music-on-phone.la \
-	module-loopback.la $(am__append_50) $(am__append_51) \
-	$(am__append_52) $(am__append_53) $(am__append_54) \
-	$(am__append_55) $(am__append_56) $(am__append_57) \
-	$(am__append_58) $(am__append_59) $(am__append_60) \
+	module-loopback.la $(am__append_46) $(am__append_47) \
+	$(am__append_48) $(am__append_49) $(am__append_50) \
+	$(am__append_51) $(am__append_52) $(am__append_53) \
+	$(am__append_54) $(am__append_55) $(am__append_56) \
+	$(am__append_57) $(am__append_58) $(am__append_59) \
 	$(am__append_61) $(am__append_62) $(am__append_63) \
 	$(am__append_64) $(am__append_65) $(am__append_67) \
-	$(am__append_68) $(am__append_69) $(am__append_70) \
-	$(am__append_71) $(am__append_73) $(am__append_74) \
-	$(am__append_75)
+	$(am__append_68)
 libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
 libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -3252,33 +3106,11 @@
 libavahi_wrap_la_LDFLAGS = -avoid-version
 libavahi_wrap_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
 libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-@HAVE_ALSA_TRUE@dist_alsaprofilesets_DATA = \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/default.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
-
-@HAVE_ALSA_TRUE@@HAVE_UDEV_TRUE@dist_udevrules_DATA = \
+@HAVE_ALSA_TRUE@alsaprofilesets_DATA = ${ALSA_PROFILES}
+@HAVE_ALSA_TRUE@@HAVE_UDEV_TRUE@udevrules_DATA = \
 @HAVE_ALSA_TRUE@@HAVE_UDEV_TRUE@		modules/alsa/mixer/profile-sets/90-pulseaudio.rules
 
-@HAVE_ALSA_TRUE@dist_alsapaths_DATA = \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-aux.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input.conf.common \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-fm.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-linein.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-mic.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-mic.conf.common \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-mic-line.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-tvtuner.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-input-video.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-speaker.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output.conf.common \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-headphones.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
-@HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-mono.conf
-
+@HAVE_ALSA_TRUE@alsapaths_DATA = ${ALSA_PATHS}
 
 # These are generated by an M4 script
 SYMDEF_FILES = \
@@ -3298,7 +3130,6 @@
 		modules/module-combine-symdef.h \
 		modules/module-remap-sink-symdef.h \
 		modules/module-ladspa-sink-symdef.h \
-		modules/module-equalizer-sink-symdef.h \
 		modules/module-esound-compat-spawnfd-symdef.h \
 		modules/module-esound-compat-spawnpid-symdef.h \
 		modules/module-match-symdef.h \
@@ -3309,7 +3140,6 @@
 		modules/module-esound-sink-symdef.h \
 		modules/module-zeroconf-publish-symdef.h \
 		modules/module-zeroconf-discover-symdef.h \
-		modules/module-bonjour-publish-symdef.h \
 		modules/module-lirc-symdef.h \
 		modules/module-mmkbd-evdev-symdef.h \
 		modules/module-http-protocol-tcp-symdef.h \
@@ -3323,8 +3153,6 @@
 		modules/alsa/module-alsa-sink-symdef.h \
 		modules/alsa/module-alsa-source-symdef.h \
 		modules/alsa/module-alsa-card-symdef.h \
-		modules/coreaudio/module-coreaudio-detect-symdef.h \
-		modules/coreaudio/module-coreaudio-device-symdef.h \
 		modules/module-solaris-symdef.h \
 		modules/module-waveout-symdef.h \
 		modules/module-detect-symdef.h \
@@ -3354,7 +3182,6 @@
 		modules/module-augment-properties-symdef.h \
 		modules/module-cork-music-on-phone-symdef.h \
 		modules/module-console-kit-symdef.h \
-		modules/dbus/module-dbus-protocol-symdef.h \
 		modules/module-loopback-symdef.h
 
 
@@ -3391,24 +3218,6 @@
 module_http_protocol_unix_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libprotocol-http.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
-# D-Bus protocol
-module_dbus_protocol_la_SOURCES = \
-		modules/dbus/iface-card.c modules/dbus/iface-card.h \
-		modules/dbus/iface-card-profile.c modules/dbus/iface-card-profile.h \
-		modules/dbus/iface-client.c modules/dbus/iface-client.h \
-		modules/dbus/iface-core.c modules/dbus/iface-core.h \
-		modules/dbus/iface-device.c modules/dbus/iface-device.h \
-		modules/dbus/iface-device-port.c modules/dbus/iface-device-port.h \
-		modules/dbus/iface-memstats.c modules/dbus/iface-memstats.h \
-		modules/dbus/iface-module.c modules/dbus/iface-module.h \
-		modules/dbus/iface-sample.c modules/dbus/iface-sample.h \
-		modules/dbus/iface-stream.c modules/dbus/iface-stream.h \
-		modules/dbus/module-dbus-protocol.c
-
-module_dbus_protocol_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-module_dbus_protocol_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_dbus_protocol_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-
 # Native protocol
 module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
@@ -3472,10 +3281,6 @@
 module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa\" $(AM_CFLAGS)
 module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_ladspa_sink_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
-module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS)
-module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_match_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -3516,34 +3321,21 @@
 module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_oss_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
-# COREAUDIO
-module_coreaudio_detect_la_SOURCES = modules/coreaudio/module-coreaudio-detect.c
-module_coreaudio_detect_la_LDFLAGS = $(MODULE_LDFLAGS) \
-			-Wl,-framework -Wl,Cocoa -framework CoreAudio \
-			-Wl,-framework -Wl,AudioUnit -framework AudioUnit
-
-module_coreaudio_detect_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-module_coreaudio_device_la_SOURCES = modules/coreaudio/module-coreaudio-device.c
-module_coreaudio_device_la_LDFLAGS = $(MODULE_LDFLAGS) \
-			-Wl,-framework -Wl,Cocoa -framework CoreAudio \
-			-Wl,-framework -Wl,AudioUnit -framework AudioUnit
-
-module_coreaudio_device_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 # ALSA
 libalsa_util_la_SOURCES = modules/alsa/alsa-util.c \
 	modules/alsa/alsa-util.h modules/alsa/alsa-mixer.c \
 	modules/alsa/alsa-mixer.h modules/alsa/alsa-sink.c \
 	modules/alsa/alsa-sink.h modules/alsa/alsa-source.c \
 	modules/alsa/alsa-source.h modules/reserve-wrap.c \
-	modules/reserve-wrap.h $(am__append_77) $(am__append_80) \
-	$(am__append_83)
+	modules/reserve-wrap.h $(am__append_69) $(am__append_72) \
+	$(am__append_75)
 libalsa_util_la_LDFLAGS = -avoid-version
 libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) \
 	libpulsecore-@PA_MAJORMINORMICRO@.la \
 	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la \
-	$(am__append_78) $(am__append_81) $(am__append_84)
+	$(am__append_70) $(am__append_73) $(am__append_76)
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) \
-	$(am__append_79) $(am__append_82) $(am__append_85)
+	$(am__append_71) $(am__append_74) $(am__append_77)
 module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
@@ -3572,13 +3364,6 @@
 module_zeroconf_discover_la_LIBADD = $(AM_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
 
-# Bonjour
-module_bonjour_publish_la_SOURCES = modules/module-bonjour-publish.c
-module_bonjour_publish_la_LDFLAGS = $(MODULE_LDFLAGS) \
-			-Wl,-framework -Wl,CoreFoundation -framework CoreFoundation
-
-module_bonjour_publish_la_LIBADD = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
-
 # LIRC
 module_lirc_la_SOURCES = modules/module-lirc.c
 module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -3644,11 +3429,8 @@
 # Stream volume/muted/device restore module
 module_stream_restore_la_SOURCES = modules/module-stream-restore.c
 module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_stream_restore_la_LIBADD = $(AM_LIBADD) libprotocol-native.la \
-	libpulsecore-@PA_MAJORMINORMICRO@.la \
-	libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la \
-	$(am__append_86)
-module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_87)
+module_stream_restore_la_LIBADD = $(AM_LIBADD) libprotocol-native.la libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
+module_stream_restore_la_CFLAGS = $(AM_CFLAGS)
 
 # Card profile restore module
 module_card_restore_la_SOURCES = modules/module-card-restore.c
@@ -3950,8 +3732,6 @@
 	$(AM_V_CCLD)$(module_bluetooth_discover_la_LINK) $(am_module_bluetooth_discover_la_rpath) $(module_bluetooth_discover_la_OBJECTS) $(module_bluetooth_discover_la_LIBADD) $(LIBS)
 module-bluetooth-proximity.la: $(module_bluetooth_proximity_la_OBJECTS) $(module_bluetooth_proximity_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_bluetooth_proximity_la_LINK) $(am_module_bluetooth_proximity_la_rpath) $(module_bluetooth_proximity_la_OBJECTS) $(module_bluetooth_proximity_la_LIBADD) $(LIBS)
-module-bonjour-publish.la: $(module_bonjour_publish_la_OBJECTS) $(module_bonjour_publish_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(module_bonjour_publish_la_LINK) $(am_module_bonjour_publish_la_rpath) $(module_bonjour_publish_la_OBJECTS) $(module_bonjour_publish_la_LIBADD) $(LIBS)
 module-card-restore.la: $(module_card_restore_la_OBJECTS) $(module_card_restore_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_card_restore_la_LINK) -rpath $(modlibexecdir) $(module_card_restore_la_OBJECTS) $(module_card_restore_la_LIBADD) $(LIBS)
 module-cli-protocol-tcp.la: $(module_cli_protocol_tcp_la_OBJECTS) $(module_cli_protocol_tcp_la_DEPENDENCIES) 
@@ -3964,14 +3744,8 @@
 	$(AM_V_CCLD)$(module_combine_la_LINK) -rpath $(modlibexecdir) $(module_combine_la_OBJECTS) $(module_combine_la_LIBADD) $(LIBS)
 module-console-kit.la: $(module_console_kit_la_OBJECTS) $(module_console_kit_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_console_kit_la_LINK) $(am_module_console_kit_la_rpath) $(module_console_kit_la_OBJECTS) $(module_console_kit_la_LIBADD) $(LIBS)
-module-coreaudio-detect.la: $(module_coreaudio_detect_la_OBJECTS) $(module_coreaudio_detect_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(module_coreaudio_detect_la_LINK) $(am_module_coreaudio_detect_la_rpath) $(module_coreaudio_detect_la_OBJECTS) $(module_coreaudio_detect_la_LIBADD) $(LIBS)
-module-coreaudio-device.la: $(module_coreaudio_device_la_OBJECTS) $(module_coreaudio_device_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(module_coreaudio_device_la_LINK) $(am_module_coreaudio_device_la_rpath) $(module_coreaudio_device_la_OBJECTS) $(module_coreaudio_device_la_LIBADD) $(LIBS)
 module-cork-music-on-phone.la: $(module_cork_music_on_phone_la_OBJECTS) $(module_cork_music_on_phone_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_cork_music_on_phone_la_LINK) -rpath $(modlibexecdir) $(module_cork_music_on_phone_la_OBJECTS) $(module_cork_music_on_phone_la_LIBADD) $(LIBS)
-module-dbus-protocol.la: $(module_dbus_protocol_la_OBJECTS) $(module_dbus_protocol_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(module_dbus_protocol_la_LINK) $(am_module_dbus_protocol_la_rpath) $(module_dbus_protocol_la_OBJECTS) $(module_dbus_protocol_la_LIBADD) $(LIBS)
 module-default-device-restore.la: $(module_default_device_restore_la_OBJECTS) $(module_default_device_restore_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_default_device_restore_la_LINK) -rpath $(modlibexecdir) $(module_default_device_restore_la_OBJECTS) $(module_default_device_restore_la_LIBADD) $(LIBS)
 module-detect.la: $(module_detect_la_OBJECTS) $(module_detect_la_DEPENDENCIES) 
@@ -3980,8 +3754,6 @@
 	$(AM_V_CCLD)$(module_device_manager_la_LINK) -rpath $(modlibexecdir) $(module_device_manager_la_OBJECTS) $(module_device_manager_la_LIBADD) $(LIBS)
 module-device-restore.la: $(module_device_restore_la_OBJECTS) $(module_device_restore_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_device_restore_la_LINK) -rpath $(modlibexecdir) $(module_device_restore_la_OBJECTS) $(module_device_restore_la_LIBADD) $(LIBS)
-module-equalizer-sink.la: $(module_equalizer_sink_la_OBJECTS) $(module_equalizer_sink_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(module_equalizer_sink_la_LINK) $(am_module_equalizer_sink_la_rpath) $(module_equalizer_sink_la_OBJECTS) $(module_equalizer_sink_la_LIBADD) $(LIBS)
 module-esound-compat-spawnfd.la: $(module_esound_compat_spawnfd_la_OBJECTS) $(module_esound_compat_spawnfd_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(module_esound_compat_spawnfd_la_LINK) $(am_module_esound_compat_spawnfd_la_rpath) $(module_esound_compat_spawnfd_la_OBJECTS) $(module_esound_compat_spawnfd_la_LIBADD) $(LIBS)
 module-esound-compat-spawnpid.la: $(module_esound_compat_spawnpid_la_OBJECTS) $(module_esound_compat_spawnpid_la_DEPENDENCIES) 
@@ -4250,9 +4022,6 @@
 mix-test$(EXEEXT): $(mix_test_OBJECTS) $(mix_test_DEPENDENCIES) 
 	@rm -f mix-test$(EXEEXT)
 	$(AM_V_CCLD)$(mix_test_LINK) $(mix_test_OBJECTS) $(mix_test_LDADD) $(LIBS)
-once-test$(EXEEXT): $(once_test_OBJECTS) $(once_test_DEPENDENCIES) 
-	@rm -f once-test$(EXEEXT)
-	$(AM_V_CCLD)$(once_test_LINK) $(once_test_OBJECTS) $(once_test_LDADD) $(LIBS)
 pabrowse$(EXEEXT): $(pabrowse_OBJECTS) $(pabrowse_DEPENDENCIES) 
 	@rm -f pabrowse$(EXEEXT)
 	$(AM_V_CCLD)$(pabrowse_LINK) $(pabrowse_OBJECTS) $(pabrowse_LDADD) $(LIBS)
@@ -4419,6 +4188,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_browse_la-avahi-wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_browse_la-browser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_la-channelmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_la-client-conf-x11.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_la-context.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_la-error.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulse_la-ext-device-manager.Plo@am__quote@
@@ -4445,7 +4215,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-aupdate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-authkey.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-bitset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-conf-parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-core-error.Plo@am__quote@
@@ -4488,7 +4257,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-random.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-ratelimit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-rtkit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-win32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-shm.Plo@am__quote@
@@ -4534,7 +4302,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-object.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-play-memblockq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-play-memchunk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-remap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-remap_mmx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-remap_sse.Plo@am__quote@
@@ -4574,11 +4341,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memblockq_test-memblockq-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime-type.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mix_test-mix-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-bonjour-publish.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-cli.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-combine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-coreaudio-detect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-coreaudio-device.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-esound-compat-spawnfd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-esound-compat-spawnpid.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-esound-sink.Plo@am__quote@
@@ -4607,22 +4371,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_cli_protocol_unix_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_console_kit_la-module-console-kit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_cork_music_on_phone_la-module-cork-music-on-phone.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-card-profile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-card.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-client.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-device-port.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-memstats.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-module.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-sample.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-iface-stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dbus_protocol_la-module-dbus-protocol.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_default_device_restore_la-module-default-device-restore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_detect_la-module-detect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_device_manager_la-module-device-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_device_restore_la-module-device-restore.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_equalizer_sink_la-module-equalizer-sink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_esound_protocol_tcp_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_esound_protocol_unix_la-module-protocol-stub.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_gconf_la-module-gconf.Plo@am__quote@
@@ -4658,7 +4410,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_x11_xsmp_la-module-x11-xsmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_zeroconf_discover_la-module-zeroconf-discover.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_zeroconf_publish_la-module-zeroconf-publish.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/once_test-once-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oss-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pabrowse-pabrowse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pacat-pacat.Po@am__quote@
@@ -4683,7 +4434,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pulseaudio-dumpmodules.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pulseaudio-ltdl-bind-now.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pulseaudio-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pulseaudio-server-lookup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue_test-queue-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remix_test-remix-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resampler_test-resampler-test.Po@am__quote@
@@ -5130,6 +4880,14 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -c -o libpulse_la-xmalloc.lo `test -f 'pulse/xmalloc.c' || echo '$(srcdir)/'`pulse/xmalloc.c
 
+libpulse_la-client-conf-x11.lo: pulse/client-conf-x11.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -MT libpulse_la-client-conf-x11.lo -MD -MP -MF $(DEPDIR)/libpulse_la-client-conf-x11.Tpo -c -o libpulse_la-client-conf-x11.lo `test -f 'pulse/client-conf-x11.c' || echo '$(srcdir)/'`pulse/client-conf-x11.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulse_la-client-conf-x11.Tpo $(DEPDIR)/libpulse_la-client-conf-x11.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pulse/client-conf-x11.c' object='libpulse_la-client-conf-x11.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -c -o libpulse_la-client-conf-x11.lo `test -f 'pulse/client-conf-x11.c' || echo '$(srcdir)/'`pulse/client-conf-x11.c
+
 libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.lo: pulse/client-conf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.lo -MD -MP -MF $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.Tpo -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.lo `test -f 'pulse/client-conf.c' || echo '$(srcdir)/'`pulse/client-conf.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.Tpo $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf.Plo
@@ -5538,14 +5296,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-sndfile-util.lo `test -f 'pulsecore/sndfile-util.c' || echo '$(srcdir)/'`pulsecore/sndfile-util.c
 
-libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.lo: pulse/client-conf-x11.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.lo -MD -MP -MF $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.Tpo -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.lo `test -f 'pulse/client-conf-x11.c' || echo '$(srcdir)/'`pulse/client-conf-x11.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.Tpo $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pulse/client-conf-x11.c' object='libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-client-conf-x11.lo `test -f 'pulse/client-conf-x11.c' || echo '$(srcdir)/'`pulse/client-conf-x11.c
-
 libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.lo: pulsecore/mutex-win32.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.lo -MD -MP -MF $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.Tpo -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.lo `test -f 'pulsecore/mutex-win32.c' || echo '$(srcdir)/'`pulsecore/mutex-win32.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.Tpo $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-mutex-win32.Plo
@@ -5586,14 +5336,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-thread-posix.lo `test -f 'pulsecore/thread-posix.c' || echo '$(srcdir)/'`pulsecore/thread-posix.c
 
-libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.lo: pulsecore/semaphore-osx.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.lo -MD -MP -MF $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.Tpo -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.lo `test -f 'pulsecore/semaphore-osx.c' || echo '$(srcdir)/'`pulsecore/semaphore-osx.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.Tpo $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pulsecore/semaphore-osx.c' object='libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-osx.lo `test -f 'pulsecore/semaphore-osx.c' || echo '$(srcdir)/'`pulsecore/semaphore-osx.c
-
 libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.lo: pulsecore/semaphore-posix.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.lo -MD -MP -MF $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.Tpo -c -o libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.lo `test -f 'pulsecore/semaphore-posix.c' || echo '$(srcdir)/'`pulsecore/semaphore-posix.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.Tpo $(DEPDIR)/libpulsecommon_@PA_MAJORMINORMICRO@_la-semaphore-posix.Plo
@@ -6058,14 +5800,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -c -o libpulsecore_@PA_MAJORMINORMICRO@_la-dbus-shared.lo `test -f 'pulsecore/dbus-shared.c' || echo '$(srcdir)/'`pulsecore/dbus-shared.c
 
-libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.lo: pulsecore/protocol-dbus.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.lo -MD -MP -MF $(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.Tpo -c -o libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.lo `test -f 'pulsecore/protocol-dbus.c' || echo '$(srcdir)/'`pulsecore/protocol-dbus.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.Tpo $(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pulsecore/protocol-dbus.c' object='libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -c -o libpulsecore_@PA_MAJORMINORMICRO@_la-protocol-dbus.lo `test -f 'pulsecore/protocol-dbus.c' || echo '$(srcdir)/'`pulsecore/protocol-dbus.c
-
 libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.lo: pulsecore/database-gdbm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS) $(CFLAGS) -MT libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.lo -MD -MP -MF $(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.Tpo -c -o libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.lo `test -f 'pulsecore/database-gdbm.c' || echo '$(srcdir)/'`pulsecore/database-gdbm.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.Tpo $(DEPDIR)/libpulsecore_@PA_MAJORMINORMICRO@_la-database-gdbm.Plo
@@ -6226,14 +5960,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_bluetooth_proximity_la_CFLAGS) $(CFLAGS) -c -o module_bluetooth_proximity_la-module-bluetooth-proximity.lo `test -f 'modules/bluetooth/module-bluetooth-proximity.c' || echo '$(srcdir)/'`modules/bluetooth/module-bluetooth-proximity.c
 
-module-bonjour-publish.lo: modules/module-bonjour-publish.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module-bonjour-publish.lo -MD -MP -MF $(DEPDIR)/module-bonjour-publish.Tpo -c -o module-bonjour-publish.lo `test -f 'modules/module-bonjour-publish.c' || echo '$(srcdir)/'`modules/module-bonjour-publish.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module-bonjour-publish.Tpo $(DEPDIR)/module-bonjour-publish.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/module-bonjour-publish.c' object='module-bonjour-publish.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module-bonjour-publish.lo `test -f 'modules/module-bonjour-publish.c' || echo '$(srcdir)/'`modules/module-bonjour-publish.c
-
 module_card_restore_la-module-card-restore.lo: modules/module-card-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_card_restore_la_CFLAGS) $(CFLAGS) -MT module_card_restore_la-module-card-restore.lo -MD -MP -MF $(DEPDIR)/module_card_restore_la-module-card-restore.Tpo -c -o module_card_restore_la-module-card-restore.lo `test -f 'modules/module-card-restore.c' || echo '$(srcdir)/'`modules/module-card-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_card_restore_la-module-card-restore.Tpo $(DEPDIR)/module_card_restore_la-module-card-restore.Plo
@@ -6282,22 +6008,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_console_kit_la_CFLAGS) $(CFLAGS) -c -o module_console_kit_la-module-console-kit.lo `test -f 'modules/module-console-kit.c' || echo '$(srcdir)/'`modules/module-console-kit.c
 
-module-coreaudio-detect.lo: modules/coreaudio/module-coreaudio-detect.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module-coreaudio-detect.lo -MD -MP -MF $(DEPDIR)/module-coreaudio-detect.Tpo -c -o module-coreaudio-detect.lo `test -f 'modules/coreaudio/module-coreaudio-detect.c' || echo '$(srcdir)/'`modules/coreaudio/module-coreaudio-detect.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module-coreaudio-detect.Tpo $(DEPDIR)/module-coreaudio-detect.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/coreaudio/module-coreaudio-detect.c' object='module-coreaudio-detect.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module-coreaudio-detect.lo `test -f 'modules/coreaudio/module-coreaudio-detect.c' || echo '$(srcdir)/'`modules/coreaudio/module-coreaudio-detect.c
-
-module-coreaudio-device.lo: modules/coreaudio/module-coreaudio-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module-coreaudio-device.lo -MD -MP -MF $(DEPDIR)/module-coreaudio-device.Tpo -c -o module-coreaudio-device.lo `test -f 'modules/coreaudio/module-coreaudio-device.c' || echo '$(srcdir)/'`modules/coreaudio/module-coreaudio-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module-coreaudio-device.Tpo $(DEPDIR)/module-coreaudio-device.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/coreaudio/module-coreaudio-device.c' object='module-coreaudio-device.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module-coreaudio-device.lo `test -f 'modules/coreaudio/module-coreaudio-device.c' || echo '$(srcdir)/'`modules/coreaudio/module-coreaudio-device.c
-
 module_cork_music_on_phone_la-module-cork-music-on-phone.lo: modules/module-cork-music-on-phone.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_cork_music_on_phone_la_CFLAGS) $(CFLAGS) -MT module_cork_music_on_phone_la-module-cork-music-on-phone.lo -MD -MP -MF $(DEPDIR)/module_cork_music_on_phone_la-module-cork-music-on-phone.Tpo -c -o module_cork_music_on_phone_la-module-cork-music-on-phone.lo `test -f 'modules/module-cork-music-on-phone.c' || echo '$(srcdir)/'`modules/module-cork-music-on-phone.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_cork_music_on_phone_la-module-cork-music-on-phone.Tpo $(DEPDIR)/module_cork_music_on_phone_la-module-cork-music-on-phone.Plo
@@ -6306,94 +6016,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_cork_music_on_phone_la_CFLAGS) $(CFLAGS) -c -o module_cork_music_on_phone_la-module-cork-music-on-phone.lo `test -f 'modules/module-cork-music-on-phone.c' || echo '$(srcdir)/'`modules/module-cork-music-on-phone.c
 
-module_dbus_protocol_la-iface-card.lo: modules/dbus/iface-card.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-card.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-card.Tpo -c -o module_dbus_protocol_la-iface-card.lo `test -f 'modules/dbus/iface-card.c' || echo '$(srcdir)/'`modules/dbus/iface-card.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-card.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-card.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-card.c' object='module_dbus_protocol_la-iface-card.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-card.lo `test -f 'modules/dbus/iface-card.c' || echo '$(srcdir)/'`modules/dbus/iface-card.c
-
-module_dbus_protocol_la-iface-card-profile.lo: modules/dbus/iface-card-profile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-card-profile.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-card-profile.Tpo -c -o module_dbus_protocol_la-iface-card-profile.lo `test -f 'modules/dbus/iface-card-profile.c' || echo '$(srcdir)/'`modules/dbus/iface-card-profile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-card-profile.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-card-profile.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-card-profile.c' object='module_dbus_protocol_la-iface-card-profile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-card-profile.lo `test -f 'modules/dbus/iface-card-profile.c' || echo '$(srcdir)/'`modules/dbus/iface-card-profile.c
-
-module_dbus_protocol_la-iface-client.lo: modules/dbus/iface-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-client.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-client.Tpo -c -o module_dbus_protocol_la-iface-client.lo `test -f 'modules/dbus/iface-client.c' || echo '$(srcdir)/'`modules/dbus/iface-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-client.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-client.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-client.c' object='module_dbus_protocol_la-iface-client.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-client.lo `test -f 'modules/dbus/iface-client.c' || echo '$(srcdir)/'`modules/dbus/iface-client.c
-
-module_dbus_protocol_la-iface-core.lo: modules/dbus/iface-core.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-core.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-core.Tpo -c -o module_dbus_protocol_la-iface-core.lo `test -f 'modules/dbus/iface-core.c' || echo '$(srcdir)/'`modules/dbus/iface-core.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-core.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-core.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-core.c' object='module_dbus_protocol_la-iface-core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-core.lo `test -f 'modules/dbus/iface-core.c' || echo '$(srcdir)/'`modules/dbus/iface-core.c
-
-module_dbus_protocol_la-iface-device.lo: modules/dbus/iface-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-device.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-device.Tpo -c -o module_dbus_protocol_la-iface-device.lo `test -f 'modules/dbus/iface-device.c' || echo '$(srcdir)/'`modules/dbus/iface-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-device.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-device.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-device.c' object='module_dbus_protocol_la-iface-device.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-device.lo `test -f 'modules/dbus/iface-device.c' || echo '$(srcdir)/'`modules/dbus/iface-device.c
-
-module_dbus_protocol_la-iface-device-port.lo: modules/dbus/iface-device-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-device-port.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-device-port.Tpo -c -o module_dbus_protocol_la-iface-device-port.lo `test -f 'modules/dbus/iface-device-port.c' || echo '$(srcdir)/'`modules/dbus/iface-device-port.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-device-port.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-device-port.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-device-port.c' object='module_dbus_protocol_la-iface-device-port.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-device-port.lo `test -f 'modules/dbus/iface-device-port.c' || echo '$(srcdir)/'`modules/dbus/iface-device-port.c
-
-module_dbus_protocol_la-iface-memstats.lo: modules/dbus/iface-memstats.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-memstats.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-memstats.Tpo -c -o module_dbus_protocol_la-iface-memstats.lo `test -f 'modules/dbus/iface-memstats.c' || echo '$(srcdir)/'`modules/dbus/iface-memstats.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-memstats.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-memstats.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-memstats.c' object='module_dbus_protocol_la-iface-memstats.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-memstats.lo `test -f 'modules/dbus/iface-memstats.c' || echo '$(srcdir)/'`modules/dbus/iface-memstats.c
-
-module_dbus_protocol_la-iface-module.lo: modules/dbus/iface-module.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-module.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-module.Tpo -c -o module_dbus_protocol_la-iface-module.lo `test -f 'modules/dbus/iface-module.c' || echo '$(srcdir)/'`modules/dbus/iface-module.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-module.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-module.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-module.c' object='module_dbus_protocol_la-iface-module.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-module.lo `test -f 'modules/dbus/iface-module.c' || echo '$(srcdir)/'`modules/dbus/iface-module.c
-
-module_dbus_protocol_la-iface-sample.lo: modules/dbus/iface-sample.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-sample.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-sample.Tpo -c -o module_dbus_protocol_la-iface-sample.lo `test -f 'modules/dbus/iface-sample.c' || echo '$(srcdir)/'`modules/dbus/iface-sample.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-sample.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-sample.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-sample.c' object='module_dbus_protocol_la-iface-sample.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-sample.lo `test -f 'modules/dbus/iface-sample.c' || echo '$(srcdir)/'`modules/dbus/iface-sample.c
-
-module_dbus_protocol_la-iface-stream.lo: modules/dbus/iface-stream.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-iface-stream.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-iface-stream.Tpo -c -o module_dbus_protocol_la-iface-stream.lo `test -f 'modules/dbus/iface-stream.c' || echo '$(srcdir)/'`modules/dbus/iface-stream.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-iface-stream.Tpo $(DEPDIR)/module_dbus_protocol_la-iface-stream.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/iface-stream.c' object='module_dbus_protocol_la-iface-stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-iface-stream.lo `test -f 'modules/dbus/iface-stream.c' || echo '$(srcdir)/'`modules/dbus/iface-stream.c
-
-module_dbus_protocol_la-module-dbus-protocol.lo: modules/dbus/module-dbus-protocol.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -MT module_dbus_protocol_la-module-dbus-protocol.lo -MD -MP -MF $(DEPDIR)/module_dbus_protocol_la-module-dbus-protocol.Tpo -c -o module_dbus_protocol_la-module-dbus-protocol.lo `test -f 'modules/dbus/module-dbus-protocol.c' || echo '$(srcdir)/'`modules/dbus/module-dbus-protocol.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_dbus_protocol_la-module-dbus-protocol.Tpo $(DEPDIR)/module_dbus_protocol_la-module-dbus-protocol.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/dbus/module-dbus-protocol.c' object='module_dbus_protocol_la-module-dbus-protocol.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_dbus_protocol_la_CFLAGS) $(CFLAGS) -c -o module_dbus_protocol_la-module-dbus-protocol.lo `test -f 'modules/dbus/module-dbus-protocol.c' || echo '$(srcdir)/'`modules/dbus/module-dbus-protocol.c
-
 module_default_device_restore_la-module-default-device-restore.lo: modules/module-default-device-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_default_device_restore_la_CFLAGS) $(CFLAGS) -MT module_default_device_restore_la-module-default-device-restore.lo -MD -MP -MF $(DEPDIR)/module_default_device_restore_la-module-default-device-restore.Tpo -c -o module_default_device_restore_la-module-default-device-restore.lo `test -f 'modules/module-default-device-restore.c' || echo '$(srcdir)/'`modules/module-default-device-restore.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_default_device_restore_la-module-default-device-restore.Tpo $(DEPDIR)/module_default_device_restore_la-module-default-device-restore.Plo
@@ -6426,14 +6048,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_device_restore_la_CFLAGS) $(CFLAGS) -c -o module_device_restore_la-module-device-restore.lo `test -f 'modules/module-device-restore.c' || echo '$(srcdir)/'`modules/module-device-restore.c
 
-module_equalizer_sink_la-module-equalizer-sink.lo: modules/module-equalizer-sink.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_equalizer_sink_la_CFLAGS) $(CFLAGS) -MT module_equalizer_sink_la-module-equalizer-sink.lo -MD -MP -MF $(DEPDIR)/module_equalizer_sink_la-module-equalizer-sink.Tpo -c -o module_equalizer_sink_la-module-equalizer-sink.lo `test -f 'modules/module-equalizer-sink.c' || echo '$(srcdir)/'`modules/module-equalizer-sink.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module_equalizer_sink_la-module-equalizer-sink.Tpo $(DEPDIR)/module_equalizer_sink_la-module-equalizer-sink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='modules/module-equalizer-sink.c' object='module_equalizer_sink_la-module-equalizer-sink.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_equalizer_sink_la_CFLAGS) $(CFLAGS) -c -o module_equalizer_sink_la-module-equalizer-sink.lo `test -f 'modules/module-equalizer-sink.c' || echo '$(srcdir)/'`modules/module-equalizer-sink.c
-
 module-esound-compat-spawnfd.lo: modules/module-esound-compat-spawnfd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module-esound-compat-spawnfd.lo -MD -MP -MF $(DEPDIR)/module-esound-compat-spawnfd.Tpo -c -o module-esound-compat-spawnfd.lo `test -f 'modules/module-esound-compat-spawnfd.c' || echo '$(srcdir)/'`modules/module-esound-compat-spawnfd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/module-esound-compat-spawnfd.Tpo $(DEPDIR)/module-esound-compat-spawnfd.Plo
@@ -7218,22 +6832,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mix_test_CFLAGS) $(CFLAGS) -c -o mix_test-mix-test.obj `if test -f 'tests/mix-test.c'; then $(CYGPATH_W) 'tests/mix-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/mix-test.c'; fi`
 
-once_test-once-test.o: tests/once-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(once_test_CFLAGS) $(CFLAGS) -MT once_test-once-test.o -MD -MP -MF $(DEPDIR)/once_test-once-test.Tpo -c -o once_test-once-test.o `test -f 'tests/once-test.c' || echo '$(srcdir)/'`tests/once-test.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/once_test-once-test.Tpo $(DEPDIR)/once_test-once-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/once-test.c' object='once_test-once-test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(once_test_CFLAGS) $(CFLAGS) -c -o once_test-once-test.o `test -f 'tests/once-test.c' || echo '$(srcdir)/'`tests/once-test.c
-
-once_test-once-test.obj: tests/once-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(once_test_CFLAGS) $(CFLAGS) -MT once_test-once-test.obj -MD -MP -MF $(DEPDIR)/once_test-once-test.Tpo -c -o once_test-once-test.obj `if test -f 'tests/once-test.c'; then $(CYGPATH_W) 'tests/once-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/once-test.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/once_test-once-test.Tpo $(DEPDIR)/once_test-once-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/once-test.c' object='once_test-once-test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(once_test_CFLAGS) $(CFLAGS) -c -o once_test-once-test.obj `if test -f 'tests/once-test.c'; then $(CYGPATH_W) 'tests/once-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/once-test.c'; fi`
-
 pabrowse-pabrowse.o: utils/pabrowse.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pabrowse_CFLAGS) $(CFLAGS) -MT pabrowse-pabrowse.o -MD -MP -MF $(DEPDIR)/pabrowse-pabrowse.Tpo -c -o pabrowse-pabrowse.o `test -f 'utils/pabrowse.c' || echo '$(srcdir)/'`utils/pabrowse.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pabrowse-pabrowse.Tpo $(DEPDIR)/pabrowse-pabrowse.Po
@@ -7522,22 +7120,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pulseaudio_CFLAGS) $(CFLAGS) -c -o pulseaudio-main.obj `if test -f 'daemon/main.c'; then $(CYGPATH_W) 'daemon/main.c'; else $(CYGPATH_W) '$(srcdir)/daemon/main.c'; fi`
 
-pulseaudio-server-lookup.o: daemon/server-lookup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pulseaudio_CFLAGS) $(CFLAGS) -MT pulseaudio-server-lookup.o -MD -MP -MF $(DEPDIR)/pulseaudio-server-lookup.Tpo -c -o pulseaudio-server-lookup.o `test -f 'daemon/server-lookup.c' || echo '$(srcdir)/'`daemon/server-lookup.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pulseaudio-server-lookup.Tpo $(DEPDIR)/pulseaudio-server-lookup.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='daemon/server-lookup.c' object='pulseaudio-server-lookup.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pulseaudio_CFLAGS) $(CFLAGS) -c -o pulseaudio-server-lookup.o `test -f 'daemon/server-lookup.c' || echo '$(srcdir)/'`daemon/server-lookup.c
-
-pulseaudio-server-lookup.obj: daemon/server-lookup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pulseaudio_CFLAGS) $(CFLAGS) -MT pulseaudio-server-lookup.obj -MD -MP -MF $(DEPDIR)/pulseaudio-server-lookup.Tpo -c -o pulseaudio-server-lookup.obj `if test -f 'daemon/server-lookup.c'; then $(CYGPATH_W) 'daemon/server-lookup.c'; else $(CYGPATH_W) '$(srcdir)/daemon/server-lookup.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pulseaudio-server-lookup.Tpo $(DEPDIR)/pulseaudio-server-lookup.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='daemon/server-lookup.c' object='pulseaudio-server-lookup.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pulseaudio_CFLAGS) $(CFLAGS) -c -o pulseaudio-server-lookup.obj `if test -f 'daemon/server-lookup.c'; then $(CYGPATH_W) 'daemon/server-lookup.c'; else $(CYGPATH_W) '$(srcdir)/daemon/server-lookup.c'; fi`
-
 queue_test-queue-test.o: tests/queue-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(queue_test_CFLAGS) $(CFLAGS) -MT queue_test-queue-test.o -MD -MP -MF $(DEPDIR)/queue_test-queue-test.Tpo -c -o queue_test-queue-test.o `test -f 'tests/queue-test.c' || echo '$(srcdir)/'`tests/queue-test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/queue_test-queue-test.Tpo $(DEPDIR)/queue_test-queue-test.Po
@@ -7815,30 +7397,10 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-dbuspolicyDATA: $(dbuspolicy_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(dbuspolicydir)" || $(MKDIR_P) "$(DESTDIR)$(dbuspolicydir)"
-	@list='$(dbuspolicy_DATA)'; test -n "$(dbuspolicydir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbuspolicydir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dbuspolicydir)" || exit $$?; \
-	done
-
-uninstall-dbuspolicyDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dbuspolicy_DATA)'; test -n "$(dbuspolicydir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(dbuspolicydir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(dbuspolicydir)" && rm -f $$files
-install-dist_alsapathsDATA: $(dist_alsapaths_DATA)
+install-alsapathsDATA: $(alsapaths_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(alsapathsdir)" || $(MKDIR_P) "$(DESTDIR)$(alsapathsdir)"
-	@list='$(dist_alsapaths_DATA)'; test -n "$(alsapathsdir)" || list=; \
+	@list='$(alsapaths_DATA)'; test -n "$(alsapathsdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -7848,17 +7410,17 @@
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(alsapathsdir)" || exit $$?; \
 	done
 
-uninstall-dist_alsapathsDATA:
+uninstall-alsapathsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_alsapaths_DATA)'; test -n "$(alsapathsdir)" || list=; \
+	@list='$(alsapaths_DATA)'; test -n "$(alsapathsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(alsapathsdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(alsapathsdir)" && rm -f $$files
-install-dist_alsaprofilesetsDATA: $(dist_alsaprofilesets_DATA)
+install-alsaprofilesetsDATA: $(alsaprofilesets_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(alsaprofilesetsdir)" || $(MKDIR_P) "$(DESTDIR)$(alsaprofilesetsdir)"
-	@list='$(dist_alsaprofilesets_DATA)'; test -n "$(alsaprofilesetsdir)" || list=; \
+	@list='$(alsaprofilesets_DATA)'; test -n "$(alsaprofilesetsdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -7868,33 +7430,33 @@
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(alsaprofilesetsdir)" || exit $$?; \
 	done
 
-uninstall-dist_alsaprofilesetsDATA:
+uninstall-alsaprofilesetsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_alsaprofilesets_DATA)'; test -n "$(alsaprofilesetsdir)" || list=; \
+	@list='$(alsaprofilesets_DATA)'; test -n "$(alsaprofilesetsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(alsaprofilesetsdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(alsaprofilesetsdir)" && rm -f $$files
-install-dist_udevrulesDATA: $(dist_udevrules_DATA)
+install-dbuspolicyDATA: $(dbuspolicy_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)"
-	@list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
+	test -z "$(dbuspolicydir)" || $(MKDIR_P) "$(DESTDIR)$(dbuspolicydir)"
+	@list='$(dbuspolicy_DATA)'; test -n "$(dbuspolicydir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbuspolicydir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dbuspolicydir)" || exit $$?; \
 	done
 
-uninstall-dist_udevrulesDATA:
+uninstall-dbuspolicyDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
+	@list='$(dbuspolicy_DATA)'; test -n "$(dbuspolicydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(udevrulesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(udevrulesdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(dbuspolicydir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(dbuspolicydir)" && rm -f $$files
 install-pulseconfDATA: $(pulseconf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pulseconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pulseconfdir)"
@@ -7915,6 +7477,26 @@
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(pulseconfdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(pulseconfdir)" && rm -f $$files
+install-udevrulesDATA: $(udevrules_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)"
+	@list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
+	done
+
+uninstall-udevrulesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(udevrulesdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(udevrulesdir)" && rm -f $$files
 install-xdgautostartDATA: $(xdgautostart_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(xdgautostartdir)" || $(MKDIR_P) "$(DESTDIR)$(xdgautostartdir)"
@@ -8140,7 +7722,7 @@
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -8196,9 +7778,9 @@
 
 info-am:
 
-install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \
-	install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
-	install-pulseconfDATA install-pulseincludeHEADERS \
+install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \
+	install-dbuspolicyDATA install-pulseconfDATA \
+	install-pulseincludeHEADERS install-udevrulesDATA \
 	install-xdgautostartDATA
 
 install-dvi: install-dvi-am
@@ -8248,13 +7830,12 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-dbuspolicyDATA uninstall-dist_alsapathsDATA \
-	uninstall-dist_alsaprofilesetsDATA \
-	uninstall-dist_udevrulesDATA uninstall-libLTLIBRARIES \
+uninstall-am: uninstall-alsapathsDATA uninstall-alsaprofilesetsDATA \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-dbuspolicyDATA uninstall-libLTLIBRARIES \
 	uninstall-modlibexecLTLIBRARIES uninstall-pulseconfDATA \
 	uninstall-pulseincludeHEADERS uninstall-pulselibexecPROGRAMS \
-	uninstall-xdgautostartDATA
+	uninstall-udevrulesDATA uninstall-xdgautostartDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: all check check-am install install-am install-exec-am \
@@ -8266,29 +7847,27 @@
 	clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
 	clean-pulselibexecPROGRAMS ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-dbuspolicyDATA \
-	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
-	install-dist_udevrulesDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man \
-	install-modlibexecLTLIBRARIES install-pdf install-pdf-am \
-	install-ps install-ps-am install-pulseconfDATA \
+	dvi-am html html-am info info-am install install-alsapathsDATA \
+	install-alsaprofilesetsDATA install-am install-binPROGRAMS \
+	install-binSCRIPTS install-data install-data-am \
+	install-dbuspolicyDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-modlibexecLTLIBRARIES install-pdf \
+	install-pdf-am install-ps install-ps-am install-pulseconfDATA \
 	install-pulseincludeHEADERS install-pulselibexecPROGRAMS \
-	install-strip install-xdgautostartDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-strip install-udevrulesDATA install-xdgautostartDATA \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-dbuspolicyDATA \
-	uninstall-dist_alsapathsDATA \
-	uninstall-dist_alsaprofilesetsDATA \
-	uninstall-dist_udevrulesDATA uninstall-hook \
+	tags uninstall uninstall-alsapathsDATA \
+	uninstall-alsaprofilesetsDATA uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-dbuspolicyDATA uninstall-hook \
 	uninstall-libLTLIBRARIES uninstall-modlibexecLTLIBRARIES \
 	uninstall-pulseconfDATA uninstall-pulseincludeHEADERS \
-	uninstall-pulselibexecPROGRAMS uninstall-xdgautostartDATA
+	uninstall-pulselibexecPROGRAMS uninstall-udevrulesDATA \
+	uninstall-xdgautostartDATA
 
 @INTLTOOL_DESKTOP_RULE@
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/map-file pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/map-file
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/map-file	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/map-file	2010-01-15 23:21:18.000000000 +0000
@@ -66,7 +66,6 @@
 pa_context_get_source_output_info;
 pa_context_get_source_output_info_list;
 pa_context_get_state;
-pa_context_get_tile_size;
 pa_context_is_local;
 pa_context_is_pending;
 pa_context_kill_client;
@@ -130,7 +129,6 @@
 pa_cvolume_get_fade;
 pa_cvolume_get_position;
 pa_cvolume_inc;
-pa_cvolume_inc_clamp;
 pa_cvolume_init;
 pa_cvolume_max;
 pa_cvolume_max_mask;
@@ -195,7 +193,6 @@
 pa_proplist_clear;
 pa_proplist_contains;
 pa_proplist_copy;
-pa_proplist_equal;
 pa_proplist_free;
 pa_proplist_from_string;
 pa_proplist_get;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/alsa-mixer.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/alsa-mixer.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/alsa-mixer.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/alsa-mixer.c	2010-01-15 23:21:18.000000000 +0000
@@ -1713,6 +1713,8 @@
         { "input-boost-off",           N_("No Boost") },
         { "output-amplifier-on",       N_("Amplifier") },
         { "output-amplifier-off",      N_("No Amplifier") },
+        { "output-bass-boost-on",      N_("Bass Boost") },
+        { "output-bass-boost-off",     N_("No Bass Boost") },
         { "output-speaker",            N_("Speaker") },
         { "output-headphones",         N_("Headphones") }
     };
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/alsa-sink.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/alsa-sink.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/alsa-sink.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/alsa-sink.c	2010-01-15 23:21:18.000000000 +0000
@@ -1103,6 +1103,9 @@
     if (mask == SND_CTL_EVENT_MASK_REMOVE)
         return 0;
 
+    if (u->sink->suspend_cause & PA_SUSPEND_SESSION)
+        return 0;
+
     if (mask & SND_CTL_EVENT_MASK_VALUE) {
         pa_sink_get_volume(u->sink, TRUE);
         pa_sink_get_mute(u->sink, TRUE);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/alsa-source.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/alsa-source.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/alsa-source.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/alsa-source.c	2010-01-15 23:21:18.000000000 +0000
@@ -1051,6 +1051,9 @@
     if (mask == SND_CTL_EVENT_MASK_REMOVE)
         return 0;
 
+    if (u->source->suspend_cause & PA_SUSPEND_SESSION)
+        return 0;
+
     if (mask & SND_CTL_EVENT_MASK_VALUE) {
         pa_source_get_volume(u->source, TRUE);
         pa_source_get_mute(u->source, TRUE);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/paths/analog-input.conf.common pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-input.conf.common
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/paths/analog-input.conf.common	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-input.conf.common	2010-01-15 23:21:18.000000000 +0000
@@ -78,6 +78,10 @@
 name = input-microphone
 priority = 19
 
+[Option Input Source:Int Mic]
+name = input-microphone
+priority = 19
+
 [Option Input Source:Internal Mic]
 name = input-microphone
 priority = 19
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/paths/analog-input-mic.conf.common pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/paths/analog-input-mic.conf.common	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-input-mic.conf.common	2010-01-15 23:21:18.000000000 +0000
@@ -61,3 +61,12 @@
 
 [Option Front Mic Boost:off]
 name = input-boost-off
+
+[Element Int Mic Boost]
+switch = select
+
+[Option Int Mic Boost:on]
+name = input-boost-on
+
+[Option Int Mic Boost:off]
+name = input-boost-off
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/paths/analog-output.conf.common pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-output.conf.common
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/paths/analog-output.conf.common	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/paths/analog-output.conf.common	2010-01-15 23:21:18.000000000 +0000
@@ -110,6 +110,17 @@
 name = output-amplifier-off
 priority = 0
 
+[Element Bass Boost]
+switch = select
+
+[Option Bass Boost:on]
+name = output-bass-boost-on
+priority = 0
+
+[Option Bass Boost:off]
+name = output-bass-boost-off
+priority = 10
+
 ;;; 'Analog Output'
 
 [Element Analog Output]
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules	2010-01-15 23:21:18.000000000 +0000
@@ -22,6 +22,5 @@
 
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1978", ENV{PULSE_PROFILE_SET}="native-instruments-audio8dj.conf"
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="0839", ENV{PULSE_PROFILE_SET}="native-instruments-audio4dj.conf"
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf"
 
 LABEL="pulseaudio_end"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; M-Audio FastTrack Pro
-;
-; This card has one duplex stereo channel called A and an additional
-; stereo output channel called B.
-;
-; We knowingly only define a subset of the theoretically possible
-; mapping combinations as profiles here.
-;
-; See default.conf for an explanation on the directives used here.
-
-[General]
-auto-profiles = no
-
-[Mapping analog-stereo-a-output]
-description = Analog Stereo Channel A
-device-strings = hw:%f,0,0
-channel-map = left,right
-direction = output
-
-[Mapping analog-stereo-a-input]
-description = Analog Stereo Channel A
-device-strings = hw:%f,0,0
-channel-map = left,right
-direction = input
-
-[Mapping analog-stereo-b-output]
-description = Analog Stereo Channel B
-device-strings = hw:%f,1,0
-channel-map = left,right
-direction = output
-
-[Profile output:analog-stereo-all+input:analog-stereo-all]
-description = Analog Stereo Duplex Channel A, Analog Stereo output Channel B
-output-mappings = analog-stereo-a-output  analog-stereo-b-output
-input-mappings = analog-stereo-a-input
-priority = 100
-skip-probe = yes
-
-[Profile output:analog-stereo-a-output+input:analog-stereo-a-input]
-description = Analog Stereo Duplex Channel A
-output-mappings = analog-stereo-a-output
-input-mappings = analog-stereo-a-input
-priority = 40
-skip-probe = yes
-
-[Profile output:analog-stereo-b+input:analog-stereo-b]
-description = Analog Stereo Output Channel B
-output-mappings = analog-stereo-b-output
-input-mappings =
-priority = 50
-skip-probe = yes
-
-[Profile output:analog-stereo-a]
-description = Analog Stereo Output Channel A
-output-mappings = analog-stereo-a-output
-priority = 5
-skip-probe = yes
-
-[Profile output:analog-stereo-b]
-description = Analog Stereo Output Channel B
-output-mappings = analog-stereo-b-output
-priority = 6
-skip-probe = yes
-
-[Profile input:analog-stereo-a]
-description = Analog Stereo Input Channel A
-input-mappings = analog-stereo-a-input
-priority = 2
-skip-probe = yes
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/bluetooth/bluetooth-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/bluetooth/bluetooth-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/bluetooth/bluetooth-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/bluetooth/bluetooth-util.c	2010-01-15 23:21:18.000000000 +0000
@@ -37,6 +37,7 @@
     PA_LLIST_HEAD(pa_dbus_pending, pending);
     pa_hashmap *devices;
     pa_hook hook;
+    pa_bool_t filter_added;
 };
 
 static void get_properties_reply(DBusPendingCall *pending, void *userdata);
@@ -341,7 +342,13 @@
 /*                  dbus_message_get_interface(p->message), */
 /*                  dbus_message_get_path(p->message)); */
 
-    d = p->call_data;
+    /* We don't use p->call_data here right-away since the device
+     * might already be invalidated at this point */
+
+    if (!(d = pa_hashmap_get(y->devices, dbus_message_get_path(p->message))))
+        return;
+
+    pa_assert(p->call_data == d);
 
     valid = dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR ? -1 : 1;
 
@@ -788,6 +795,7 @@
         pa_log_error("Failed to add filter function");
         goto fail;
     }
+    y->filter_added = TRUE;
 
     if (pa_dbus_add_matches(
                 pa_dbus_connection_get(y->connection), &err,
@@ -856,7 +864,8 @@
                                "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'",
                                "type='signal',sender='org.bluez',interface='org.bluez.AudioSource',member='PropertyChanged'", NULL);
 
-        dbus_connection_remove_filter(pa_dbus_connection_get(y->connection), filter_cb, y);
+        if (y->filter_added)
+            dbus_connection_remove_filter(pa_dbus_connection_get(y->connection), filter_cb, y);
 
         pa_dbus_connection_unref(y->connection);
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/bluetooth/module-bluetooth-device.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/bluetooth/module-bluetooth-device.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/bluetooth/module-bluetooth-device.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/bluetooth/module-bluetooth-device.c	2010-01-15 23:21:18.000000000 +0000
@@ -179,6 +179,8 @@
 
     int stream_write_type;
     int service_write_type, service_read_type;
+
+    pa_bool_t filter_added;
 };
 
 #define FIXED_LATENCY_PLAYBACK_A2DP (25*PA_USEC_PER_MSEC)
@@ -821,23 +823,25 @@
 
     pa_assert(u);
     pa_assert(u->rtpoll);
-    pa_assert(u->rtpoll_item);
-    pa_assert(u->stream_fd >= 0);
 
-    pa_rtpoll_item_free(u->rtpoll_item);
-    u->rtpoll_item = NULL;
+    if (u->rtpoll_item) {
+        pa_rtpoll_item_free(u->rtpoll_item);
+        u->rtpoll_item = NULL;
+    }
 
-    memset(msg.buf, 0, BT_SUGGESTED_BUFFER_SIZE);
-    msg.start_req.h.type = BT_REQUEST;
-    msg.start_req.h.name = BT_STOP_STREAM;
-    msg.start_req.h.length = sizeof(msg.start_req);
+    if (u->stream_fd >= 0) {
+        memset(msg.buf, 0, BT_SUGGESTED_BUFFER_SIZE);
+        msg.start_req.h.type = BT_REQUEST;
+        msg.start_req.h.name = BT_STOP_STREAM;
+        msg.start_req.h.length = sizeof(msg.start_req);
 
-    if (service_send(u, &msg.start_req.h) < 0 ||
-        service_expect(u, &msg.rsp, sizeof(msg), BT_STOP_STREAM, sizeof(msg.start_rsp)) < 0)
-        r = -1;
+        if (service_send(u, &msg.start_req.h) < 0 ||
+            service_expect(u, &msg.rsp, sizeof(msg), BT_STOP_STREAM, sizeof(msg.start_rsp)) < 0)
+            r = -1;
 
-    pa_close(u->stream_fd);
-    u->stream_fd = -1;
+        pa_close(u->stream_fd);
+        u->stream_fd = -1;
+    }
 
     if (u->read_smoother) {
         pa_smoother_free(u->read_smoother);
@@ -968,10 +972,14 @@
         case PA_SOURCE_MESSAGE_GET_LATENCY: {
             pa_usec_t wi, ri;
 
-            wi = pa_smoother_get(u->read_smoother, pa_rtclock_now());
-            ri = pa_bytes_to_usec(u->read_index, &u->sample_spec);
+            if (u->read_smoother) {
+                wi = pa_smoother_get(u->read_smoother, pa_rtclock_now());
+                ri = pa_bytes_to_usec(u->read_index, &u->sample_spec);
+
+                *((pa_usec_t*) data) = (wi > ri ? wi - ri : 0) + u->source->thread_info.fixed_latency;
+            } else
+                *((pa_usec_t*) data) = 0;
 
-            *((pa_usec_t*) data) = (wi > ri ? wi - ri : 0) + u->source->thread_info.fixed_latency;
             return 0;
         }
 
@@ -2405,6 +2413,7 @@
         pa_log_error("Failed to add filter function");
         goto fail;
     }
+    u->filter_added = TRUE;
 
     speaker = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='SpeakerGainChanged',path='%s'", u->path);
     mike = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='MicrophoneGainChanged',path='%s'", u->path);
@@ -2494,7 +2503,9 @@
             pa_xfree(mike);
         }
 
-        dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
+        if (u->filter_added)
+            dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
+
         pa_dbus_connection_unref(u->connection);
     }
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/bluetooth/module-bluetooth-proximity.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/bluetooth/module-bluetooth-proximity.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/bluetooth/module-bluetooth-proximity.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/bluetooth/module-bluetooth-proximity.c	2010-01-15 23:21:18.000000000 +0000
@@ -92,7 +92,8 @@
     unsigned n_found;
     unsigned n_unknown;
 
-    pa_bool_t muted;
+    pa_bool_t muted:1;
+    pa_bool_t filter_added:1;
 };
 
 static void update_volume(struct userdata *u) {
@@ -358,9 +359,10 @@
     } else
         dbus_bus_remove_match(pa_dbus_connection_get(u->dbus_connection), filter2, &e);
 
-    if (add)
+    if (add) {
         pa_assert_se(dbus_connection_add_filter(pa_dbus_connection_get(u->dbus_connection), filter_func, u, NULL));
-    else
+        u->filter_added = TRUE;
+    } else if (u->filter_added)
         dbus_connection_remove_filter(pa_dbus_connection_get(u->dbus_connection), filter_func, u);
 
     r = 0;
@@ -393,9 +395,6 @@
     u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
     u->hci = pa_xstrdup(pa_modargs_get_value(ma, "hci", DEFAULT_HCI));
     u->hci_path = pa_sprintf_malloc("/org/bluez/%s", u->hci);
-    u->n_found = u->n_unknown = 0;
-    u->muted = FALSE;
-
     u->bondings = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
 
     if (!(u->dbus_connection = pa_dbus_bus_get(m->core, DBUS_BUS_SYSTEM, &e))) {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/coreaudio/module-coreaudio-detect.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/coreaudio/module-coreaudio-detect.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/coreaudio/module-coreaudio-detect.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/coreaudio/module-coreaudio-detect.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,229 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Daniel Mack <daniel@caiaq.de>
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/module.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/log.h>
-#include <pulsecore/llist.h>
-
-#include <CoreAudio/CoreAudio.h>
-
-#include "module-coreaudio-detect-symdef.h"
-
-#define DEVICE_MODULE_NAME "module-coreaudio-device"
-
-PA_MODULE_AUTHOR("Daniel Mack");
-PA_MODULE_DESCRIPTION("CoreAudio device detection");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
-PA_MODULE_USAGE("");
-
-typedef struct ca_device ca_device;
-
-struct ca_device {
-    AudioDeviceID id;
-    unsigned int  module_index;
-    PA_LLIST_FIELDS(ca_device);
-};
-
-struct userdata {
-    int detect_fds[2];
-    pa_io_event *detect_io;
-
-    PA_LLIST_HEAD(ca_device, devices);
-};
-
-static int ca_device_added(struct pa_module *m, AudioDeviceID id) {
-    pa_module *mod;
-    struct userdata *u = m->userdata;
-    struct ca_device *dev;
-    char *args;
-
-    pa_assert(u);
-
-    args = pa_sprintf_malloc("device_id=%d", (int) id);
-    pa_log_debug("Loading %s with arguments '%s'", DEVICE_MODULE_NAME, args);
-    mod = pa_module_load(m->core, DEVICE_MODULE_NAME, args);
-    pa_xfree(args);
-
-    if (!mod) {
-        pa_log_info("Failed to load module %s with arguments '%s'", DEVICE_MODULE_NAME, args);
-        return -1;
-    }
-
-    dev = pa_xnew0(ca_device, 1);
-    dev->module_index = mod->index;
-    dev->id = id;
-
-    PA_LLIST_INIT(ca_device, dev);
-    PA_LLIST_PREPEND(ca_device, u->devices, dev);
-
-    return 0;
-}
-
-static int ca_update_device_list(struct pa_module *m) {
-    OSStatus err;
-    UInt32 i, size, num_devices;
-    Boolean writable;
-    AudioDeviceID *device_id;
-    struct ca_device *dev;
-    struct userdata *u = m->userdata;
-
-    pa_assert(u);
-
-    /* get the number of currently available audio devices */
-    err = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &size, &writable);
-    if (err) {
-        pa_log("Unable to get info for kAudioHardwarePropertyDevices.");
-        return -1;
-    }
-
-    num_devices = size / sizeof(AudioDeviceID);
-    device_id = pa_xnew(AudioDeviceID, num_devices);
-
-    err = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &size, device_id);
-    if (err) {
-        pa_log("Unable to get kAudioHardwarePropertyDevices.");
-        pa_xfree(device_id);
-        return -1;
-    }
-
-    /* scan for devices which are reported but not in our cached list */
-    for (i = 0; i < num_devices; i++) {
-        bool found = FALSE;
-
-        PA_LLIST_FOREACH(dev, u->devices)
-            if (dev->id == device_id[i]) {
-                found = TRUE;
-                break;
-            }
-
-        if (!found)
-            ca_device_added(m, device_id[i]);
-    }
-
-    /* scan for devices which are in our cached list but are not reported */
-scan_removed:
-
-    PA_LLIST_FOREACH(dev, u->devices) {
-        bool found = FALSE;
-
-        for (i = 0; i < num_devices; i++)
-            if (dev->id == device_id[i]) {
-                found = TRUE;
-                break;
-            }
-
-        if (!found) {
-            pa_log_debug("device id %d has been removed (module index %d)  %p", (unsigned int) dev->id, dev->module_index, dev);
-            pa_module_unload_request_by_index(m->core, dev->module_index, TRUE);
-            PA_LLIST_REMOVE(ca_device, u->devices, dev);
-            pa_xfree(dev);
-            /* the current list item pointer is not valid anymore, so start over. */
-            goto scan_removed;
-        }
-    }
-
-    pa_xfree(device_id);
-    return 0;
-}
-
-static OSStatus property_listener_proc(AudioHardwarePropertyID property, void *data) {
-    struct userdata *u = data;
-    char dummy = 1;
-
-    pa_assert(u);
-
-    /* dispatch module load/unload operations in main thread */
-    if (property == kAudioHardwarePropertyDevices)
-        write(u->detect_fds[1], &dummy, 1);
-
-    return 0;
-}
-
-static void detect_handle(pa_mainloop_api *a, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
-    pa_module *m = userdata;
-    char dummy;
-
-    pa_assert(m);
-
-    read(fd, &dummy, 1);
-    ca_update_device_list(m);
-}
-
-int pa__init(pa_module *m) {
-    struct userdata *u = pa_xnew0(struct userdata, 1);
-
-    m->userdata = u;
-
-    if (AudioHardwareAddPropertyListener(kAudioHardwarePropertyDevices, property_listener_proc, u)) {
-        pa_log("AudioHardwareAddPropertyListener() failed.");
-        goto fail;
-    }
-
-    if (ca_update_device_list(m))
-       goto fail;
-
-    pa_assert_se(pipe(u->detect_fds) == 0);
-    pa_assert_se(u->detect_io = m->core->mainloop->io_new(m->core->mainloop, u->detect_fds[0], PA_IO_EVENT_INPUT, detect_handle, m));
-
-    return 0;
-
-fail:
-    pa_xfree(u);
-    return -1;
-}
-
-void pa__done(pa_module *m) {
-    struct userdata *u = m->userdata;
-    struct ca_device *dev = u->devices;
-
-    pa_assert(u);
-
-    AudioHardwareRemovePropertyListener(kAudioHardwarePropertyDevices, property_listener_proc);
-
-    while (dev) {
-        struct ca_device *next = dev->next;
-
-        pa_module_unload_request_by_index(m->core, dev->module_index, TRUE);
-        pa_xfree(dev);
-
-        dev = next;
-    }
-
-    if (u->detect_fds[0] >= 0)
-        close(u->detect_fds[0]);
-
-    if (u->detect_fds[1] >= 0)
-        close(u->detect_fds[1]);
-
-    if (u->detect_io)
-        m->core->mainloop->io_free(u->detect_io);
-
-    pa_xfree(u);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/coreaudio/module-coreaudio-device.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/coreaudio/module-coreaudio-device.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/coreaudio/module-coreaudio-device.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/coreaudio/module-coreaudio-device.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,820 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Daniel Mack <daniel@caiaq.de>
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* TODO:
-    - implement hardware volume controls
-    - handle audio device stream format changes (will require changes to the core)
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulse/xmalloc.h>
-#include <pulse/util.h>
-
-#include <pulsecore/core-error.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/source.h>
-#include <pulsecore/module.h>
-#include <pulsecore/sample-util.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/log.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/llist.h>
-#include <pulsecore/card.h>
-#include <pulsecore/strbuf.h>
-#include <pulsecore/thread.h>
-#include <pulsecore/thread-mq.h>
-
-#include <CoreAudio/CoreAudio.h>
-#include <CoreAudio/CoreAudioTypes.h>
-#include <CoreAudio/AudioHardware.h>
-
-#include "module-coreaudio-device-symdef.h"
-
-#define DEFAULT_FRAMES_PER_IOPROC 512
-
-PA_MODULE_AUTHOR("Daniel Mack");
-PA_MODULE_DESCRIPTION("CoreAudio device");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(FALSE);
-PA_MODULE_USAGE("device_id=<the CoreAudio device id> "
-                "ioproc_frames=<audio frames per IOProc call> ");
-
-static const char* const valid_modargs[] = {
-    "device_id",
-    "ioproc_frames",
-    NULL
-};
-
-enum {
-    CA_MESSAGE_RENDER = PA_SINK_MESSAGE_MAX,
-};
-
-typedef struct coreaudio_sink coreaudio_sink;
-typedef struct coreaudio_source coreaudio_source;
-
-struct userdata {
-    AudioDeviceID device_id;
-    AudioDeviceIOProcID proc_id;
-
-    pa_thread_mq thread_mq;
-    pa_asyncmsgq *async_msgq;
-
-    pa_rtpoll *rtpoll;
-    pa_thread *thread;
-
-    pa_module *module;
-    pa_card *card;
-    pa_bool_t running;
-
-    char *device_name, *vendor_name;
-
-    const AudioBufferList *render_input_data;
-    AudioBufferList       *render_output_data;
-
-    AudioStreamBasicDescription stream_description;
-
-    PA_LLIST_HEAD(coreaudio_sink, sinks);
-    PA_LLIST_HEAD(coreaudio_source, sources);
-};
-
-struct coreaudio_sink {
-    pa_sink *pa_sink;
-    struct userdata *userdata;
-
-    char *name;
-    unsigned int channel_idx;
-    pa_bool_t active;
-
-    pa_channel_map map;
-    pa_sample_spec ss;
-
-    PA_LLIST_FIELDS(coreaudio_sink);
-};
-
-struct coreaudio_source {
-    pa_source *pa_source;
-    struct userdata *userdata;
-
-    char *name;
-    unsigned int channel_idx;
-    pa_bool_t active;
-
-    pa_channel_map map;
-    pa_sample_spec ss;
-
-    PA_LLIST_FIELDS(coreaudio_source);
-};
-
-static OSStatus io_render_proc (AudioDeviceID          device,
-                                const AudioTimeStamp  *now,
-                                const AudioBufferList *inputData,
-                                const AudioTimeStamp  *inputTime,
-                                AudioBufferList       *outputData,
-                                const AudioTimeStamp  *outputTime,
-                                void                  *clientData)
-{
-    struct userdata *u = clientData;
-
-    pa_assert(u);
-    pa_assert(device == u->device_id);
-
-    u->render_input_data = inputData;
-    u->render_output_data = outputData;
-
-    if (u->sinks)
-        pa_assert_se(pa_asyncmsgq_send(u->async_msgq, PA_MSGOBJECT(u->sinks->pa_sink),
-                                        CA_MESSAGE_RENDER, NULL, 0, NULL) == 0);
-
-    if (u->sources)
-        pa_assert_se(pa_asyncmsgq_send(u->async_msgq, PA_MSGOBJECT(u->sources->pa_source),
-                                        CA_MESSAGE_RENDER, NULL, 0, NULL) == 0);
-
-    return 0;
-}
-
-static OSStatus ca_stream_format_changed(AudioDeviceID inDevice,
-                                         UInt32 inChannel,
-                                         Boolean isInput,
-                                         AudioDevicePropertyID inPropertyID,
-                                         void *inClientData)
-{
-    struct userdata *u = inClientData;
-
-    pa_assert(u);
-
-    /* REVISIT: PA can't currently handle external format change requests.
-     * Hence, we set the original format back in this callback to avoid horrible audio artefacts.
-     * The device settings will appear to be 'locked' for any application as long as the PA daemon is running.
-     * Once we're able to propagate such events up in the core, this needs to be changed. */
-
-    return AudioDeviceSetProperty(inDevice, NULL, inChannel, isInput,
-                                  kAudioDevicePropertyStreamFormat, sizeof(u->stream_description), &u->stream_description);
-}
-
-static pa_usec_t get_latency_us(pa_object *o) {
-    struct userdata *u;
-    pa_sample_spec *ss;
-    bool is_source;
-    UInt32 v, total = 0;
-    UInt32 err, size = sizeof(v);
-
-    if (pa_sink_isinstance(o)) {
-        coreaudio_sink *sink = PA_SINK(o)->userdata;
-
-        u = sink->userdata;
-        ss = &sink->ss;
-        is_source = FALSE;
-    } else if (pa_source_isinstance(o)) {
-        coreaudio_source *source = PA_SOURCE(o)->userdata;
-
-        u = source->userdata;
-        ss = &source->ss;
-        is_source = TRUE;
-    } else
-        pa_assert_not_reached();
-
-    pa_assert(u);
-
-    /* get the device latency */
-    size = sizeof(total);
-    AudioDeviceGetProperty(u->device_id, 0, is_source, kAudioDevicePropertyLatency, &size, &v);
-    total += v;
-
-    /* the the IOProc buffer size */
-    size = sizeof(v);
-    AudioDeviceGetProperty(u->device_id, 0, is_source, kAudioDevicePropertyBufferFrameSize, &size, &v);
-    total += v;
-
-    /* IOProc safety offset - this value is the same for both directions, hence we divide it by 2 */
-    size = sizeof(v);
-    AudioDeviceGetProperty(u->device_id, 0, is_source, kAudioDevicePropertySafetyOffset, &size, &v);
-    total += v / 2;
-
-    /* get the stream latency.
-     * FIXME: this assumes the stream latency is the same for all streams */
-    err = AudioStreamGetProperty(0, is_source, kAudioStreamPropertyLatency, &size, &v);
-    if (!err)
-        total += v;
-
-    return pa_bytes_to_usec(total * pa_frame_size(ss), ss);
-}
-
-static void ca_device_check_device_state(struct userdata *u) {
-    coreaudio_sink *ca_sink;
-    coreaudio_source *ca_source;
-    pa_bool_t active = FALSE;
-
-    pa_assert(u);
-
-    for (ca_sink = u->sinks; ca_sink; ca_sink = ca_sink->next)
-        if (ca_sink->active)
-            active = TRUE;
-
-    for (ca_source = u->sources; ca_source; ca_source = ca_source->next)
-        if (ca_source->active)
-            active = TRUE;
-
-    if (active && !u->running)
-        AudioDeviceStart(u->device_id, u->proc_id);
-    else if (!active && u->running)
-        AudioDeviceStop(u->device_id, u->proc_id);
-
-    u->running = active;
-}
-
-static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
-    coreaudio_sink *sink = PA_SINK(o)->userdata;
-    struct userdata *u = sink->userdata;
-    unsigned int i;
-    pa_memchunk audio_chunk;
-
-    switch (code) {
-        case CA_MESSAGE_RENDER: {
-            /* audio out */
-            for (i = 0; i < u->render_output_data->mNumberBuffers; i++) {
-                AudioBuffer *buf = u->render_output_data->mBuffers + i;
-
-                pa_assert(sink);
-
-                if (PA_SINK_IS_OPENED(sink->pa_sink->thread_info.state)) {
-                    if (sink->pa_sink->thread_info.rewind_requested)
-                        pa_sink_process_rewind(sink->pa_sink, 0);
-
-                    audio_chunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, buf->mData, buf->mDataByteSize, FALSE);
-                    audio_chunk.length = buf->mDataByteSize;
-                    audio_chunk.index = 0;
-
-                    pa_sink_render_into_full(sink->pa_sink, &audio_chunk);
-                    pa_memblock_unref_fixed(audio_chunk.memblock);
-                }
-
-                sink = sink->next;
-            }
-
-            return 0;
-        }
-
-        case PA_SINK_MESSAGE_GET_LATENCY: {
-            *((pa_usec_t *) data) = get_latency_us(PA_OBJECT(o));
-            return 0;
-        }
-
-        case PA_SINK_MESSAGE_SET_STATE:
-            switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
-                case PA_SINK_SUSPENDED:
-                case PA_SINK_IDLE:
-                    sink->active = FALSE;
-                    break;
-
-                case PA_SINK_RUNNING:
-                    sink->active = TRUE;
-                    break;
-
-                case PA_SINK_UNLINKED:
-                case PA_SINK_INIT:
-                case PA_SINK_INVALID_STATE:
-                    ;
-            }
-
-            ca_device_check_device_state(sink->userdata);
-            break;
-    }
-
-    return pa_sink_process_msg(o, code, data, offset, chunk);
-}
-
-static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
-    coreaudio_source *source = PA_SOURCE(o)->userdata;
-    struct userdata *u = source->userdata;
-    unsigned int i;
-    pa_memchunk audio_chunk;
-
-    switch (code) {
-        case CA_MESSAGE_RENDER: {
-            /* audio in */
-            for (i = 0; i < u->render_input_data->mNumberBuffers; i++) {
-                const AudioBuffer *buf = u->render_input_data->mBuffers + i;
-
-                pa_assert(source);
-
-                if (PA_SOURCE_IS_OPENED(source->pa_source->thread_info.state)) {
-                    audio_chunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, buf->mData, buf->mDataByteSize, TRUE);
-                    audio_chunk.length = buf->mDataByteSize;
-                    audio_chunk.index = 0;
-
-                    pa_source_post(source->pa_source, &audio_chunk);
-                    pa_memblock_unref_fixed(audio_chunk.memblock);
-                }
-
-                source = source->next;
-            }
-
-            return 0;
-        }
-
-        case PA_SOURCE_MESSAGE_GET_LATENCY: {
-            *((pa_usec_t *) data) = get_latency_us(PA_OBJECT(o));
-            return 0;
-        }
-
-        case PA_SOURCE_MESSAGE_SET_STATE:
-            switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
-                case PA_SOURCE_SUSPENDED:
-                case PA_SOURCE_IDLE:
-                    source->active = FALSE;
-                    break;
-
-                case PA_SOURCE_RUNNING:
-                    source->active = TRUE;
-                    break;
-
-                case PA_SOURCE_UNLINKED:
-                case PA_SOURCE_INIT:
-                case PA_SOURCE_INVALID_STATE:
-                    ;
-            }
-
-            ca_device_check_device_state(source->userdata);
-            break;
-    }
-
-    return pa_source_process_msg(o, code, data, offset, chunk);
-}
-
-static int ca_device_create_sink(pa_module *m, AudioBuffer *buf, int channel_idx) {
-    OSStatus err;
-    UInt32 size;
-    struct userdata *u = m->userdata;
-    pa_sink_new_data new_data;
-    pa_sink_flags_t flags = PA_SINK_LATENCY | PA_SINK_HARDWARE;
-    coreaudio_sink *ca_sink;
-    pa_sink *sink;
-    unsigned int i;
-    char tmp[255];
-    pa_strbuf *strbuf;
-
-    ca_sink = pa_xnew0(coreaudio_sink, 1);
-    ca_sink->map.channels = buf->mNumberChannels;
-    ca_sink->ss.channels = buf->mNumberChannels;
-    ca_sink->channel_idx = channel_idx;
-
-    /* build a name for this stream */
-    strbuf = pa_strbuf_new();
-
-    for (i = 0; i < buf->mNumberChannels; i++) {
-        size = sizeof(tmp);
-        err = AudioDeviceGetProperty(u->device_id, channel_idx + i + 1, 0, kAudioObjectPropertyElementName, &size, tmp);
-        if (err || !strlen(tmp))
-            snprintf(tmp, sizeof(tmp), "Channel %d", channel_idx + i + 1);
-
-        if (i > 0)
-            pa_strbuf_puts(strbuf, ", ");
-
-        pa_strbuf_puts(strbuf, tmp);
-    }
-
-    ca_sink->name = pa_strbuf_tostring_free(strbuf);
-
-    pa_log_debug("Stream name is >%s<", ca_sink->name);
-
-    /* default to mono streams */
-    for (i = 0; i < ca_sink->map.channels; i++)
-        ca_sink->map.map[i] = PA_CHANNEL_POSITION_MONO;
-
-    if (buf->mNumberChannels == 2) {
-        ca_sink->map.map[0] = PA_CHANNEL_POSITION_LEFT;
-        ca_sink->map.map[1] = PA_CHANNEL_POSITION_RIGHT;
-    }
-
-    ca_sink->ss.rate = u->stream_description.mSampleRate;
-    ca_sink->ss.format = PA_SAMPLE_FLOAT32LE;
-
-    pa_sink_new_data_init(&new_data);
-    new_data.card = u->card;
-    new_data.driver = __FILE__;
-    new_data.module = u->module;
-    new_data.namereg_fail = FALSE;
-    pa_sink_new_data_set_name(&new_data, ca_sink->name);
-    pa_sink_new_data_set_channel_map(&new_data, &ca_sink->map);
-    pa_sink_new_data_set_sample_spec(&new_data, &ca_sink->ss);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_STRING, u->device_name);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_PRODUCT_NAME, u->device_name);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_DESCRIPTION, u->device_name);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_ACCESS_MODE, "mmap");
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_CLASS, "sound");
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_API, "CoreAudio");
-    pa_proplist_setf(new_data.proplist, PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE, "%lu", (unsigned long) buf->mDataByteSize);
-
-    if (u->vendor_name)
-        pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_VENDOR_NAME, u->vendor_name);
-
-    sink = pa_sink_new(m->core, &new_data, flags);
-    pa_sink_new_data_done(&new_data);
-
-    if (!sink) {
-        pa_log("unable to create sink.");
-        return -1;
-    }
-
-    sink->parent.process_msg = sink_process_msg;
-    sink->userdata = ca_sink;
-
-    pa_sink_set_asyncmsgq(sink, u->thread_mq.inq);
-    pa_sink_set_rtpoll(sink, u->rtpoll);
-
-    ca_sink->pa_sink = sink;
-    ca_sink->userdata = u;
-
-    PA_LLIST_PREPEND(coreaudio_sink, u->sinks, ca_sink);
-
-    return 0;
-}
-
-static int ca_device_create_source(pa_module *m, AudioBuffer *buf, int channel_idx) {
-    OSStatus err;
-    UInt32 size;
-    struct userdata *u = m->userdata;
-    pa_source_new_data new_data;
-    pa_source_flags_t flags = PA_SOURCE_LATENCY | PA_SOURCE_HARDWARE;
-    coreaudio_source *ca_source;
-    pa_source *source;
-    unsigned int i;
-    char tmp[255];
-    pa_strbuf *strbuf;
-
-    ca_source = pa_xnew0(coreaudio_source, 1);
-    ca_source->map.channels = buf->mNumberChannels;
-    ca_source->ss.channels = buf->mNumberChannels;
-    ca_source->channel_idx = channel_idx;
-
-    /* build a name for this stream */
-    strbuf = pa_strbuf_new();
-
-    for (i = 0; i < buf->mNumberChannels; i++) {
-        size = sizeof(tmp);
-        err = AudioDeviceGetProperty(u->device_id, channel_idx + i + 1, 0, kAudioObjectPropertyElementName, &size, tmp);
-        if (err || !strlen(tmp))
-            snprintf(tmp, sizeof(tmp), "Channel %d", channel_idx + i + 1);
-
-        if (i > 0)
-            pa_strbuf_puts(strbuf, ", ");
-
-        pa_strbuf_puts(strbuf, tmp);
-    }
-
-    ca_source->name = pa_strbuf_tostring_free(strbuf);
-
-    pa_log_debug("Stream name is >%s<", ca_source->name);
-
-    /* default to mono streams */
-    for (i = 0; i < ca_source->map.channels; i++)
-        ca_source->map.map[i] = PA_CHANNEL_POSITION_MONO;
-
-    if (buf->mNumberChannels == 2) {
-        ca_source->map.map[0] = PA_CHANNEL_POSITION_LEFT;
-        ca_source->map.map[1] = PA_CHANNEL_POSITION_RIGHT;
-    }
-
-    ca_source->ss.rate = u->stream_description.mSampleRate;
-    ca_source->ss.format = PA_SAMPLE_FLOAT32LE;
-
-    pa_source_new_data_init(&new_data);
-    new_data.card = u->card;
-    new_data.driver = __FILE__;
-    new_data.module = u->module;
-    new_data.namereg_fail = FALSE;
-    pa_source_new_data_set_name(&new_data, ca_source->name);
-    pa_source_new_data_set_channel_map(&new_data, &ca_source->map);
-    pa_source_new_data_set_sample_spec(&new_data, &ca_source->ss);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_STRING, u->device_name);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_PRODUCT_NAME, u->device_name);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_DESCRIPTION, u->device_name);
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_ACCESS_MODE, "mmap");
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_CLASS, "sound");
-    pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_API, "CoreAudio");
-    pa_proplist_setf(new_data.proplist, PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE, "%lu", (unsigned long) buf->mDataByteSize);
-
-    if (u->vendor_name)
-        pa_proplist_sets(new_data.proplist, PA_PROP_DEVICE_VENDOR_NAME, u->vendor_name);
-
-    source = pa_source_new(m->core, &new_data, flags);
-    pa_source_new_data_done(&new_data);
-
-    if (!source) {
-        pa_log("unable to create source.");
-        return -1;
-    }
-
-    source->parent.process_msg = source_process_msg;
-    source->userdata = ca_source;
-
-    pa_source_set_asyncmsgq(source, u->thread_mq.inq);
-    pa_source_set_rtpoll(source, u->rtpoll);
-
-    ca_source->pa_source = source;
-    ca_source->userdata = u;
-
-    PA_LLIST_PREPEND(coreaudio_source, u->sources, ca_source);
-
-    return 0;
-}
-
-static int ca_device_create_streams(pa_module *m, bool direction_in) {
-    OSStatus err;
-    UInt32 size, i, channel_idx;
-    struct userdata *u = m->userdata;
-    int section = direction_in ? 1 : 0;
-    AudioBufferList *buffer_list;
-
-    /* get current stream format */
-    size = sizeof(AudioStreamBasicDescription);
-    err = AudioDeviceGetProperty(u->device_id, 0, section, kAudioDevicePropertyStreamFormat, &size, &u->stream_description);
-    if (err) {
-        /* no appropriate streams found - silently bail. */
-        return -1;
-    }
-
-    if (u->stream_description.mFormatID != kAudioFormatLinearPCM) {
-        pa_log("Unsupported audio format '%c%c%c%c'",
-            (char) (u->stream_description.mFormatID >> 24),
-            (char) (u->stream_description.mFormatID >> 16) & 0xff,
-            (char) (u->stream_description.mFormatID >> 8) & 0xff,
-            (char) (u->stream_description.mFormatID & 0xff));
-        return -1;
-    }
-
-    /* get stream configuration */
-    size = 0;
-    err = AudioDeviceGetPropertyInfo(u->device_id, 0, section, kAudioDevicePropertyStreamConfiguration, &size, NULL);
-    if (err) {
-        pa_log("Failed to get kAudioDevicePropertyStreamConfiguration (%s).", direction_in ? "input" : "output");
-        return -1;
-    }
-
-    if (!size)
-        return 0;
-
-    buffer_list = (AudioBufferList *) pa_xmalloc(size);
-    err = AudioDeviceGetProperty(u->device_id, 0, section, kAudioDevicePropertyStreamConfiguration, &size, buffer_list);
-
-    if (!err) {
-        pa_log_debug("Sample rate: %f", u->stream_description.mSampleRate);
-        pa_log_debug("%d bytes per packet",   (unsigned int) u->stream_description.mBytesPerPacket);
-        pa_log_debug("%d frames per packet",  (unsigned int) u->stream_description.mFramesPerPacket);
-        pa_log_debug("%d bytes per frame",    (unsigned int) u->stream_description.mBytesPerFrame);
-        pa_log_debug("%d channels per frame", (unsigned int) u->stream_description.mChannelsPerFrame);
-        pa_log_debug("%d bits per channel",   (unsigned int) u->stream_description.mBitsPerChannel);
-
-        for (channel_idx = 0, i = 0; i < buffer_list->mNumberBuffers; i++) {
-            AudioBuffer *buf = buffer_list->mBuffers + i;
-
-            if (direction_in)
-                ca_device_create_source(m, buf, channel_idx);
-            else
-                ca_device_create_sink(m, buf, channel_idx);
-
-            channel_idx += buf->mNumberChannels;
-        }
-    }
-
-    pa_xfree(buffer_list);
-    return 0;
-}
-
-static void thread_func(void *userdata) {
-    struct userdata *u = userdata;
-
-    pa_assert(u);
-    pa_assert(u->module);
-    pa_assert(u->module->core);
-
-    pa_log_debug("Thread starting up");
-
-    if (u->module->core->realtime_scheduling)
-        pa_make_realtime(u->module->core->realtime_priority);
-
-    pa_thread_mq_install(&u->thread_mq);
-
-    for (;;) {
-        int ret;
-
-        ret = pa_rtpoll_run(u->rtpoll, TRUE);
-
-        if (ret < 0)
-            goto fail;
-
-        if (ret == 0)
-            goto finish;
-    }
-
-fail:
-    /* If this was no regular exit from the loop we have to continue
-     * processing messages until we received PA_MESSAGE_SHUTDOWN */
-    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->module->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL);
-    pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN);
-
-finish:
-    pa_log_debug("Thread shutting down");
-}
-
-int pa__init(pa_module *m) {
-    OSStatus err;
-    UInt32 size, frames;
-    struct userdata *u = NULL;
-    pa_modargs *ma = NULL;
-    char tmp[64];
-    pa_card_new_data card_new_data;
-    coreaudio_sink *ca_sink;
-    coreaudio_source *ca_source;
-
-    pa_assert(m);
-
-    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log("Failed to parse module arguments.");
-        goto fail;
-    }
-
-    u = pa_xnew0(struct userdata, 1);
-    u->module = m;
-    m->userdata = u;
-
-    if (pa_modargs_get_value_u32(ma, "device_id", (unsigned int *) &u->device_id) != 0) {
-        pa_log("Failed to parse device_id argument.");
-        goto fail;
-    }
-
-    /* get device product name */
-    size = sizeof(tmp);
-    err = AudioDeviceGetProperty(u->device_id, 0, 0, kAudioDevicePropertyDeviceName, &size, &tmp);
-    if (err) {
-        pa_log("Failed to get kAudioDevicePropertyDeviceName (err = %08x).", (int) err);
-        goto fail;
-    }
-
-    u->device_name = pa_xstrdup(tmp);
-
-    pa_card_new_data_init(&card_new_data);
-    pa_proplist_sets(card_new_data.proplist, PA_PROP_DEVICE_STRING, tmp);
-    card_new_data.driver = __FILE__;
-    pa_card_new_data_set_name(&card_new_data, tmp);
-    pa_log_info("Initializing module for CoreAudio device '%s' (id %d)", tmp, (unsigned int) u->device_id);
-
-    /* get device vendor name (may fail) */
-    size = sizeof(tmp);
-    err = AudioDeviceGetProperty(u->device_id, 0, 0, kAudioDevicePropertyDeviceManufacturer, &size, &tmp);
-    if (!err)
-        u->vendor_name = pa_xstrdup(tmp);
-
-    /* create the card object */
-    u->card = pa_card_new(m->core, &card_new_data);
-    if (!u->card) {
-        pa_log("Unable to create card.\n");
-        goto fail;
-    }
-
-    pa_card_new_data_done(&card_new_data);
-    u->card->userdata = u;
-
-    u->rtpoll = pa_rtpoll_new();
-    pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
-    u->async_msgq = pa_asyncmsgq_new(0);
-    pa_rtpoll_item_new_asyncmsgq_read(u->rtpoll, PA_RTPOLL_EARLY-1, u->async_msgq);
-
-    PA_LLIST_HEAD_INIT(coreaudio_sink, u->sinks);
-
-    /* create sinks */
-    ca_device_create_streams(m, FALSE);
-
-    /* create sources */
-    ca_device_create_streams(m, TRUE);
-
-    /* create the message thread */
-    if (!(u->thread = pa_thread_new(thread_func, u))) {
-        pa_log("Failed to create thread.");
-        goto fail;
-    }
-
-    /* register notification callback for stream format changes */
-    AudioDeviceAddPropertyListener(u->device_id, 0, 0, kAudioDevicePropertyStreamFormat, ca_stream_format_changed, u);
-
-    /* set number of frames in IOProc */
-    frames = DEFAULT_FRAMES_PER_IOPROC;
-    pa_modargs_get_value_u32(ma, "ioproc_frames", (unsigned int *) &frames);
-
-    AudioDeviceSetProperty(u->device_id, NULL, 0, 0, kAudioDevicePropertyBufferFrameSize, sizeof(frames), &frames);
-    pa_log_debug("%u frames per IOProc\n", (unsigned int) frames);
-
-    /* create one ioproc for both directions */
-    err = AudioDeviceCreateIOProcID(u->device_id, io_render_proc, u, &u->proc_id);
-    if (err) {
-        pa_log("AudioDeviceCreateIOProcID() failed (err = %08x\n).", (int) err);
-        goto fail;
-    }
-
-    for (ca_sink = u->sinks; ca_sink; ca_sink = ca_sink->next)
-        pa_sink_put(ca_sink->pa_sink);
-
-    for (ca_source = u->sources; ca_source; ca_source = ca_source->next)
-        pa_source_put(ca_source->pa_source);
-
-    pa_modargs_free(ma);
-
-    return 0;
-
-fail:
-    if (u)
-        pa__done(m);
-
-    if (ma)
-        pa_modargs_free(ma);
-
-    return -1;
-}
-
-void pa__done(pa_module *m) {
-    struct userdata *u;
-    coreaudio_sink *ca_sink;
-    coreaudio_source *ca_source;
-
-    pa_assert(m);
-
-    u = m->userdata;
-    pa_assert(u);
-
-    /* unlink sinks */
-    for (ca_sink = u->sinks; ca_sink; ca_sink = ca_sink->next)
-        if (ca_sink->pa_sink)
-            pa_sink_unlink(ca_sink->pa_sink);
-
-    /* unlink sources */
-    for (ca_source = u->sources; ca_source; ca_source = ca_source->next)
-        if (ca_source->pa_source)
-            pa_source_unlink(ca_source->pa_source);
-
-    if (u->thread) {
-        pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
-        pa_thread_free(u->thread);
-        pa_thread_mq_done(&u->thread_mq);
-        pa_asyncmsgq_unref(u->async_msgq);
-    }
-
-    /* free sinks */
-    for (ca_sink = u->sinks; ca_sink;) {
-        coreaudio_sink *next = ca_sink->next;
-
-        if (ca_sink->pa_sink)
-            pa_sink_unref(ca_sink->pa_sink);
-
-        pa_xfree(ca_sink->name);
-        pa_xfree(ca_sink);
-        ca_sink = next;
-    }
-
-    /* free sources */
-    for (ca_source = u->sources; ca_source;) {
-        coreaudio_source *next = ca_source->next;
-
-        if (ca_source->pa_source)
-            pa_source_unref(ca_source->pa_source);
-
-        pa_xfree(ca_source->name);
-        pa_xfree(ca_source);
-        ca_source = next;
-    }
-
-    if (u->proc_id) {
-        AudioDeviceStop(u->device_id, u->proc_id);
-        AudioDeviceDestroyIOProcID(u->device_id, u->proc_id);
-    }
-
-    AudioDeviceRemovePropertyListener(u->device_id, 0, 0, kAudioDevicePropertyStreamFormat, ca_stream_format_changed);
-
-    pa_xfree(u->device_name);
-    pa_xfree(u->vendor_name);
-    pa_rtpoll_free(u->rtpoll);
-    pa_card_free(u->card);
-
-    pa_xfree(u);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,561 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-card-profile.h"
-
-#include "iface-card.h"
-
-#define OBJECT_NAME "card"
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_profiles(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_active_profile(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_active_profile(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_profile_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-struct pa_dbusiface_card {
-    pa_dbusiface_core *core;
-
-    pa_card *card;
-    char *path;
-    pa_hashmap *profiles;
-    uint32_t next_profile_index;
-    pa_card_profile *active_profile;
-    pa_proplist *proplist;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_subscription *subscription;
-};
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_DRIVER,
-    PROPERTY_HANDLER_OWNER_MODULE,
-    PROPERTY_HANDLER_SINKS,
-    PROPERTY_HANDLER_SOURCES,
-    PROPERTY_HANDLER_PROFILES,
-    PROPERTY_HANDLER_ACTIVE_PROFILE,
-    PROPERTY_HANDLER_PROPERTY_LIST,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]          = { .property_name = "Index",         .type = "u",      .get_cb = handle_get_index,          .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]           = { .property_name = "Name",          .type = "s",      .get_cb = handle_get_name,           .set_cb = NULL },
-    [PROPERTY_HANDLER_DRIVER]         = { .property_name = "Driver",        .type = "s",      .get_cb = handle_get_driver,         .set_cb = NULL },
-    [PROPERTY_HANDLER_OWNER_MODULE]   = { .property_name = "OwnerModule",   .type = "o",      .get_cb = handle_get_owner_module,   .set_cb = NULL },
-    [PROPERTY_HANDLER_SINKS]          = { .property_name = "Sinks",         .type = "ao",     .get_cb = handle_get_sinks,          .set_cb = NULL },
-    [PROPERTY_HANDLER_SOURCES]        = { .property_name = "Sources",       .type = "ao",     .get_cb = handle_get_sources,        .set_cb = NULL },
-    [PROPERTY_HANDLER_PROFILES]       = { .property_name = "Profiles",      .type = "ao",     .get_cb = handle_get_profiles,       .set_cb = NULL },
-    [PROPERTY_HANDLER_ACTIVE_PROFILE] = { .property_name = "ActiveProfile", .type = "o",      .get_cb = handle_get_active_profile, .set_cb = handle_set_active_profile },
-    [PROPERTY_HANDLER_PROPERTY_LIST]  = { .property_name = "PropertyList",  .type = "a{say}", .get_cb = handle_get_property_list,  .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_GET_PROFILE_BY_NAME,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info get_profile_by_name_args[] = { { "name", "s", "in" }, { "profile", "o", "out" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_GET_PROFILE_BY_NAME] = {
-        .method_name = "GetProfileByName",
-        .arguments = get_profile_by_name_args,
-        .n_arguments = sizeof(get_profile_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_profile_by_name }
-};
-
-enum signal_index {
-    SIGNAL_ACTIVE_PROFILE_UPDATED,
-    SIGNAL_PROPERTY_LIST_UPDATED,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info active_profile_updated_args[] = { { "profile",       "o",      NULL } };
-static pa_dbus_arg_info property_list_updated_args[] =  { { "property_list", "a{say}", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_ACTIVE_PROFILE_UPDATED] = { .name = "ActiveProfileUpdated", .arguments = active_profile_updated_args, .n_arguments = 1 },
-    [SIGNAL_PROPERTY_LIST_UPDATED]  = { .name = "PropertyListUpdated",  .arguments = property_list_updated_args,  .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info card_interface_info = {
-    .name = PA_DBUSIFACE_CARD_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    dbus_uint32_t idx;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    idx = c->card->index;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &c->card->name);
-}
-
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &c->card->driver);
-}
-
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char *owner_module;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (!c->card->module) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Card %s doesn't have an owner module.", c->card->name);
-        return;
-    }
-
-    owner_module = pa_dbusiface_core_get_module_path(c->core, c->card->module);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &owner_module);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_sinks(pa_dbusiface_card *c, unsigned *n) {
-    const char **sinks = NULL;
-    unsigned i = 0;
-    uint32_t idx = 0;
-    pa_sink *sink = NULL;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_idxset_size(c->card->sinks);
-
-    if (*n == 0)
-        return NULL;
-
-    sinks = pa_xnew(const char *, *n);
-
-    PA_IDXSET_FOREACH(sink, c->card->sinks, idx) {
-        sinks[i] = pa_dbusiface_core_get_sink_path(c->core, sink);
-        ++i;
-    }
-
-    return sinks;
-}
-
-static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char **sinks;
-    unsigned n_sinks;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    sinks = get_sinks(c, &n_sinks);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, sinks, n_sinks);
-
-    pa_xfree(sinks);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_sources(pa_dbusiface_card *c, unsigned *n) {
-    const char **sources = NULL;
-    unsigned i = 0;
-    uint32_t idx = 0;
-    pa_source *source = NULL;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_idxset_size(c->card->sources);
-
-    if (*n == 0)
-        return NULL;
-
-    sources = pa_xnew(const char *, *n);
-
-    PA_IDXSET_FOREACH(source, c->card->sinks, idx) {
-        sources[i] = pa_dbusiface_core_get_source_path(c->core, source);
-        ++i;
-    }
-
-    return sources;
-}
-
-static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char **sources;
-    unsigned n_sources;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    sources = get_sources(c, &n_sources);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, sources, n_sources);
-
-    pa_xfree(sources);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_profiles(pa_dbusiface_card *c, unsigned *n) {
-    const char **profiles;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_card_profile *profile;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->profiles);
-
-    if (*n == 0)
-        return NULL;
-
-    profiles = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(profile, c->profiles, state)
-        profiles[i++] = pa_dbusiface_card_profile_get_path(profile);
-
-    return profiles;
-}
-
-static void handle_get_profiles(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char **profiles;
-    unsigned n_profiles;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    profiles = get_profiles(c, &n_profiles);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, profiles, n_profiles);
-
-    pa_xfree(profiles);
-}
-
-static void handle_get_active_profile(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char *active_profile;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (!c->active_profile) {
-        pa_assert(pa_hashmap_isempty(c->profiles));
-
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "The card %s has no profiles, and therefore there's no active profile either.", c->card->name);
-        return;
-    }
-
-    active_profile = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &active_profile);
-}
-
-static void handle_set_active_profile(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char *new_active_path;
-    pa_dbusiface_card_profile *new_active;
-    int r;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(c);
-
-    if (!c->active_profile) {
-        pa_assert(pa_hashmap_isempty(c->profiles));
-
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "The card %s has no profiles, and therefore there's no active profile either.",
-                           c->card->name);
-        return;
-    }
-
-    dbus_message_iter_get_basic(iter, &new_active_path);
-
-    if (!(new_active = pa_hashmap_get(c->profiles, new_active_path))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such profile.", new_active_path);
-        return;
-    }
-
-    if ((r = pa_card_set_profile(c->card, pa_dbusiface_card_profile_get_name(new_active), TRUE)) < 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
-                           "Internal error in PulseAudio: pa_card_set_profile() failed with error code %i.", r);
-        return;
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_dbus_send_proplist_variant_reply(conn, msg, c->proplist);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t idx;
-    const char *owner_module = NULL;
-    const char **sinks = NULL;
-    unsigned n_sinks = 0;
-    const char **sources = NULL;
-    unsigned n_sources = 0;
-    const char **profiles = NULL;
-    unsigned n_profiles = 0;
-    const char *active_profile = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    idx = c->card->index;
-    if (c->card->module)
-        owner_module = pa_dbusiface_core_get_module_path(c->core, c->card->module);
-    sinks = get_sinks(c, &n_sinks);
-    sources = get_sources(c, &n_sources);
-    profiles = get_profiles(c, &n_profiles);
-    if (c->active_profile)
-        active_profile = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &idx);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &c->card->name);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DRIVER].property_name, DBUS_TYPE_STRING, &c->card->driver);
-
-    if (owner_module)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_OWNER_MODULE].property_name, DBUS_TYPE_OBJECT_PATH, &owner_module);
-
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SINKS].property_name, DBUS_TYPE_OBJECT_PATH, sinks, n_sinks);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SOURCES].property_name, DBUS_TYPE_OBJECT_PATH, sources, n_sources);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROFILES].property_name, DBUS_TYPE_OBJECT_PATH, profiles, n_profiles);
-
-    if (active_profile)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ACTIVE_PROFILE].property_name, DBUS_TYPE_OBJECT_PATH, &active_profile);
-
-    pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, c->proplist);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(sinks);
-    pa_xfree(sources);
-    pa_xfree(profiles);
-}
-
-static void handle_get_profile_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    const char *profile_name = NULL;
-    pa_dbusiface_card_profile *profile = NULL;
-    const char *profile_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &profile_name, DBUS_TYPE_INVALID));
-
-    if (!(profile = pa_hashmap_get(c->profiles, profile_name))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such profile on card %s.", profile_name, c->card->name);
-        return;
-    }
-
-    profile_path = pa_dbusiface_card_profile_get_path(profile);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &profile_path);
-}
-
-static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_card *c = userdata;
-    DBusMessage *signal_msg = NULL;
-
-    pa_assert(core);
-    pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_CARD);
-    pa_assert(c);
-
-    /* We can't use idx != c->card->index, because the c->card pointer may
-     * be stale at this point. */
-    if (pa_idxset_get_by_index(core->cards, idx) != c->card)
-        return;
-
-    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
-        return;
-
-    if (c->active_profile != c->card->active_profile) {
-        const char *object_path;
-
-        c->active_profile = c->card->active_profile;
-        object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
-							  PA_DBUSIFACE_CARD_INTERFACE,
-							  signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
-        pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-        pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-
-    if (!pa_proplist_equal(c->proplist, c->card->proplist)) {
-        DBusMessageIter msg_iter;
-
-        pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist);
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
-							  PA_DBUSIFACE_CARD_INTERFACE,
-							  signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
-        dbus_message_iter_init_append(signal_msg, &msg_iter);
-        pa_dbus_append_proplist(&msg_iter, c->proplist);
-
-        pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-}
-
-pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card) {
-    pa_dbusiface_card *c = NULL;
-
-    pa_assert(core);
-    pa_assert(card);
-
-    c = pa_xnew0(pa_dbusiface_card, 1);
-    c->core = core;
-    c->card = card;
-    c->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, card->index);
-    c->profiles = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    c->next_profile_index = 0;
-    c->active_profile = NULL;
-    c->proplist = pa_proplist_copy(card->proplist);
-    c->dbus_protocol = pa_dbus_protocol_get(card->core);
-    c->subscription = pa_subscription_new(card->core, PA_SUBSCRIPTION_MASK_CARD, subscription_cb, c);
-
-    if (card->profiles) {
-        pa_card_profile *profile;
-        void *state = NULL;
-
-        PA_HASHMAP_FOREACH(profile, card->profiles, state) {
-            pa_dbusiface_card_profile *p = pa_dbusiface_card_profile_new(c, card->core, profile, c->next_profile_index++);
-            pa_hashmap_put(c->profiles, pa_dbusiface_card_profile_get_name(p), p);
-        }
-        pa_assert_se(c->active_profile = card->active_profile);
-    }
-
-    pa_assert_se(pa_dbus_protocol_add_interface(c->dbus_protocol, c->path, &card_interface_info, c) >= 0);
-
-    return c;
-}
-
-static void profile_free_cb(void *p, void *userdata) {
-    pa_dbusiface_card_profile *profile = p;
-
-    pa_assert(profile);
-
-    pa_dbusiface_card_profile_free(profile);
-}
-
-void pa_dbusiface_card_free(pa_dbusiface_card *c) {
-    pa_assert(c);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(c->dbus_protocol, c->path, card_interface_info.name) >= 0);
-
-    pa_hashmap_free(c->profiles, profile_free_cb, NULL);
-    pa_proplist_free(c->proplist);
-    pa_dbus_protocol_unref(c->dbus_protocol);
-    pa_subscription_free(c->subscription);
-
-    pa_xfree(c->path);
-    pa_xfree(c);
-}
-
-const char *pa_dbusiface_card_get_path(pa_dbusiface_card *c) {
-    pa_assert(c);
-
-    return c->path;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#ifndef foodbusifacecardhfoo
-#define foodbusifacecardhfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.Card.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Card interface
- * documentation.
- */
-
-#include <pulsecore/card.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_CARD_INTERFACE PA_DBUS_CORE_INTERFACE ".Card"
-
-typedef struct pa_dbusiface_card pa_dbusiface_card;
-
-pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card);
-void pa_dbusiface_card_free(pa_dbusiface_card *c);
-
-const char *pa_dbusiface_card_get_path(pa_dbusiface_card *c);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card-profile.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card-profile.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card-profile.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card-profile.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,228 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-
-#include "iface-card-profile.h"
-
-#define OBJECT_NAME "profile"
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_description(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_priority(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-struct pa_dbusiface_card_profile {
-    uint32_t index;
-    pa_card_profile *profile;
-    char *path;
-    pa_dbus_protocol *dbus_protocol;
-};
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_DESCRIPTION,
-    PROPERTY_HANDLER_SINKS,
-    PROPERTY_HANDLER_SOURCES,
-    PROPERTY_HANDLER_PRIORITY,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]       = { .property_name = "Index",       .type = "u", .get_cb = handle_get_index,       .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]        = { .property_name = "Name",        .type = "s", .get_cb = handle_get_name,        .set_cb = NULL },
-    [PROPERTY_HANDLER_DESCRIPTION] = { .property_name = "Description", .type = "s", .get_cb = handle_get_description, .set_cb = NULL },
-    [PROPERTY_HANDLER_SINKS]       = { .property_name = "Sinks",       .type = "u", .get_cb = handle_get_sinks,       .set_cb = NULL },
-    [PROPERTY_HANDLER_SOURCES]     = { .property_name = "Sources",     .type = "u", .get_cb = handle_get_sources,     .set_cb = NULL },
-    [PROPERTY_HANDLER_PRIORITY]    = { .property_name = "Priority",    .type = "u", .get_cb = handle_get_priority,    .set_cb = NULL },
-};
-
-static pa_dbus_interface_info profile_interface_info = {
-    .name = PA_DBUSIFACE_CARD_PROFILE_INTERFACE,
-    .method_handlers = NULL,
-    .n_method_handlers = 0,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = NULL,
-    .n_signals = 0
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &p->index);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &p->profile->name);
-}
-
-static void handle_get_description(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &p->profile->description);
-}
-
-static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-    dbus_uint32_t sinks = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    sinks = p->profile->n_sinks;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sinks);
-}
-
-static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-    dbus_uint32_t sources = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    sources = p->profile->n_sources;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sources);
-}
-
-static void handle_get_priority(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-    dbus_uint32_t priority = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    priority = p->profile->priority;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &priority);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_card_profile *p = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t sinks = 0;
-    dbus_uint32_t sources = 0;
-    dbus_uint32_t priority = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    sinks = p->profile->n_sinks;
-    sources = p->profile->n_sources;
-    priority = p->profile->priority;
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &p->index);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &p->profile->name);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DESCRIPTION].property_name, DBUS_TYPE_STRING, &p->profile->description);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SINKS].property_name, DBUS_TYPE_UINT32, &sinks);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SOURCES].property_name, DBUS_TYPE_UINT32, &sources);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PRIORITY].property_name, DBUS_TYPE_UINT32, &priority);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-pa_dbusiface_card_profile *pa_dbusiface_card_profile_new(
-        pa_dbusiface_card *card,
-        pa_core *core,
-        pa_card_profile *profile,
-        uint32_t idx) {
-    pa_dbusiface_card_profile *p = NULL;
-
-    pa_assert(card);
-    pa_assert(core);
-    pa_assert(profile);
-
-    p = pa_xnew(pa_dbusiface_card_profile, 1);
-    p->index = idx;
-    p->profile = profile;
-    p->path = pa_sprintf_malloc("%s/%s%u", pa_dbusiface_card_get_path(card), OBJECT_NAME, idx);
-    p->dbus_protocol = pa_dbus_protocol_get(core);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(p->dbus_protocol, p->path, &profile_interface_info, p) >= 0);
-
-    return p;
-}
-
-void pa_dbusiface_card_profile_free(pa_dbusiface_card_profile *p) {
-    pa_assert(p);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(p->dbus_protocol, p->path, profile_interface_info.name) >= 0);
-
-    pa_dbus_protocol_unref(p->dbus_protocol);
-
-    pa_xfree(p->path);
-    pa_xfree(p);
-}
-
-const char *pa_dbusiface_card_profile_get_path(pa_dbusiface_card_profile *p) {
-    pa_assert(p);
-
-    return p->path;
-}
-
-const char *pa_dbusiface_card_profile_get_name(pa_dbusiface_card_profile *p) {
-    pa_assert(p);
-
-    return p->profile->name;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card-profile.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card-profile.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-card-profile.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-card-profile.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-#ifndef foodbusifacecardprofilehfoo
-#define foodbusifacecardprofilehfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.CardProfile.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the CardProfile interface
- * documentation.
- */
-
-#include <pulsecore/core-scache.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-card.h"
-
-#define PA_DBUSIFACE_CARD_PROFILE_INTERFACE PA_DBUS_CORE_INTERFACE ".CardProfile"
-
-typedef struct pa_dbusiface_card_profile pa_dbusiface_card_profile;
-
-pa_dbusiface_card_profile *pa_dbusiface_card_profile_new(
-        pa_dbusiface_card *card,
-        pa_core *core,
-        pa_card_profile *profile,
-        uint32_t idx);
-void pa_dbusiface_card_profile_free(pa_dbusiface_card_profile *p);
-
-const char *pa_dbusiface_card_profile_get_path(pa_dbusiface_card_profile *p);
-const char *pa_dbusiface_card_profile_get_name(pa_dbusiface_card_profile *p);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-client.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-client.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-client.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-client.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,461 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-  Copyright 2009 Vincent Filali-Ansary <filali.v@azurdigitalnetworks.net>
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-client.h"
-
-#define OBJECT_NAME "client"
-
-struct pa_dbusiface_client {
-    pa_dbusiface_core *core;
-
-    pa_client *client;
-    char *path;
-    pa_proplist *proplist;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_subscription *subscription;
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_playback_streams(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_record_streams(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_kill(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_update_properties(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_remove_properties(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_DRIVER,
-    PROPERTY_HANDLER_OWNER_MODULE,
-    PROPERTY_HANDLER_PLAYBACK_STREAMS,
-    PROPERTY_HANDLER_RECORD_STREAMS,
-    PROPERTY_HANDLER_PROPERTY_LIST,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]            = { .property_name = "Index",           .type = "u",      .get_cb = handle_get_index,            .set_cb = NULL },
-    [PROPERTY_HANDLER_DRIVER]           = { .property_name = "Driver",          .type = "s",      .get_cb = handle_get_driver,           .set_cb = NULL },
-    [PROPERTY_HANDLER_OWNER_MODULE]     = { .property_name = "OwnerModule",     .type = "o",      .get_cb = handle_get_owner_module,     .set_cb = NULL },
-    [PROPERTY_HANDLER_PLAYBACK_STREAMS] = { .property_name = "PlaybackStreams", .type = "ao",     .get_cb = handle_get_playback_streams, .set_cb = NULL },
-    [PROPERTY_HANDLER_RECORD_STREAMS]   = { .property_name = "RecordStreams",   .type = "ao",     .get_cb = handle_get_record_streams,   .set_cb = NULL },
-    [PROPERTY_HANDLER_PROPERTY_LIST]    = { .property_name = "PropertyList",    .type = "a{say}", .get_cb = handle_get_property_list,    .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_KILL,
-    METHOD_HANDLER_UPDATE_PROPERTIES,
-    METHOD_HANDLER_REMOVE_PROPERTIES,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info update_properties_args[] = { { "property_list", "a{say}", "in" }, { "update_mode", "u", "in" } };
-static pa_dbus_arg_info remove_properties_args[] = { { "keys", "as", "in" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_KILL] = {
-        .method_name = "Kill",
-        .arguments = NULL,
-        .n_arguments = 0,
-        .receive_cb = handle_kill },
-    [METHOD_HANDLER_UPDATE_PROPERTIES] = {
-        .method_name = "UpdateProperties",
-        .arguments = update_properties_args,
-        .n_arguments = sizeof(update_properties_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_update_properties },
-    [METHOD_HANDLER_REMOVE_PROPERTIES] = {
-        .method_name = "RemoveProperties",
-        .arguments = remove_properties_args,
-        .n_arguments = sizeof(remove_properties_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_remove_properties }
-};
-
-enum signal_index {
-    SIGNAL_PROPERTY_LIST_UPDATED,
-    SIGNAL_CLIENT_EVENT,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info property_list_updated_args[] = { { "property_list", "a{say}", NULL } };
-static pa_dbus_arg_info client_event_args[]          = { { "name",          "s",      NULL },
-                                                         { "property_list", "a{say}", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 },
-    /* ClientEvent is sent from module-dbus-protocol.c. */
-    [SIGNAL_CLIENT_EVENT]          = { .name = "ClientEvent",         .arguments = client_event_args,          .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info client_interface_info = {
-    .name = PA_DBUSIFACE_CLIENT_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    dbus_uint32_t idx = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    idx = c->client->index;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
-}
-
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &c->client->driver);
-}
-
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    const char *owner_module = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (!c->client->module) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Client %d doesn't have an owner module.", c->client->index);
-        return;
-    }
-
-    owner_module = pa_dbusiface_core_get_module_path(c->core, c->client->module);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &owner_module);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_playback_streams(pa_dbusiface_client *c, unsigned *n) {
-    const char **playback_streams = NULL;
-    unsigned i = 0;
-    uint32_t idx = 0;
-    pa_sink_input *sink_input = NULL;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_idxset_size(c->client->sink_inputs);
-
-    if (*n == 0)
-        return NULL;
-
-    playback_streams = pa_xnew(const char *, *n);
-
-    PA_IDXSET_FOREACH(sink_input, c->client->sink_inputs, idx)
-        playback_streams[i++] = pa_dbusiface_core_get_playback_stream_path(c->core, sink_input);
-
-    return playback_streams;
-}
-
-static void handle_get_playback_streams(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    const char **playback_streams = NULL;
-    unsigned n_playback_streams = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    playback_streams = get_playback_streams(c, &n_playback_streams);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, playback_streams, n_playback_streams);
-
-    pa_xfree(playback_streams);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_record_streams(pa_dbusiface_client *c, unsigned *n) {
-    const char **record_streams = NULL;
-    unsigned i = 0;
-    uint32_t idx = 0;
-    pa_source_output *source_output = NULL;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_idxset_size(c->client->source_outputs);
-
-    if (*n == 0)
-        return NULL;
-
-    record_streams = pa_xnew(const char *, *n);
-
-    PA_IDXSET_FOREACH(source_output, c->client->source_outputs, idx)
-        record_streams[i++] = pa_dbusiface_core_get_record_stream_path(c->core, source_output);
-
-    return record_streams;
-}
-
-static void handle_get_record_streams(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    const char **record_streams = NULL;
-    unsigned n_record_streams = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    record_streams = get_record_streams(c, &n_record_streams);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, record_streams, n_record_streams);
-
-    pa_xfree(record_streams);
-}
-
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_dbus_send_proplist_variant_reply(conn, msg, c->client->proplist);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t idx = 0;
-    const char *owner_module = NULL;
-    const char **playback_streams = NULL;
-    unsigned n_playback_streams = 0;
-    const char **record_streams = NULL;
-    unsigned n_record_streams = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    idx = c->client->index;
-    if (c->client->module)
-        owner_module = pa_dbusiface_core_get_module_path(c->core, c->client->module);
-    playback_streams = get_playback_streams(c, &n_playback_streams);
-    record_streams = get_record_streams(c, &n_record_streams);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &idx);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DRIVER].property_name, DBUS_TYPE_STRING, &c->client->driver);
-
-    if (owner_module)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_OWNER_MODULE].property_name, DBUS_TYPE_OBJECT_PATH, &owner_module);
-
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PLAYBACK_STREAMS].property_name, DBUS_TYPE_OBJECT_PATH, playback_streams, n_playback_streams);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_RECORD_STREAMS].property_name, DBUS_TYPE_OBJECT_PATH, record_streams, n_record_streams);
-    pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, c->client->proplist);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(playback_streams);
-    pa_xfree(record_streams);
-}
-
-static void handle_kill(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    dbus_connection_ref(conn);
-
-    pa_client_kill(c->client);
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    dbus_connection_unref(conn);
-}
-
-static void handle_update_properties(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    DBusMessageIter msg_iter;
-    pa_proplist *property_list = NULL;
-    dbus_uint32_t update_mode = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (pa_dbus_protocol_get_client(c->dbus_protocol, conn) != c->client) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_ACCESS_DENIED, "Client tried to modify the property list of another client.");
-        return;
-    }
-
-    pa_assert_se(dbus_message_iter_init(msg, &msg_iter));
-
-    if (!(property_list = pa_dbus_get_proplist_arg(conn, msg, &msg_iter)))
-        return;
-
-    dbus_message_iter_get_basic(&msg_iter, &update_mode);
-
-    if (!(update_mode == PA_UPDATE_SET || update_mode == PA_UPDATE_MERGE || update_mode == PA_UPDATE_REPLACE)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid update mode: %u", update_mode);
-        goto finish;
-    }
-
-    pa_client_update_proplist(c->client, update_mode, property_list);
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-finish:
-    if (property_list)
-        pa_proplist_free(property_list);
-}
-
-static void handle_remove_properties(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    char **keys = NULL;
-    int n_keys = 0;
-    pa_bool_t changed = FALSE;
-    int i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (pa_dbus_protocol_get_client(c->dbus_protocol, conn) != c->client) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_ACCESS_DENIED, "Client tried to modify the property list of another client.");
-        return;
-    }
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &keys, &n_keys, DBUS_TYPE_INVALID));
-
-    for (i = 0; i < n_keys; ++i)
-        changed |= pa_proplist_unset(c->client->proplist, keys[i]) >= 0;
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    if (changed)
-        pa_subscription_post(c->client->core, PA_SUBSCRIPTION_EVENT_CLIENT|PA_SUBSCRIPTION_EVENT_CHANGE, c->client->index);
-
-    dbus_free_string_array(keys);
-}
-
-static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_client *c = userdata;
-    DBusMessage *signal_msg = NULL;
-
-    pa_assert(core);
-    pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_CLIENT);
-    pa_assert(c);
-
-    /* We can't use idx != c->client->index, because the c->client pointer may
-     * be stale at this point. */
-    if (pa_idxset_get_by_index(core->clients, idx) != c->client)
-        return;
-
-    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
-        return;
-
-    if (!pa_proplist_equal(c->proplist, c->client->proplist)) {
-        DBusMessageIter msg_iter;
-
-        pa_proplist_update(c->proplist, PA_UPDATE_SET, c->client->proplist);
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
-							  PA_DBUSIFACE_CLIENT_INTERFACE,
-							  signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
-        dbus_message_iter_init_append(signal_msg, &msg_iter);
-        pa_dbus_append_proplist(&msg_iter, c->proplist);
-
-        pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-}
-
-pa_dbusiface_client *pa_dbusiface_client_new(pa_dbusiface_core *core, pa_client *client) {
-    pa_dbusiface_client *c = NULL;
-
-    pa_assert(core);
-    pa_assert(client);
-
-    c = pa_xnew(pa_dbusiface_client, 1);
-    c->core = core;
-    c->client = client;
-    c->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, client->index);
-    c->proplist = pa_proplist_copy(client->proplist);
-    c->dbus_protocol = pa_dbus_protocol_get(client->core);
-    c->subscription = pa_subscription_new(client->core, PA_SUBSCRIPTION_MASK_CLIENT, subscription_cb, c);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(c->dbus_protocol, c->path, &client_interface_info, c) >= 0);
-
-    return c;
-}
-
-void pa_dbusiface_client_free(pa_dbusiface_client *c) {
-    pa_assert(c);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(c->dbus_protocol, c->path, client_interface_info.name) >= 0);
-
-    pa_proplist_free(c->proplist);
-    pa_dbus_protocol_unref(c->dbus_protocol);
-    pa_subscription_free(c->subscription);
-
-    pa_xfree(c->path);
-    pa_xfree(c);
-}
-
-const char *pa_dbusiface_client_get_path(pa_dbusiface_client *c) {
-    pa_assert(c);
-
-    return c->path;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-client.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-client.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-client.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-client.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#ifndef foodbusifaceclienthfoo
-#define foodbusifaceclienthfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.Client.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Client interface
- * documentation.
- */
-
-#include <pulsecore/client.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_CLIENT_INTERFACE PA_DBUS_CORE_INTERFACE ".Client"
-
-typedef struct pa_dbusiface_client pa_dbusiface_client;
-
-pa_dbusiface_client *pa_dbusiface_client_new(pa_dbusiface_core *core, pa_client *client);
-void pa_dbusiface_client_free(pa_dbusiface_client *c);
-
-const char *pa_dbusiface_client_get_path(pa_dbusiface_client *c);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-core.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-core.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-core.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-core.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,2197 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <ctype.h>
-
-#include <dbus/dbus.h>
-
-#include <pulse/utf8.h>
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/namereg.h>
-#include <pulsecore/protocol-dbus.h>
-#include <pulsecore/socket-util.h>
-#include <pulsecore/strbuf.h>
-
-#include "iface-card.h"
-#include "iface-client.h"
-#include "iface-device.h"
-#include "iface-memstats.h"
-#include "iface-module.h"
-#include "iface-sample.h"
-#include "iface-stream.h"
-
-#include "iface-core.h"
-
-#define INTERFACE_REVISION 0
-
-static void handle_get_interface_revision(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_version(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_is_local(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_username(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_hostname(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_default_channels(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_default_channels(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_default_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_default_sample_format(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_default_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_default_sample_rate(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_cards(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_fallback_sink(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_fallback_sink(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_fallback_source(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_fallback_source(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_playback_streams(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_record_streams(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_samples(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_modules(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_clients(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_my_client(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_extensions(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_card_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sink_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_source_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_upload_sample(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_load_module(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_exit(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_listen_for_signal(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_stop_listening_for_signal(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-struct pa_dbusiface_core {
-    pa_core *core;
-    pa_subscription *subscription;
-
-    pa_dbus_protocol *dbus_protocol;
-
-    pa_hashmap *cards;
-    pa_hashmap *sinks_by_index;
-    pa_hashmap *sinks_by_path;
-    pa_hashmap *sources_by_index;
-    pa_hashmap *sources_by_path;
-    pa_hashmap *playback_streams;
-    pa_hashmap *record_streams;
-    pa_hashmap *samples;
-    pa_hashmap *modules;
-    pa_hashmap *clients;
-
-    pa_sink *fallback_sink;
-    pa_source *fallback_source;
-
-    pa_hook_slot *extension_registered_slot;
-    pa_hook_slot *extension_unregistered_slot;
-
-    pa_dbusiface_memstats *memstats;
-};
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INTERFACE_REVISION,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_VERSION,
-    PROPERTY_HANDLER_IS_LOCAL,
-    PROPERTY_HANDLER_USERNAME,
-    PROPERTY_HANDLER_HOSTNAME,
-    PROPERTY_HANDLER_DEFAULT_CHANNELS,
-    PROPERTY_HANDLER_DEFAULT_SAMPLE_FORMAT,
-    PROPERTY_HANDLER_DEFAULT_SAMPLE_RATE,
-    PROPERTY_HANDLER_CARDS,
-    PROPERTY_HANDLER_SINKS,
-    PROPERTY_HANDLER_FALLBACK_SINK,
-    PROPERTY_HANDLER_SOURCES,
-    PROPERTY_HANDLER_FALLBACK_SOURCE,
-    PROPERTY_HANDLER_PLAYBACK_STREAMS,
-    PROPERTY_HANDLER_RECORD_STREAMS,
-    PROPERTY_HANDLER_SAMPLES,
-    PROPERTY_HANDLER_MODULES,
-    PROPERTY_HANDLER_CLIENTS,
-    PROPERTY_HANDLER_MY_CLIENT,
-    PROPERTY_HANDLER_EXTENSIONS,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INTERFACE_REVISION]    = { .property_name = "InterfaceRevision",   .type = "u",  .get_cb = handle_get_interface_revision,    .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]                  = { .property_name = "Name",                .type = "s",  .get_cb = handle_get_name,                  .set_cb = NULL },
-    [PROPERTY_HANDLER_VERSION]               = { .property_name = "Version",             .type = "s",  .get_cb = handle_get_version,               .set_cb = NULL },
-    [PROPERTY_HANDLER_IS_LOCAL]              = { .property_name = "IsLocal",             .type = "b",  .get_cb = handle_get_is_local,              .set_cb = NULL },
-    [PROPERTY_HANDLER_USERNAME]              = { .property_name = "Username",            .type = "s",  .get_cb = handle_get_username,              .set_cb = NULL },
-    [PROPERTY_HANDLER_HOSTNAME]              = { .property_name = "Hostname",            .type = "s",  .get_cb = handle_get_hostname,              .set_cb = NULL },
-    [PROPERTY_HANDLER_DEFAULT_CHANNELS]      = { .property_name = "DefaultChannels",     .type = "au", .get_cb = handle_get_default_channels,      .set_cb = handle_set_default_channels },
-    [PROPERTY_HANDLER_DEFAULT_SAMPLE_FORMAT] = { .property_name = "DefaultSampleFormat", .type = "u",  .get_cb = handle_get_default_sample_format, .set_cb = handle_set_default_sample_format },
-    [PROPERTY_HANDLER_DEFAULT_SAMPLE_RATE]   = { .property_name = "DefaultSampleRate",   .type = "u",  .get_cb = handle_get_default_sample_rate,   .set_cb = handle_set_default_sample_rate },
-    [PROPERTY_HANDLER_CARDS]                 = { .property_name = "Cards",               .type = "ao", .get_cb = handle_get_cards,                 .set_cb = NULL },
-    [PROPERTY_HANDLER_SINKS]                 = { .property_name = "Sinks",               .type = "ao", .get_cb = handle_get_sinks,                 .set_cb = NULL },
-    [PROPERTY_HANDLER_FALLBACK_SINK]         = { .property_name = "FallbackSink",        .type = "o",  .get_cb = handle_get_fallback_sink,         .set_cb = handle_set_fallback_sink },
-    [PROPERTY_HANDLER_SOURCES]               = { .property_name = "Sources",             .type = "ao", .get_cb = handle_get_sources,               .set_cb = NULL },
-    [PROPERTY_HANDLER_FALLBACK_SOURCE]       = { .property_name = "FallbackSource",      .type = "o",  .get_cb = handle_get_fallback_source,       .set_cb = handle_set_fallback_source },
-    [PROPERTY_HANDLER_PLAYBACK_STREAMS]      = { .property_name = "PlaybackStreams",     .type = "ao", .get_cb = handle_get_playback_streams,      .set_cb = NULL },
-    [PROPERTY_HANDLER_RECORD_STREAMS]        = { .property_name = "RecordStreams",       .type = "ao", .get_cb = handle_get_record_streams,        .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLES]               = { .property_name = "Samples",             .type = "ao", .get_cb = handle_get_samples,               .set_cb = NULL },
-    [PROPERTY_HANDLER_MODULES]               = { .property_name = "Modules",             .type = "ao", .get_cb = handle_get_modules,               .set_cb = NULL },
-    [PROPERTY_HANDLER_CLIENTS]               = { .property_name = "Clients",             .type = "ao", .get_cb = handle_get_clients,               .set_cb = NULL },
-    [PROPERTY_HANDLER_MY_CLIENT]             = { .property_name = "MyClient",            .type = "o",  .get_cb = handle_get_my_client,             .set_cb = NULL },
-    [PROPERTY_HANDLER_EXTENSIONS]            = { .property_name = "Extensions",          .type = "as", .get_cb = handle_get_extensions,            .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_GET_CARD_BY_NAME,
-    METHOD_HANDLER_GET_SINK_BY_NAME,
-    METHOD_HANDLER_GET_SOURCE_BY_NAME,
-    METHOD_HANDLER_GET_SAMPLE_BY_NAME,
-    METHOD_HANDLER_UPLOAD_SAMPLE,
-    METHOD_HANDLER_LOAD_MODULE,
-    METHOD_HANDLER_EXIT,
-    METHOD_HANDLER_LISTEN_FOR_SIGNAL,
-    METHOD_HANDLER_STOP_LISTENING_FOR_SIGNAL,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info get_card_by_name_args[] = { { "name", "s", "in" }, { "card", "o", "out" } };
-static pa_dbus_arg_info get_sink_by_name_args[] = { { "name", "s", "in" }, { "sink", "o", "out" } };
-static pa_dbus_arg_info get_source_by_name_args[] = { { "name", "s", "in" }, { "source", "o", "out" } };
-static pa_dbus_arg_info get_sample_by_name_args[] = { { "name", "s", "in" }, { "sample", "o", "out" } };
-static pa_dbus_arg_info upload_sample_args[] = { { "name",           "s",      "in" },
-                                                 { "sample_format",  "u",      "in" },
-                                                 { "sample_rate",    "u",      "in" },
-                                                 { "channels",       "au",     "in" },
-                                                 { "default_volume", "au",     "in" },
-                                                 { "property_list",  "a{say}", "in" },
-                                                 { "data",           "ay",     "in" },
-                                                 { "sample",         "o",      "out" } };
-static pa_dbus_arg_info load_module_args[] = { { "name", "s", "in" }, { "arguments", "a{ss}", "in" }, { "module", "o", "out" } };
-static pa_dbus_arg_info listen_for_signal_args[] = { { "signal", "s", "in" }, { "objects", "ao", "in" } };
-static pa_dbus_arg_info stop_listening_for_signal_args[] = { { "signal", "s", "in" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_GET_CARD_BY_NAME] = {
-        .method_name = "GetCardByName",
-        .arguments = get_card_by_name_args,
-        .n_arguments = sizeof(get_card_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_card_by_name },
-    [METHOD_HANDLER_GET_SINK_BY_NAME] = {
-        .method_name = "GetSinkByName",
-        .arguments = get_sink_by_name_args,
-        .n_arguments = sizeof(get_sink_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_sink_by_name },
-    [METHOD_HANDLER_GET_SOURCE_BY_NAME] = {
-        .method_name = "GetSourceByName",
-        .arguments = get_source_by_name_args,
-        .n_arguments = sizeof(get_source_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_source_by_name },
-    [METHOD_HANDLER_GET_SAMPLE_BY_NAME] = {
-        .method_name = "GetSampleByName",
-        .arguments = get_sample_by_name_args,
-        .n_arguments = sizeof(get_sample_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_sample_by_name },
-    [METHOD_HANDLER_UPLOAD_SAMPLE] = {
-        .method_name = "UploadSample",
-        .arguments = upload_sample_args,
-        .n_arguments = sizeof(upload_sample_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_upload_sample },
-    [METHOD_HANDLER_LOAD_MODULE] = {
-        .method_name = "LoadModule",
-        .arguments = load_module_args,
-        .n_arguments = sizeof(load_module_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_load_module },
-    [METHOD_HANDLER_EXIT] = {
-        .method_name = "Exit",
-        .arguments = NULL,
-        .n_arguments = 0,
-        .receive_cb = handle_exit },
-    [METHOD_HANDLER_LISTEN_FOR_SIGNAL] = {
-        .method_name = "ListenForSignal",
-        .arguments = listen_for_signal_args,
-        .n_arguments = sizeof(listen_for_signal_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_listen_for_signal },
-    [METHOD_HANDLER_STOP_LISTENING_FOR_SIGNAL] = {
-        .method_name = "StopListeningForSignal",
-        .arguments = stop_listening_for_signal_args,
-        .n_arguments = sizeof(stop_listening_for_signal_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_stop_listening_for_signal }
-};
-
-enum signal_index {
-    SIGNAL_NEW_CARD,
-    SIGNAL_CARD_REMOVED,
-    SIGNAL_NEW_SINK,
-    SIGNAL_SINK_REMOVED,
-    SIGNAL_FALLBACK_SINK_UPDATED,
-    SIGNAL_FALLBACK_SINK_UNSET,
-    SIGNAL_NEW_SOURCE,
-    SIGNAL_SOURCE_REMOVED,
-    SIGNAL_FALLBACK_SOURCE_UPDATED,
-    SIGNAL_FALLBACK_SOURCE_UNSET,
-    SIGNAL_NEW_PLAYBACK_STREAM,
-    SIGNAL_PLAYBACK_STREAM_REMOVED,
-    SIGNAL_NEW_RECORD_STREAM,
-    SIGNAL_RECORD_STREAM_REMOVED,
-    SIGNAL_NEW_SAMPLE,
-    SIGNAL_SAMPLE_REMOVED,
-    SIGNAL_NEW_MODULE,
-    SIGNAL_MODULE_REMOVED,
-    SIGNAL_NEW_CLIENT,
-    SIGNAL_CLIENT_REMOVED,
-    SIGNAL_NEW_EXTENSION,
-    SIGNAL_EXTENSION_REMOVED,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info new_card_args[] =                { { "card",            "o", NULL } };
-static pa_dbus_arg_info card_removed_args[] =            { { "card",            "o", NULL } };
-static pa_dbus_arg_info new_sink_args[] =                { { "sink",            "o", NULL } };
-static pa_dbus_arg_info sink_removed_args[] =            { { "sink",            "o", NULL } };
-static pa_dbus_arg_info fallback_sink_updated_args[] =   { { "sink",            "o", NULL } };
-static pa_dbus_arg_info new_source_args[] =              { { "source",          "o", NULL } };
-static pa_dbus_arg_info source_removed_args[] =          { { "source",          "o", NULL } };
-static pa_dbus_arg_info fallback_source_updated_args[] = { { "source",          "o", NULL } };
-static pa_dbus_arg_info new_playback_stream_args[] =     { { "playback_stream", "o", NULL } };
-static pa_dbus_arg_info playback_stream_removed_args[] = { { "playback_stream", "o", NULL } };
-static pa_dbus_arg_info new_record_stream_args[] =       { { "record_stream",   "o", NULL } };
-static pa_dbus_arg_info record_stream_removed_args[] =   { { "record_stream",   "o", NULL } };
-static pa_dbus_arg_info new_sample_args[] =              { { "sample",          "o", NULL } };
-static pa_dbus_arg_info sample_removed_args[] =          { { "sample",          "o", NULL } };
-static pa_dbus_arg_info new_module_args[] =              { { "module",          "o", NULL } };
-static pa_dbus_arg_info module_removed_args[] =          { { "module",          "o", NULL } };
-static pa_dbus_arg_info new_client_args[] =              { { "client",          "o", NULL } };
-static pa_dbus_arg_info client_removed_args[] =          { { "client",          "o", NULL } };
-static pa_dbus_arg_info new_extension_args[] =           { { "extension",       "s", NULL } };
-static pa_dbus_arg_info extension_removed_args[] =       { { "extension",       "s", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_NEW_CARD]                = { .name = "NewCard",               .arguments = new_card_args,                .n_arguments = 1 },
-    [SIGNAL_CARD_REMOVED]            = { .name = "CardRemoved",           .arguments = card_removed_args,            .n_arguments = 1 },
-    [SIGNAL_NEW_SINK]                = { .name = "NewSink",               .arguments = new_sink_args,                .n_arguments = 1 },
-    [SIGNAL_SINK_REMOVED]            = { .name = "SinkRemoved",           .arguments = sink_removed_args,            .n_arguments = 1 },
-    [SIGNAL_FALLBACK_SINK_UPDATED]   = { .name = "FallbackSinkUpdated",   .arguments = fallback_sink_updated_args,   .n_arguments = 1 },
-    [SIGNAL_FALLBACK_SINK_UNSET]     = { .name = "FallbackSinkUnset",     .arguments = NULL,                         .n_arguments = 0 },
-    [SIGNAL_NEW_SOURCE]              = { .name = "NewSource",             .arguments = new_source_args,              .n_arguments = 1 },
-    [SIGNAL_SOURCE_REMOVED]          = { .name = "SourceRemoved",         .arguments = source_removed_args,          .n_arguments = 1 },
-    [SIGNAL_FALLBACK_SOURCE_UPDATED] = { .name = "FallbackSourceUpdated", .arguments = fallback_source_updated_args, .n_arguments = 1 },
-    [SIGNAL_FALLBACK_SOURCE_UNSET]   = { .name = "FallbackSourceUnset",   .arguments = NULL,                         .n_arguments = 0 },
-    [SIGNAL_NEW_PLAYBACK_STREAM]     = { .name = "NewPlaybackStream",     .arguments = new_playback_stream_args,     .n_arguments = 1 },
-    [SIGNAL_PLAYBACK_STREAM_REMOVED] = { .name = "PlaybackStreamRemoved", .arguments = playback_stream_removed_args, .n_arguments = 1 },
-    [SIGNAL_NEW_RECORD_STREAM]       = { .name = "NewRecordStream",       .arguments = new_record_stream_args,       .n_arguments = 1 },
-    [SIGNAL_RECORD_STREAM_REMOVED]   = { .name = "RecordStreamRemoved",   .arguments = record_stream_removed_args,   .n_arguments = 1 },
-    [SIGNAL_NEW_SAMPLE]              = { .name = "NewSample",             .arguments = new_sample_args,              .n_arguments = 1 },
-    [SIGNAL_SAMPLE_REMOVED]          = { .name = "SampleRemoved",         .arguments = sample_removed_args,          .n_arguments = 1 },
-    [SIGNAL_NEW_MODULE]              = { .name = "NewModule",             .arguments = new_module_args,              .n_arguments = 1 },
-    [SIGNAL_MODULE_REMOVED]          = { .name = "ModuleRemoved",         .arguments = module_removed_args,          .n_arguments = 1 },
-    [SIGNAL_NEW_CLIENT]              = { .name = "NewClient",             .arguments = new_client_args,              .n_arguments = 1 },
-    [SIGNAL_CLIENT_REMOVED]          = { .name = "ClientRemoved",         .arguments = client_removed_args,          .n_arguments = 1 },
-    [SIGNAL_NEW_EXTENSION]           = { .name = "NewExtension",          .arguments = new_extension_args,           .n_arguments = 1 },
-    [SIGNAL_EXTENSION_REMOVED]       = { .name = "ExtensionRemoved",      .arguments = extension_removed_args,       .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info core_interface_info = {
-    .name = PA_DBUS_CORE_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static void handle_get_interface_revision(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    dbus_uint32_t interface_revision = INTERFACE_REVISION;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &interface_revision);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    const char *server_name = PACKAGE_NAME;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &server_name);
-}
-
-static void handle_get_version(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    const char *version = PACKAGE_VERSION;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &version);
-}
-
-static dbus_bool_t get_is_local(DBusConnection *conn) {
-    int conn_fd;
-
-    pa_assert(conn);
-
-    if (!dbus_connection_get_socket(conn, &conn_fd))
-        return FALSE;
-
-    return pa_socket_is_local(conn_fd);
-}
-
-static void handle_get_is_local(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    dbus_bool_t is_local;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    is_local = get_is_local(conn);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &is_local);
-}
-
-static void handle_get_username(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    char *username = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    username = pa_get_user_name_malloc();
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &username);
-
-    pa_xfree(username);
-}
-
-static void handle_get_hostname(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    char *hostname = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    hostname = pa_get_host_name_malloc();
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &hostname);
-
-    pa_xfree(hostname);
-}
-
-/* Caller frees the returned array. */
-static dbus_uint32_t *get_default_channels(pa_dbusiface_core *c, unsigned *n) {
-    dbus_uint32_t *default_channels = NULL;
-    unsigned i;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = c->core->default_channel_map.channels;
-    default_channels = pa_xnew(dbus_uint32_t, *n);
-
-    for (i = 0; i < *n; ++i)
-        default_channels[i] = c->core->default_channel_map.map[i];
-
-    return default_channels;
-}
-
-static void handle_get_default_channels(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    dbus_uint32_t *default_channels = NULL;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    default_channels = get_default_channels(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, default_channels, n);
-
-    pa_xfree(default_channels);
-}
-
-static void handle_set_default_channels(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    DBusMessageIter array_iter;
-    pa_channel_map new_channel_map;
-    const dbus_uint32_t *default_channels;
-    int n_channels;
-    unsigned i;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(c);
-
-    pa_channel_map_init(&new_channel_map);
-
-    dbus_message_iter_recurse(iter, &array_iter);
-    dbus_message_iter_get_fixed_array(&array_iter, &default_channels, &n_channels);
-
-    if (n_channels <= 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Empty channel array.");
-        return;
-    }
-
-    if (n_channels > (int) PA_CHANNELS_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "Too many channels: %i. The maximum number of channels is %u.", n_channels, PA_CHANNELS_MAX);
-        return;
-    }
-
-    new_channel_map.channels = n_channels;
-
-    for (i = 0; i < new_channel_map.channels; ++i) {
-        if (default_channels[i] >= PA_CHANNEL_POSITION_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid channel position: %u.", default_channels[i]);
-            return;
-        }
-
-        new_channel_map.map[i] = default_channels[i];
-    }
-
-    c->core->default_channel_map = new_channel_map;
-    c->core->default_sample_spec.channels = n_channels;
-
-    pa_dbus_send_empty_reply(conn, msg);
-};
-
-static void handle_get_default_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    dbus_uint32_t default_sample_format;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    default_sample_format = c->core->default_sample_spec.format;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &default_sample_format);
-}
-
-static void handle_set_default_sample_format(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    dbus_uint32_t default_sample_format;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(c);
-
-    dbus_message_iter_get_basic(iter, &default_sample_format);
-
-    if (default_sample_format >= PA_SAMPLE_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample format.");
-        return;
-    }
-
-    c->core->default_sample_spec.format = default_sample_format;
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_default_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    dbus_uint32_t default_sample_rate;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    default_sample_rate = c->core->default_sample_spec.rate;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &default_sample_rate);
-}
-
-static void handle_set_default_sample_rate(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    dbus_uint32_t default_sample_rate;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(c);
-
-    dbus_message_iter_get_basic(iter, &default_sample_rate);
-
-    if (default_sample_rate <= 0 || default_sample_rate > PA_RATE_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample rate.");
-        return;
-    }
-
-    c->core->default_sample_spec.rate = default_sample_rate;
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_cards(pa_dbusiface_core *c, unsigned *n) {
-    const char **cards;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_card *card;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->cards);
-
-    if (*n == 0)
-        return NULL;
-
-    cards = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(card, c->cards, state)
-        cards[i++] = pa_dbusiface_card_get_path(card);
-
-    return cards;
-}
-
-static void handle_get_cards(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **cards;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    cards = get_cards(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, cards, n);
-
-    pa_xfree(cards);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_sinks(pa_dbusiface_core *c, unsigned *n) {
-    const char **sinks;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_device *sink;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->sinks_by_index);
-
-    if (*n == 0)
-        return NULL;
-
-    sinks = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(sink, c->sinks_by_index, state)
-        sinks[i++] = pa_dbusiface_device_get_path(sink);
-
-    return sinks;
-}
-
-static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **sinks;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    sinks = get_sinks(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, sinks, n);
-
-    pa_xfree(sinks);
-}
-
-static void handle_get_fallback_sink(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    pa_dbusiface_device *fallback_sink;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (!c->fallback_sink) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "There are no sinks, and therefore no fallback sink either.");
-        return;
-    }
-
-    pa_assert_se((fallback_sink = pa_hashmap_get(c->sinks_by_index, PA_UINT32_TO_PTR(c->fallback_sink->index))));
-    object_path = pa_dbusiface_device_get_path(fallback_sink);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_set_fallback_sink(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    pa_dbusiface_device *fallback_sink;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(c);
-
-    if (!c->fallback_sink) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "There are no sinks, and therefore no fallback sink either.");
-        return;
-    }
-
-    dbus_message_iter_get_basic(iter, &object_path);
-
-    if (!(fallback_sink = pa_hashmap_get(c->sinks_by_path, object_path))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such sink.", object_path);
-        return;
-    }
-
-    pa_namereg_set_default_sink(c->core, pa_dbusiface_device_get_sink(fallback_sink));
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_sources(pa_dbusiface_core *c, unsigned *n) {
-    const char **sources;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_device *source;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->sources_by_index);
-
-    if (*n == 0)
-        return NULL;
-
-    sources = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(source, c->sources_by_index, state)
-        sources[i++] = pa_dbusiface_device_get_path(source);
-
-    return sources;
-}
-
-static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **sources;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    sources = get_sources(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, sources, n);
-
-    pa_xfree(sources);
-}
-
-static void handle_get_fallback_source(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    pa_dbusiface_device *fallback_source;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (!c->fallback_source) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "There are no sources, and therefore no fallback source either.");
-        return;
-    }
-
-    pa_assert_se((fallback_source = pa_hashmap_get(c->sources_by_index, PA_UINT32_TO_PTR(c->fallback_source->index))));
-    object_path = pa_dbusiface_device_get_path(fallback_source);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_set_fallback_source(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    pa_dbusiface_device *fallback_source;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(c);
-
-    if (!c->fallback_source) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "There are no sources, and therefore no fallback source either.");
-        return;
-    }
-
-    dbus_message_iter_get_basic(iter, &object_path);
-
-    if (!(fallback_source = pa_hashmap_get(c->sources_by_path, object_path))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such source.", object_path);
-        return;
-    }
-
-    pa_namereg_set_default_source(c->core, pa_dbusiface_device_get_source(fallback_source));
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_playback_streams(pa_dbusiface_core *c, unsigned *n) {
-    const char **streams;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_stream *stream;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->playback_streams);
-
-    if (*n == 0)
-        return NULL;
-
-    streams = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(stream, c->playback_streams, state)
-        streams[i++] = pa_dbusiface_stream_get_path(stream);
-
-    return streams;
-}
-
-static void handle_get_playback_streams(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **playback_streams;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    playback_streams = get_playback_streams(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, playback_streams, n);
-
-    pa_xfree(playback_streams);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_record_streams(pa_dbusiface_core *c, unsigned *n) {
-    const char **streams;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_stream *stream;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->record_streams);
-
-    if (*n == 0)
-        return NULL;
-
-    streams = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(stream, c->record_streams, state)
-        streams[i++] = pa_dbusiface_stream_get_path(stream);
-
-    return streams;
-}
-
-static void handle_get_record_streams(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **record_streams;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    record_streams = get_record_streams(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, record_streams, n);
-
-    pa_xfree(record_streams);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_samples(pa_dbusiface_core *c, unsigned *n) {
-    const char **samples;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_sample *sample;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->samples);
-
-    if (*n == 0)
-        return NULL;
-
-    samples = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(sample, c->samples, state)
-        samples[i++] = pa_dbusiface_sample_get_path(sample);
-
-    return samples;
-}
-
-static void handle_get_samples(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **samples;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    samples = get_samples(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, samples, n);
-
-    pa_xfree(samples);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_modules(pa_dbusiface_core *c, unsigned *n) {
-    const char **modules;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_module *module;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->modules);
-
-    if (*n == 0)
-        return NULL;
-
-    modules = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(module, c->modules, state)
-        modules[i++] = pa_dbusiface_module_get_path(module);
-
-    return modules;
-}
-
-static void handle_get_modules(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **modules;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    modules = get_modules(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, modules, n);
-
-    pa_xfree(modules);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_clients(pa_dbusiface_core *c, unsigned *n) {
-    const char **clients;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_client *client;
-
-    pa_assert(c);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(c->clients);
-
-    if (*n == 0)
-        return NULL;
-
-    clients = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(client, c->clients, state)
-        clients[i++] = pa_dbusiface_client_get_path(client);
-
-    return clients;
-}
-
-static void handle_get_clients(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **clients;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    clients = get_clients(c, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, clients, n);
-
-    pa_xfree(clients);
-}
-
-static const char *get_my_client(pa_dbusiface_core *c, DBusConnection *conn) {
-    pa_client *my_client;
-
-    pa_assert(c);
-    pa_assert(conn);
-
-    pa_assert_se((my_client = pa_dbus_protocol_get_client(c->dbus_protocol, conn)));
-
-    return pa_dbusiface_client_get_path(pa_hashmap_get(c->clients, PA_UINT32_TO_PTR(my_client->index)));
-}
-
-static void handle_get_my_client(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char *my_client;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    my_client = get_my_client(c, conn);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &my_client);
-}
-
-static void handle_get_extensions(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char **extensions;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    extensions = pa_dbus_protocol_get_extensions(c->dbus_protocol, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_STRING, extensions, n);
-
-    pa_xfree(extensions);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t interface_revision;
-    const char *server_name;
-    const char *version;
-    dbus_bool_t is_local;
-    char *username;
-    char *hostname;
-    dbus_uint32_t *default_channels;
-    unsigned n_default_channels;
-    dbus_uint32_t default_sample_format;
-    dbus_uint32_t default_sample_rate;
-    const char **cards;
-    unsigned n_cards;
-    const char **sinks;
-    unsigned n_sinks;
-    const char *fallback_sink;
-    const char **sources;
-    unsigned n_sources;
-    const char *fallback_source;
-    const char **playback_streams;
-    unsigned n_playback_streams;
-    const char **record_streams;
-    unsigned n_record_streams;
-    const char **samples;
-    unsigned n_samples;
-    const char **modules;
-    unsigned n_modules;
-    const char **clients;
-    unsigned n_clients;
-    const char *my_client;
-    const char **extensions;
-    unsigned n_extensions;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    interface_revision = INTERFACE_REVISION;
-    server_name = PACKAGE_NAME;
-    version = PACKAGE_VERSION;
-    is_local = get_is_local(conn);
-    username = pa_get_user_name_malloc();
-    hostname = pa_get_host_name_malloc();
-    default_channels = get_default_channels(c, &n_default_channels);
-    default_sample_format = c->core->default_sample_spec.format;
-    default_sample_rate = c->core->default_sample_spec.rate;
-    cards = get_cards(c, &n_cards);
-    sinks = get_sinks(c, &n_sinks);
-    fallback_sink = c->fallback_sink
-                    ? pa_dbusiface_device_get_path(pa_hashmap_get(c->sinks_by_index, PA_UINT32_TO_PTR(c->fallback_sink->index)))
-                    : NULL;
-    sources = get_sources(c, &n_sources);
-    fallback_source = c->fallback_source
-                      ? pa_dbusiface_device_get_path(pa_hashmap_get(c->sources_by_index,
-                                                                    PA_UINT32_TO_PTR(c->fallback_source->index)))
-                      : NULL;
-    playback_streams = get_playback_streams(c, &n_playback_streams);
-    record_streams = get_record_streams(c, &n_record_streams);
-    samples = get_samples(c, &n_samples);
-    modules = get_modules(c, &n_modules);
-    clients = get_clients(c, &n_clients);
-    my_client = get_my_client(c, conn);
-    extensions = pa_dbus_protocol_get_extensions(c->dbus_protocol, &n_extensions);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INTERFACE_REVISION].property_name, DBUS_TYPE_UINT32, &interface_revision);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &server_name);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_VERSION].property_name, DBUS_TYPE_STRING, &version);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_IS_LOCAL].property_name, DBUS_TYPE_BOOLEAN, &is_local);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_USERNAME].property_name, DBUS_TYPE_STRING, &username);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_HOSTNAME].property_name, DBUS_TYPE_STRING, &hostname);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DEFAULT_CHANNELS].property_name, DBUS_TYPE_UINT32, default_channels, n_default_channels);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DEFAULT_SAMPLE_FORMAT].property_name, DBUS_TYPE_UINT32, &default_sample_format);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DEFAULT_SAMPLE_RATE].property_name, DBUS_TYPE_UINT32, &default_sample_rate);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CARDS].property_name, DBUS_TYPE_OBJECT_PATH, cards, n_cards);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SINKS].property_name, DBUS_TYPE_OBJECT_PATH, sinks, n_sinks);
-
-    if (fallback_sink)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_FALLBACK_SINK].property_name, DBUS_TYPE_OBJECT_PATH, &fallback_sink);
-
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SOURCES].property_name, DBUS_TYPE_OBJECT_PATH, sources, n_sources);
-
-    if (fallback_source)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_FALLBACK_SOURCE].property_name, DBUS_TYPE_OBJECT_PATH, &fallback_source);
-
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PLAYBACK_STREAMS].property_name, DBUS_TYPE_OBJECT_PATH, playback_streams, n_playback_streams);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_RECORD_STREAMS].property_name, DBUS_TYPE_OBJECT_PATH, record_streams, n_record_streams);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLES].property_name, DBUS_TYPE_OBJECT_PATH, samples, n_samples);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_MODULES].property_name, DBUS_TYPE_OBJECT_PATH, modules, n_modules);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CLIENTS].property_name, DBUS_TYPE_OBJECT_PATH, clients, n_clients);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_MY_CLIENT].property_name, DBUS_TYPE_OBJECT_PATH, &my_client);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_EXTENSIONS].property_name, DBUS_TYPE_STRING, extensions, n_extensions);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(username);
-    pa_xfree(hostname);
-    pa_xfree(default_channels);
-    pa_xfree(cards);
-    pa_xfree(sinks);
-    pa_xfree(sources);
-    pa_xfree(playback_streams);
-    pa_xfree(record_streams);
-    pa_xfree(samples);
-    pa_xfree(modules);
-    pa_xfree(clients);
-    pa_xfree(extensions);
-}
-
-static void handle_get_card_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    char *card_name;
-    pa_card *card;
-    pa_dbusiface_card *dbus_card;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &card_name, DBUS_TYPE_INVALID));
-
-    if (!(card = pa_namereg_get(c->core, card_name, PA_NAMEREG_CARD))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "No such card.");
-        return;
-    }
-
-    pa_assert_se((dbus_card = pa_hashmap_get(c->cards, PA_UINT32_TO_PTR(card->index))));
-
-    object_path = pa_dbusiface_card_get_path(dbus_card);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_sink_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    char *sink_name;
-    pa_sink *sink;
-    pa_dbusiface_device *dbus_sink;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &sink_name, DBUS_TYPE_INVALID));
-
-    if (!(sink = pa_namereg_get(c->core, sink_name, PA_NAMEREG_SINK))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such sink.", sink_name);
-        return;
-    }
-
-    pa_assert_se((dbus_sink = pa_hashmap_get(c->sinks_by_index, PA_UINT32_TO_PTR(sink->index))));
-
-    object_path = pa_dbusiface_device_get_path(dbus_sink);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_source_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    char *source_name;
-    pa_source *source;
-    pa_dbusiface_device *dbus_source;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &source_name, DBUS_TYPE_INVALID));
-
-    if (!(source = pa_namereg_get(c->core, source_name, PA_NAMEREG_SOURCE))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such source.", source_name);
-        return;
-    }
-
-    pa_assert_se((dbus_source = pa_hashmap_get(c->sources_by_index, PA_UINT32_TO_PTR(source->index))));
-
-    object_path = pa_dbusiface_device_get_path(dbus_source);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_sample_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    char *sample_name;
-    pa_scache_entry *sample;
-    pa_dbusiface_sample *dbus_sample;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &sample_name, DBUS_TYPE_INVALID));
-
-    if (!(sample = pa_namereg_get(c->core, sample_name, PA_NAMEREG_SAMPLE))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "No such sample.");
-        return;
-    }
-
-    pa_assert_se((dbus_sample = pa_hashmap_get(c->samples, PA_UINT32_TO_PTR(sample->index))));
-
-    object_path = pa_dbusiface_sample_get_path(dbus_sample);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_upload_sample(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    DBusMessageIter msg_iter;
-    DBusMessageIter array_iter;
-    const char *name;
-    dbus_uint32_t sample_format;
-    dbus_uint32_t sample_rate;
-    const dbus_uint32_t *channels;
-    int n_channels;
-    const dbus_uint32_t *default_volume;
-    int n_volume_entries;
-    pa_proplist *property_list;
-    const uint8_t *data;
-    int data_length;
-    int i;
-    pa_sample_spec ss;
-    pa_channel_map map;
-    pa_memchunk chunk;
-    uint32_t idx;
-    pa_dbusiface_sample *dbus_sample = NULL;
-    pa_scache_entry *sample = NULL;
-    const char *object_path;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    chunk.memblock = NULL;
-
-    pa_assert_se(dbus_message_iter_init(msg, &msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &name);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &sample_format);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &sample_rate);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_recurse(&msg_iter, &array_iter);
-    dbus_message_iter_get_fixed_array(&array_iter, &channels, &n_channels);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_recurse(&msg_iter, &array_iter);
-    dbus_message_iter_get_fixed_array(&array_iter, &default_volume, &n_volume_entries);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    if (!(property_list = pa_dbus_get_proplist_arg(conn, msg, &msg_iter)))
-        return;
-
-    dbus_message_iter_recurse(&msg_iter, &array_iter);
-    dbus_message_iter_get_fixed_array(&array_iter, &data, &data_length);
-
-    if (sample_format >= PA_SAMPLE_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample format.");
-        goto finish;
-    }
-
-    if (sample_rate <= 0 || sample_rate > PA_RATE_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample rate.");
-        goto finish;
-    }
-
-    if (n_channels <= 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Empty channel map.");
-        goto finish;
-    }
-
-    if (n_channels > (int) PA_CHANNELS_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "Too many channels: %i. The maximum is %u.", n_channels, PA_CHANNELS_MAX);
-        goto finish;
-    }
-
-    for (i = 0; i < n_channels; ++i) {
-        if (channels[i] >= PA_CHANNEL_POSITION_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid channel position.");
-            goto finish;
-        }
-    }
-
-    if (n_volume_entries != 0 && n_volume_entries != n_channels) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "The channels and default_volume arguments have different number of elements (%i and %i, resp).",
-                           n_channels, n_volume_entries);
-        goto finish;
-    }
-
-    for (i = 0; i < n_volume_entries; ++i) {
-        if (default_volume[i] > PA_VOLUME_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume: %u.", default_volume[i]);
-            goto finish;
-        }
-    }
-
-    if (data_length == 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Empty data.");
-        goto finish;
-    }
-
-    if (data_length > PA_SCACHE_ENTRY_SIZE_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "Too big sample: %i bytes. The maximum sample length is %u bytes.",
-                           data_length, PA_SCACHE_ENTRY_SIZE_MAX);
-        goto finish;
-    }
-
-    ss.format = sample_format;
-    ss.rate = sample_rate;
-    ss.channels = n_channels;
-
-    pa_assert(pa_sample_spec_valid(&ss));
-
-    if (!pa_frame_aligned(data_length, &ss)) {
-        char buf[PA_SAMPLE_SPEC_SNPRINT_MAX];
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "The sample length (%i bytes) doesn't align with the sample format and channels (%s).",
-                           data_length, pa_sample_spec_snprint(buf, sizeof(buf), &ss));
-        goto finish;
-    }
-
-    map.channels = n_channels;
-    for (i = 0; i < n_channels; ++i)
-        map.map[i] = channels[i];
-
-    chunk.memblock = pa_memblock_new(c->core->mempool, data_length);
-    chunk.index = 0;
-    chunk.length = data_length;
-
-    memcpy(pa_memblock_acquire(chunk.memblock), data, data_length);
-    pa_memblock_release(chunk.memblock);
-
-    if (pa_scache_add_item(c->core, name, &ss, &map, &chunk, property_list, &idx) < 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Adding the sample failed.");
-        goto finish;
-    }
-
-    sample = pa_idxset_get_by_index(c->core->scache, idx);
-
-    if (n_volume_entries > 0) {
-        sample->volume.channels = n_channels;
-        for (i = 0; i < n_volume_entries; ++i)
-            sample->volume.values[i] = default_volume[i];
-        sample->volume_is_set = TRUE;
-    } else {
-        sample->volume_is_set = FALSE;
-    }
-
-    dbus_sample = pa_dbusiface_sample_new(c, sample);
-    pa_hashmap_put(c->samples, PA_UINT32_TO_PTR(idx), dbus_sample);
-
-    object_path = pa_dbusiface_sample_get_path(dbus_sample);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-
-finish:
-    if (property_list)
-        pa_proplist_free(property_list);
-
-    if (chunk.memblock)
-        pa_memblock_unref(chunk.memblock);
-}
-
-static pa_bool_t contains_space(const char *string) {
-    const char *p;
-
-    pa_assert(string);
-
-    for (p = string; *p; ++p) {
-        if (isspace(*p))
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void handle_load_module(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    char *name = NULL;
-    const char *key = NULL;
-    const char *value = NULL;
-    char *escaped_value = NULL;
-    pa_strbuf *arg_buffer = NULL;
-    char *arg_string = NULL;
-    pa_module *module = NULL;
-    pa_dbusiface_module *dbus_module = NULL;
-    const char *object_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (c->core->disallow_module_loading) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_ACCESS_DENIED, "The server is configured to disallow module loading.");
-        return;
-    }
-
-    pa_assert_se(dbus_message_iter_init(msg, &msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &name);
-
-    arg_buffer = pa_strbuf_new();
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_recurse(&msg_iter, &dict_iter);
-
-    while (dbus_message_iter_get_arg_type(&dict_iter) != DBUS_TYPE_INVALID) {
-        if (!pa_strbuf_isempty(arg_buffer))
-            pa_strbuf_putc(arg_buffer, ' ');
-
-        dbus_message_iter_recurse(&dict_iter, &dict_entry_iter);
-
-        dbus_message_iter_get_basic(&dict_entry_iter, &key);
-
-        if (strlen(key) <= 0 || !pa_ascii_valid(key) || contains_space(key)) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid module argument name: %s", key);
-            goto finish;
-        }
-
-        pa_assert_se(dbus_message_iter_next(&dict_entry_iter));
-        dbus_message_iter_get_basic(&dict_entry_iter, &value);
-
-        escaped_value = pa_escape(value, "\"");
-        pa_strbuf_printf(arg_buffer, "%s=\"%s\"", key, escaped_value);
-        pa_xfree(escaped_value);
-
-        dbus_message_iter_next(&dict_iter);
-    }
-
-    arg_string = pa_strbuf_tostring(arg_buffer);
-
-    if (!(module = pa_module_load(c->core, name, arg_string))) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Failed to load module.");
-        goto finish;
-    }
-
-    dbus_module = pa_dbusiface_module_new(module);
-    pa_hashmap_put(c->modules, PA_UINT32_TO_PTR(module->index), dbus_module);
-
-    object_path = pa_dbusiface_module_get_path(dbus_module);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-
-finish:
-    if (arg_buffer)
-        pa_strbuf_free(arg_buffer);
-
-    pa_xfree(arg_string);
-}
-
-static void handle_exit(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    if (c->core->disallow_exit) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_ACCESS_DENIED, "The server is configured to disallow exiting.");
-        return;
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_core_exit(c->core, FALSE, 0);
-}
-
-static void handle_listen_for_signal(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char *signal_str;
-    char **objects = NULL;
-    int n_objects;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL,
-                                       DBUS_TYPE_STRING, &signal_str,
-                                       DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &objects, &n_objects,
-                                       DBUS_TYPE_INVALID));
-
-    pa_dbus_protocol_add_signal_listener(c->dbus_protocol, conn, *signal_str ? signal_str : NULL, objects, n_objects);
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    dbus_free_string_array(objects);
-}
-
-static void handle_stop_listening_for_signal(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    const char *signal_str;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &signal_str, DBUS_TYPE_INVALID));
-
-    pa_dbus_protocol_remove_signal_listener(c->dbus_protocol, conn, *signal_str ? signal_str : NULL);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_core *c = userdata;
-    pa_dbusiface_card *card_iface = NULL;
-    pa_dbusiface_device *device_iface = NULL;
-    pa_dbusiface_stream *stream_iface = NULL;
-    pa_dbusiface_sample *sample_iface = NULL;
-    pa_dbusiface_module *module_iface = NULL;
-    pa_dbusiface_client *client_iface = NULL;
-    DBusMessage *signal_msg = NULL;
-    const char *object_path = NULL;
-    pa_sink *new_fallback_sink = NULL;
-    pa_source *new_fallback_source = NULL;
-
-    pa_assert(c);
-
-    switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
-        case PA_SUBSCRIPTION_EVENT_SERVER:
-            new_fallback_sink = pa_namereg_get_default_sink(core);
-            new_fallback_source = pa_namereg_get_default_source(core);
-
-            if (c->fallback_sink != new_fallback_sink) {
-                if (c->fallback_sink)
-                    pa_sink_unref(c->fallback_sink);
-                c->fallback_sink = new_fallback_sink ? pa_sink_ref(new_fallback_sink) : NULL;
-
-                if (new_fallback_sink
-                    && (device_iface = pa_hashmap_get(c->sinks_by_index, PA_UINT32_TO_PTR(new_fallback_sink->index)))) {
-                    object_path = pa_dbusiface_device_get_path(device_iface);
-
-                    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								       PA_DBUS_CORE_INTERFACE,
-								       signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
-                    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-                    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                    dbus_message_unref(signal_msg);
-                    signal_msg = NULL;
-
-                } else if (!new_fallback_sink) {
-                    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								       PA_DBUS_CORE_INTERFACE,
-								       signals[SIGNAL_FALLBACK_SINK_UNSET].name)));
-                    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                    dbus_message_unref(signal_msg);
-                    signal_msg = NULL;
-                }
-            }
-
-            if (c->fallback_source != new_fallback_source) {
-                if (c->fallback_source)
-                    pa_source_unref(c->fallback_source);
-                c->fallback_source = new_fallback_source ? pa_source_ref(new_fallback_source) : NULL;
-
-                if (new_fallback_source
-                    && (device_iface = pa_hashmap_get(c->sources_by_index, PA_UINT32_TO_PTR(new_fallback_source->index)))) {
-                    object_path = pa_dbusiface_device_get_path(device_iface);
-
-                    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								       PA_DBUS_CORE_INTERFACE,
-								       signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
-                    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-                    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                    dbus_message_unref(signal_msg);
-                    signal_msg = NULL;
-
-                } else if (!new_fallback_source) {
-                    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								       PA_DBUS_CORE_INTERFACE,
-								       signals[SIGNAL_FALLBACK_SOURCE_UNSET].name)));
-                    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                    dbus_message_unref(signal_msg);
-                    signal_msg = NULL;
-                }
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_CARD:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                if (!(card_iface = pa_hashmap_get(c->cards, PA_UINT32_TO_PTR(idx)))) {
-                    pa_card *card = NULL;
-
-                    if (!(card = pa_idxset_get_by_index(core->cards, idx)))
-                        return; /* The card was removed immediately after creation. */
-
-                    card_iface = pa_dbusiface_card_new(c, card);
-                    pa_hashmap_put(c->cards, PA_UINT32_TO_PTR(idx), card_iface);
-                }
-
-                object_path = pa_dbusiface_card_get_path(card_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_CARD].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(card_iface = pa_hashmap_remove(c->cards, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_card_get_path(card_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_CARD_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_card_free(card_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_SINK:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_sink *sink = NULL;
-
-                if (!(sink = pa_idxset_get_by_index(core->sinks, idx)))
-                    return; /* The sink was removed immediately after creation. */
-
-                if (!(device_iface = pa_hashmap_get(c->sinks_by_index, PA_UINT32_TO_PTR(idx)))) {
-                    device_iface = pa_dbusiface_device_new_sink(c, sink);
-                    pa_hashmap_put(c->sinks_by_index, PA_UINT32_TO_PTR(idx), device_iface);
-                    pa_hashmap_put(c->sinks_by_path, pa_dbusiface_device_get_path(device_iface), device_iface);
-                }
-
-                object_path = pa_dbusiface_device_get_path(device_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_SINK].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                dbus_message_unref(signal_msg);
-                signal_msg = NULL;
-
-                if (c->fallback_sink && pa_streq(c->fallback_sink->name, sink->name)) {
-                    /* We have got default sink change event, but at that point
-                     * the D-Bus sink object wasn't created yet. Now that the
-                     * object is created, let's send the fallback sink change
-                     * signal. */
-                    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								       PA_DBUS_CORE_INTERFACE,
-								       signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
-                    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                    dbus_message_unref(signal_msg);
-                    signal_msg = NULL;
-                }
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(device_iface = pa_hashmap_remove(c->sinks_by_index, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_device_get_path(device_iface);
-                pa_assert_se(pa_hashmap_remove(c->sinks_by_path, object_path));
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_SINK_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_device_free(device_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_SOURCE:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_source *source = pa_idxset_get_by_index(core->sources, idx);
-
-                if (!(source = pa_idxset_get_by_index(core->sources, idx)))
-                    return; /* The source was removed immediately after creation. */
-
-                if (!(device_iface = pa_hashmap_get(c->sources_by_index, PA_UINT32_TO_PTR(idx)))) {
-                    device_iface = pa_dbusiface_device_new_source(c, source);
-                    pa_hashmap_put(c->sources_by_index, PA_UINT32_TO_PTR(idx), device_iface);
-                    pa_hashmap_put(c->sources_by_path, pa_dbusiface_device_get_path(device_iface), device_iface);
-                }
-
-                object_path = pa_dbusiface_device_get_path(device_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_SOURCE].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                dbus_message_unref(signal_msg);
-                signal_msg = NULL;
-
-                if (c->fallback_source && pa_streq(c->fallback_source->name, source->name)) {
-                    /* We have got default source change event, but at that
-                     * point the D-Bus source object wasn't created yet. Now
-                     * that the object is created, let's send the fallback
-                     * source change signal. */
-                    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								       PA_DBUS_CORE_INTERFACE,
-								       signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
-                    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-                    dbus_message_unref(signal_msg);
-                    signal_msg = NULL;
-                }
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(device_iface = pa_hashmap_remove(c->sources_by_index, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_device_get_path(device_iface);
-                pa_assert_se(pa_hashmap_remove(c->sources_by_path, object_path));
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_SOURCE_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_device_free(device_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_sink_input *sink_input = NULL;
-
-                if (!(sink_input = pa_idxset_get_by_index(core->sink_inputs, idx)))
-                    return; /* The sink input was removed immediately after creation. */
-
-                if (!(stream_iface = pa_hashmap_get(c->playback_streams, PA_UINT32_TO_PTR(idx)))) {
-                    stream_iface = pa_dbusiface_stream_new_playback(c, sink_input);
-                    pa_hashmap_put(c->playback_streams, PA_UINT32_TO_PTR(idx), stream_iface);
-                }
-
-                object_path = pa_dbusiface_stream_get_path(stream_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(stream_iface = pa_hashmap_remove(c->playback_streams, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_stream_get_path(stream_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_stream_free(stream_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_source_output *source_output = NULL;
-
-                if (!(source_output = pa_idxset_get_by_index(core->source_outputs, idx)))
-                    return; /* The source output was removed immediately after creation. */
-
-                if (!(stream_iface = pa_hashmap_get(c->record_streams, PA_UINT32_TO_PTR(idx)))) {
-                    stream_iface = pa_dbusiface_stream_new_record(c, source_output);
-                    pa_hashmap_put(c->record_streams, PA_UINT32_TO_PTR(idx), stream_iface);
-                }
-
-                object_path = pa_dbusiface_stream_get_path(stream_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_RECORD_STREAM].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(stream_iface = pa_hashmap_remove(c->record_streams, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_stream_get_path(stream_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_stream_free(stream_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_scache_entry *sample = NULL;
-
-                if (!(sample = pa_idxset_get_by_index(core->scache, idx)))
-                    return; /* The sample was removed immediately after creation. */
-
-                if (!(sample_iface = pa_hashmap_get(c->samples, PA_UINT32_TO_PTR(idx)))) {
-                    sample_iface = pa_dbusiface_sample_new(c, sample);
-                    pa_hashmap_put(c->samples, PA_UINT32_TO_PTR(idx), sample_iface);
-                }
-
-                object_path = pa_dbusiface_sample_get_path(sample_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_SAMPLE].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(sample_iface = pa_hashmap_remove(c->samples, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_sample_get_path(sample_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_SAMPLE_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_sample_free(sample_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_MODULE:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_module *module = NULL;
-
-                if (!(module = pa_idxset_get_by_index(core->modules, idx)))
-                    return; /* The module was removed immediately after creation. */
-
-                if (!(module_iface = pa_hashmap_get(c->modules, PA_UINT32_TO_PTR(idx)))) {
-                    module_iface = pa_dbusiface_module_new(module);
-                    pa_hashmap_put(c->modules, PA_UINT32_TO_PTR(idx), module_iface);
-                }
-
-                object_path = pa_dbusiface_module_get_path(module_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_MODULE].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(module_iface = pa_hashmap_remove(c->modules, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_module_get_path(module_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_MODULE_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_module_free(module_iface);
-            }
-            break;
-
-        case PA_SUBSCRIPTION_EVENT_CLIENT:
-            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
-                pa_client *client = NULL;
-
-                if (!(client = pa_idxset_get_by_index(core->clients, idx)))
-                    return; /* The client was removed immediately after creation. */
-
-                if (!(client_iface = pa_hashmap_get(c->clients, PA_UINT32_TO_PTR(idx)))) {
-                    client_iface = pa_dbusiface_client_new(c, client);
-                    pa_hashmap_put(c->clients, PA_UINT32_TO_PTR(idx), client_iface);
-                }
-
-                object_path = pa_dbusiface_client_get_path(client_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_NEW_CLIENT].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-            } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
-                if (!(client_iface = pa_hashmap_remove(c->clients, PA_UINT32_TO_PTR(idx))))
-                    return;
-
-                object_path = pa_dbusiface_client_get_path(client_iface);
-
-                pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-								   PA_DBUS_CORE_INTERFACE,
-								   signals[SIGNAL_CLIENT_REMOVED].name)));
-                pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-                pa_dbusiface_client_free(client_iface);
-            }
-            break;
-    }
-
-    if (signal_msg) {
-        pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-    }
-}
-
-static pa_hook_result_t extension_registered_cb(void *hook_data, void *call_data, void *slot_data) {
-    pa_dbusiface_core *c = slot_data;
-    const char *ext_name = call_data;
-    DBusMessage *signal_msg = NULL;
-
-    pa_assert(c);
-    pa_assert(ext_name);
-
-    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-						       PA_DBUS_CORE_INTERFACE,
-						       signals[SIGNAL_NEW_EXTENSION].name)));
-    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
-
-    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-
-    return PA_HOOK_OK;
-}
-
-static pa_hook_result_t extension_unregistered_cb(void *hook_data, void *call_data, void *slot_data) {
-    pa_dbusiface_core *c = slot_data;
-    const char *ext_name = call_data;
-    DBusMessage *signal_msg = NULL;
-
-    pa_assert(c);
-    pa_assert(ext_name);
-
-    pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-						       PA_DBUS_CORE_INTERFACE,
-						       signals[SIGNAL_EXTENSION_REMOVED].name)));
-    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
-
-    pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-
-    return PA_HOOK_OK;
-}
-
-pa_dbusiface_core *pa_dbusiface_core_new(pa_core *core) {
-    pa_dbusiface_core *c;
-    pa_card *card;
-    pa_sink *sink;
-    pa_source *source;
-    pa_dbusiface_device *device;
-    pa_sink_input *sink_input;
-    pa_source_output *source_output;
-    pa_scache_entry *sample;
-    pa_module *module;
-    pa_client *client;
-    uint32_t idx;
-
-    pa_assert(core);
-
-    c = pa_xnew(pa_dbusiface_core, 1);
-    c->core = pa_core_ref(core);
-    c->subscription = pa_subscription_new(core, PA_SUBSCRIPTION_MASK_ALL, subscription_cb, c);
-    c->dbus_protocol = pa_dbus_protocol_get(core);
-    c->cards = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->sinks_by_index = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->sinks_by_path = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    c->sources_by_index = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->sources_by_path = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    c->playback_streams = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->record_streams = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->samples = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->modules = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->clients = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->fallback_sink = pa_namereg_get_default_sink(core);
-    c->fallback_source = pa_namereg_get_default_source(core);
-    c->extension_registered_slot = pa_dbus_protocol_hook_connect(c->dbus_protocol,
-                                                                 PA_DBUS_PROTOCOL_HOOK_EXTENSION_REGISTERED,
-                                                                 PA_HOOK_NORMAL,
-                                                                 extension_registered_cb,
-                                                                 c);
-    c->extension_unregistered_slot = pa_dbus_protocol_hook_connect(c->dbus_protocol,
-                                                                   PA_DBUS_PROTOCOL_HOOK_EXTENSION_UNREGISTERED,
-                                                                   PA_HOOK_NORMAL,
-                                                                   extension_unregistered_cb,
-                                                                   c);
-    c->memstats = pa_dbusiface_memstats_new(c, core);
-
-    if (c->fallback_sink)
-        pa_sink_ref(c->fallback_sink);
-    if (c->fallback_source)
-        pa_source_ref(c->fallback_source);
-
-    PA_IDXSET_FOREACH(card, core->cards, idx)
-        pa_hashmap_put(c->cards, PA_UINT32_TO_PTR(idx), pa_dbusiface_card_new(c, card));
-
-    PA_IDXSET_FOREACH(sink, core->sinks, idx) {
-        device = pa_dbusiface_device_new_sink(c, sink);
-        pa_hashmap_put(c->sinks_by_index, PA_UINT32_TO_PTR(idx), device);
-        pa_hashmap_put(c->sinks_by_path, pa_dbusiface_device_get_path(device), device);
-    }
-
-    PA_IDXSET_FOREACH(source, core->sources, idx) {
-        device = pa_dbusiface_device_new_source(c, source);
-        pa_hashmap_put(c->sources_by_index, PA_UINT32_TO_PTR(idx), device);
-        pa_hashmap_put(c->sources_by_path, pa_dbusiface_device_get_path(device), device);
-    }
-
-    PA_IDXSET_FOREACH(sink_input, core->sink_inputs, idx)
-        pa_hashmap_put(c->playback_streams, PA_UINT32_TO_PTR(idx), pa_dbusiface_stream_new_playback(c, sink_input));
-
-    PA_IDXSET_FOREACH(source_output, core->source_outputs, idx)
-        pa_hashmap_put(c->record_streams, PA_UINT32_TO_PTR(idx), pa_dbusiface_stream_new_record(c, source_output));
-
-    PA_IDXSET_FOREACH(sample, core->scache, idx)
-        pa_hashmap_put(c->samples, PA_UINT32_TO_PTR(idx), pa_dbusiface_sample_new(c, sample));
-
-    PA_IDXSET_FOREACH(module, core->modules, idx)
-        pa_hashmap_put(c->modules, PA_UINT32_TO_PTR(idx), pa_dbusiface_module_new(module));
-
-    PA_IDXSET_FOREACH(client, core->clients, idx)
-        pa_hashmap_put(c->clients, PA_UINT32_TO_PTR(idx), pa_dbusiface_client_new(c, client));
-
-    pa_assert_se(pa_dbus_protocol_add_interface(c->dbus_protocol, PA_DBUS_CORE_OBJECT_PATH, &core_interface_info, c) >= 0);
-
-    return c;
-}
-
-static void free_card_cb(void *p, void *userdata) {
-    pa_dbusiface_card *c = p;
-
-    pa_assert(c);
-
-    pa_dbusiface_card_free(c);
-}
-
-static void free_device_cb(void *p, void *userdata) {
-    pa_dbusiface_device *d = p;
-
-    pa_assert(d);
-
-    pa_dbusiface_device_free(d);
-}
-
-static void free_stream_cb(void *p, void *userdata) {
-    pa_dbusiface_stream *s = p;
-
-    pa_assert(s);
-
-    pa_dbusiface_stream_free(s);
-}
-
-static void free_sample_cb(void *p, void *userdata) {
-    pa_dbusiface_sample *s = p;
-
-    pa_assert(s);
-
-    pa_dbusiface_sample_free(s);
-}
-
-static void free_module_cb(void *p, void *userdata) {
-    pa_dbusiface_module *m = p;
-
-    pa_assert(m);
-
-    pa_dbusiface_module_free(m);
-}
-
-static void free_client_cb(void *p, void *userdata) {
-    pa_dbusiface_client *c = p;
-
-    pa_assert(c);
-
-    pa_dbusiface_client_free(c);
-}
-
-void pa_dbusiface_core_free(pa_dbusiface_core *c) {
-    pa_assert(c);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(c->dbus_protocol, PA_DBUS_CORE_OBJECT_PATH, core_interface_info.name) >= 0);
-
-    pa_subscription_free(c->subscription);
-    pa_hashmap_free(c->cards, free_card_cb, NULL);
-    pa_hashmap_free(c->sinks_by_index, free_device_cb, NULL);
-    pa_hashmap_free(c->sinks_by_path, NULL, NULL);
-    pa_hashmap_free(c->sources_by_index, free_device_cb, NULL);
-    pa_hashmap_free(c->sources_by_path, NULL, NULL);
-    pa_hashmap_free(c->playback_streams, free_stream_cb, NULL);
-    pa_hashmap_free(c->record_streams, free_stream_cb, NULL);
-    pa_hashmap_free(c->samples, free_sample_cb, NULL);
-    pa_hashmap_free(c->modules, free_module_cb, NULL);
-    pa_hashmap_free(c->clients, free_client_cb, NULL);
-    pa_hook_slot_free(c->extension_registered_slot);
-    pa_hook_slot_free(c->extension_unregistered_slot);
-    pa_dbusiface_memstats_free(c->memstats);
-
-    if (c->fallback_sink)
-        pa_sink_unref(c->fallback_sink);
-    if (c->fallback_source)
-        pa_source_unref(c->fallback_source);
-
-    pa_dbus_protocol_unref(c->dbus_protocol);
-    pa_core_unref(c->core);
-
-    pa_xfree(c);
-}
-
-const char *pa_dbusiface_core_get_card_path(pa_dbusiface_core *c, const pa_card *card) {
-    pa_assert(c);
-    pa_assert(card);
-
-    return pa_dbusiface_card_get_path(pa_hashmap_get(c->cards, PA_UINT32_TO_PTR(card->index)));
-}
-
-const char *pa_dbusiface_core_get_sink_path(pa_dbusiface_core *c, const pa_sink *sink) {
-    pa_assert(c);
-    pa_assert(sink);
-
-    return pa_dbusiface_device_get_path(pa_hashmap_get(c->sinks_by_index, PA_UINT32_TO_PTR(sink->index)));
-}
-
-const char *pa_dbusiface_core_get_source_path(pa_dbusiface_core *c, const pa_source *source) {
-    pa_assert(c);
-    pa_assert(source);
-
-    return pa_dbusiface_device_get_path(pa_hashmap_get(c->sources_by_index, PA_UINT32_TO_PTR(source->index)));
-}
-
-const char *pa_dbusiface_core_get_playback_stream_path(pa_dbusiface_core *c, const pa_sink_input *sink_input) {
-    pa_assert(c);
-    pa_assert(sink_input);
-
-    return pa_dbusiface_stream_get_path(pa_hashmap_get(c->playback_streams, PA_UINT32_TO_PTR(sink_input->index)));
-}
-
-const char *pa_dbusiface_core_get_record_stream_path(pa_dbusiface_core *c, const pa_source_output *source_output) {
-    pa_assert(c);
-    pa_assert(source_output);
-
-    return pa_dbusiface_stream_get_path(pa_hashmap_get(c->record_streams, PA_UINT32_TO_PTR(source_output->index)));
-}
-
-const char *pa_dbusiface_core_get_module_path(pa_dbusiface_core *c, const pa_module *module) {
-    pa_assert(c);
-    pa_assert(module);
-
-    return pa_dbusiface_module_get_path(pa_hashmap_get(c->modules, PA_UINT32_TO_PTR(module->index)));
-}
-
-const char *pa_dbusiface_core_get_client_path(pa_dbusiface_core *c, const pa_client *client) {
-    pa_assert(c);
-    pa_assert(client);
-
-    return pa_dbusiface_client_get_path(pa_hashmap_get(c->clients, PA_UINT32_TO_PTR(client->index)));
-}
-
-pa_sink *pa_dbusiface_core_get_sink(pa_dbusiface_core *c, const char *object_path) {
-    pa_dbusiface_device *device = NULL;
-
-    pa_assert(c);
-    pa_assert(object_path);
-
-    device = pa_hashmap_get(c->sinks_by_path, object_path);
-
-    if (device)
-        return pa_dbusiface_device_get_sink(device);
-    else
-        return NULL;
-}
-
-pa_source *pa_dbusiface_core_get_source(pa_dbusiface_core *c, const char *object_path) {
-    pa_dbusiface_device *device = NULL;
-
-    pa_assert(c);
-    pa_assert(object_path);
-
-    device = pa_hashmap_get(c->sources_by_path, object_path);
-
-    if (device)
-        return pa_dbusiface_device_get_source(device);
-    else
-        return NULL;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-core.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-core.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-core.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-core.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-#ifndef foodbusifacecorehfoo
-#define foodbusifacecorehfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Core interface
- * documentation.
- */
-
-#include <pulsecore/core.h>
-
-typedef struct pa_dbusiface_core pa_dbusiface_core;
-
-pa_dbusiface_core *pa_dbusiface_core_new(pa_core *core);
-void pa_dbusiface_core_free(pa_dbusiface_core *c);
-
-const char *pa_dbusiface_core_get_card_path(pa_dbusiface_core *c, const pa_card *card);
-const char *pa_dbusiface_core_get_sink_path(pa_dbusiface_core *c, const pa_sink *sink);
-const char *pa_dbusiface_core_get_source_path(pa_dbusiface_core *c, const pa_source *source);
-const char *pa_dbusiface_core_get_playback_stream_path(pa_dbusiface_core *c, const pa_sink_input *sink_input);
-const char *pa_dbusiface_core_get_record_stream_path(pa_dbusiface_core *c, const pa_source_output *source_output);
-const char *pa_dbusiface_core_get_module_path(pa_dbusiface_core *c, const pa_module *module);
-const char *pa_dbusiface_core_get_client_path(pa_dbusiface_core *c, const pa_client *client);
-
-/* Returns NULL if there's no sink with the given path. */
-pa_sink *pa_dbusiface_core_get_sink(pa_dbusiface_core *c, const char *object_path);
-
-/* Returns NULL if there's no source with the given path. */
-pa_source *pa_dbusiface_core_get_source(pa_dbusiface_core *c, const char *object_path);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,1316 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-device-port.h"
-
-#include "iface-device.h"
-
-#define SINK_OBJECT_NAME "sink"
-#define SOURCE_OBJECT_NAME "source"
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_card(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_channels(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_has_flat_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_has_convertible_to_decibel_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_base_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_volume_steps(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_mute(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_has_hardware_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_has_hardware_mute(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_configured_latency(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_has_dynamic_latency(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_latency(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_is_hardware_device(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_is_network_device(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_state(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_ports(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_active_port(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_active_port(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_suspend(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_port_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_sink_get_monitor_source(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_sink_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_source_get_monitor_of_sink(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_source_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-enum device_type {
-    DEVICE_TYPE_SINK,
-    DEVICE_TYPE_SOURCE
-};
-
-struct pa_dbusiface_device {
-    pa_dbusiface_core *core;
-
-    union {
-        pa_sink *sink;
-        pa_source *source;
-    };
-    enum device_type type;
-    char *path;
-    pa_cvolume volume;
-    dbus_bool_t mute;
-    union {
-        pa_sink_state_t sink_state;
-        pa_source_state_t source_state;
-    };
-    pa_hashmap *ports;
-    uint32_t next_port_index;
-    pa_device_port *active_port;
-    pa_proplist *proplist;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_subscription *subscription;
-};
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_DRIVER,
-    PROPERTY_HANDLER_OWNER_MODULE,
-    PROPERTY_HANDLER_CARD,
-    PROPERTY_HANDLER_SAMPLE_FORMAT,
-    PROPERTY_HANDLER_SAMPLE_RATE,
-    PROPERTY_HANDLER_CHANNELS,
-    PROPERTY_HANDLER_VOLUME,
-    PROPERTY_HANDLER_HAS_FLAT_VOLUME,
-    PROPERTY_HANDLER_HAS_CONVERTIBLE_TO_DECIBEL_VOLUME,
-    PROPERTY_HANDLER_BASE_VOLUME,
-    PROPERTY_HANDLER_VOLUME_STEPS,
-    PROPERTY_HANDLER_MUTE,
-    PROPERTY_HANDLER_HAS_HARDWARE_VOLUME,
-    PROPERTY_HANDLER_HAS_HARDWARE_MUTE,
-    PROPERTY_HANDLER_CONFIGURED_LATENCY,
-    PROPERTY_HANDLER_HAS_DYNAMIC_LATENCY,
-    PROPERTY_HANDLER_LATENCY,
-    PROPERTY_HANDLER_IS_HARDWARE_DEVICE,
-    PROPERTY_HANDLER_IS_NETWORK_DEVICE,
-    PROPERTY_HANDLER_STATE,
-    PROPERTY_HANDLER_PORTS,
-    PROPERTY_HANDLER_ACTIVE_PORT,
-    PROPERTY_HANDLER_PROPERTY_LIST,
-    PROPERTY_HANDLER_MAX
-};
-
-enum sink_property_handler_index {
-    SINK_PROPERTY_HANDLER_MONITOR_SOURCE,
-    SINK_PROPERTY_HANDLER_MAX
-};
-
-enum source_property_handler_index {
-    SOURCE_PROPERTY_HANDLER_MONITOR_OF_SINK,
-    SOURCE_PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]                             = { .property_name = "Index",                         .type = "u",      .get_cb = handle_get_index,                             .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]                              = { .property_name = "Name",                          .type = "s",      .get_cb = handle_get_name,                              .set_cb = NULL },
-    [PROPERTY_HANDLER_DRIVER]                            = { .property_name = "Driver",                        .type = "s",      .get_cb = handle_get_driver,                            .set_cb = NULL },
-    [PROPERTY_HANDLER_OWNER_MODULE]                      = { .property_name = "OwnerModule",                   .type = "o",      .get_cb = handle_get_owner_module,                      .set_cb = NULL },
-    [PROPERTY_HANDLER_CARD]                              = { .property_name = "Card",                          .type = "o",      .get_cb = handle_get_card,                              .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_FORMAT]                     = { .property_name = "SampleFormat",                  .type = "u",      .get_cb = handle_get_sample_format,                     .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_RATE]                       = { .property_name = "SampleRate",                    .type = "u",      .get_cb = handle_get_sample_rate,                       .set_cb = NULL },
-    [PROPERTY_HANDLER_CHANNELS]                          = { .property_name = "Channels",                      .type = "au",     .get_cb = handle_get_channels,                          .set_cb = NULL },
-    [PROPERTY_HANDLER_VOLUME]                            = { .property_name = "Volume",                        .type = "au",     .get_cb = handle_get_volume,                            .set_cb = handle_set_volume },
-    [PROPERTY_HANDLER_HAS_FLAT_VOLUME]                   = { .property_name = "HasFlatVolume",                 .type = "b",      .get_cb = handle_get_has_flat_volume,                   .set_cb = NULL },
-    [PROPERTY_HANDLER_HAS_CONVERTIBLE_TO_DECIBEL_VOLUME] = { .property_name = "HasConvertibleToDecibelVolume", .type = "b",      .get_cb = handle_get_has_convertible_to_decibel_volume, .set_cb = NULL },
-    [PROPERTY_HANDLER_BASE_VOLUME]                       = { .property_name = "BaseVolume",                    .type = "u",      .get_cb = handle_get_base_volume,                       .set_cb = NULL },
-    [PROPERTY_HANDLER_VOLUME_STEPS]                      = { .property_name = "VolumeSteps",                   .type = "u",      .get_cb = handle_get_volume_steps,                      .set_cb = NULL },
-    [PROPERTY_HANDLER_MUTE]                              = { .property_name = "Mute",                          .type = "b",      .get_cb = handle_get_mute,                              .set_cb = handle_set_mute },
-    [PROPERTY_HANDLER_HAS_HARDWARE_VOLUME]               = { .property_name = "HasHardwareVolume",             .type = "b",      .get_cb = handle_get_has_hardware_volume,               .set_cb = NULL },
-    [PROPERTY_HANDLER_HAS_HARDWARE_MUTE]                 = { .property_name = "HasHardwareMute",               .type = "b",      .get_cb = handle_get_has_hardware_mute,                 .set_cb = NULL },
-    [PROPERTY_HANDLER_CONFIGURED_LATENCY]                = { .property_name = "ConfiguredLatency",             .type = "t",      .get_cb = handle_get_configured_latency,                .set_cb = NULL },
-    [PROPERTY_HANDLER_HAS_DYNAMIC_LATENCY]               = { .property_name = "HasDynamicLatency",             .type = "b",      .get_cb = handle_get_has_dynamic_latency,               .set_cb = NULL },
-    [PROPERTY_HANDLER_LATENCY]                           = { .property_name = "Latency",                       .type = "t",      .get_cb = handle_get_latency,                           .set_cb = NULL },
-    [PROPERTY_HANDLER_IS_HARDWARE_DEVICE]                = { .property_name = "IsHardwareDevice",              .type = "b",      .get_cb = handle_get_is_hardware_device,                .set_cb = NULL },
-    [PROPERTY_HANDLER_IS_NETWORK_DEVICE]                 = { .property_name = "IsNetworkDevice",               .type = "b",      .get_cb = handle_get_is_network_device,                 .set_cb = NULL },
-    [PROPERTY_HANDLER_STATE]                             = { .property_name = "State",                         .type = "u",      .get_cb = handle_get_state,                             .set_cb = NULL },
-    [PROPERTY_HANDLER_PORTS]                             = { .property_name = "Ports",                         .type = "ao",     .get_cb = handle_get_ports,                             .set_cb = NULL },
-    [PROPERTY_HANDLER_ACTIVE_PORT]                       = { .property_name = "ActivePort",                    .type = "o",      .get_cb = handle_get_active_port,                       .set_cb = handle_set_active_port },
-    [PROPERTY_HANDLER_PROPERTY_LIST]                     = { .property_name = "PropertyList",                  .type = "a{say}", .get_cb = handle_get_property_list,                     .set_cb = NULL }
-};
-
-static pa_dbus_property_handler sink_property_handlers[SINK_PROPERTY_HANDLER_MAX] = {
-    [SINK_PROPERTY_HANDLER_MONITOR_SOURCE] = { .property_name = "MonitorSource", .type = "o", .get_cb = handle_sink_get_monitor_source, .set_cb = NULL }
-};
-
-static pa_dbus_property_handler source_property_handlers[SOURCE_PROPERTY_HANDLER_MAX] = {
-    [SOURCE_PROPERTY_HANDLER_MONITOR_OF_SINK] = { .property_name = "MonitorOfSink", .type = "o", .get_cb = handle_source_get_monitor_of_sink, .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_SUSPEND,
-    METHOD_HANDLER_GET_PORT_BY_NAME,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info suspend_args[] = { { "suspend", "b", "in" } };
-static pa_dbus_arg_info get_port_by_name_args[] = { { "name", "s", "in" }, { "port", "o", "out" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_SUSPEND] = {
-        .method_name = "Suspend",
-        .arguments = suspend_args,
-        .n_arguments = sizeof(suspend_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_suspend },
-    [METHOD_HANDLER_GET_PORT_BY_NAME] = {
-        .method_name = "GetPortByName",
-        .arguments = get_port_by_name_args,
-        .n_arguments = sizeof(get_port_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_port_by_name }
-};
-
-enum signal_index {
-    SIGNAL_VOLUME_UPDATED,
-    SIGNAL_MUTE_UPDATED,
-    SIGNAL_STATE_UPDATED,
-    SIGNAL_ACTIVE_PORT_UPDATED,
-    SIGNAL_PROPERTY_LIST_UPDATED,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info volume_updated_args[]        = { { "volume",        "au",     NULL } };
-static pa_dbus_arg_info mute_updated_args[]          = { { "muted",         "b",      NULL } };
-static pa_dbus_arg_info state_updated_args[]         = { { "state",         "u",      NULL } };
-static pa_dbus_arg_info active_port_updated_args[]   = { { "port",          "o",      NULL } };
-static pa_dbus_arg_info property_list_updated_args[] = { { "property_list", "a{say}", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_VOLUME_UPDATED]        = { .name = "VolumeUpdated",       .arguments = volume_updated_args,        .n_arguments = 1 },
-    [SIGNAL_MUTE_UPDATED]          = { .name = "MuteUpdated",         .arguments = mute_updated_args,          .n_arguments = 1 },
-    [SIGNAL_STATE_UPDATED]         = { .name = "StateUpdated",        .arguments = state_updated_args,         .n_arguments = 1 },
-    [SIGNAL_ACTIVE_PORT_UPDATED]   = { .name = "ActivePortUpdated",   .arguments = active_port_updated_args,   .n_arguments = 1 },
-    [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info device_interface_info = {
-    .name = PA_DBUSIFACE_DEVICE_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static pa_dbus_interface_info sink_interface_info = {
-    .name = PA_DBUSIFACE_SINK_INTERFACE,
-    .method_handlers = NULL,
-    .n_method_handlers = 0,
-    .property_handlers = sink_property_handlers,
-    .n_property_handlers = SINK_PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_sink_get_all,
-    .signals = NULL,
-    .n_signals = 0
-};
-
-static pa_dbus_interface_info source_interface_info = {
-    .name = PA_DBUSIFACE_SOURCE_INTERFACE,
-    .method_handlers = NULL,
-    .n_method_handlers = 0,
-    .property_handlers = source_property_handlers,
-    .n_property_handlers = SOURCE_PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_source_get_all,
-    .signals = NULL,
-    .n_signals = 0
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t idx = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    idx = (d->type == DEVICE_TYPE_SINK) ? d->sink->index : d->source->index;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *name = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    name = (d->type == DEVICE_TYPE_SINK) ? d->sink->name : d->source->name;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &name);
-}
-
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *driver = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    driver = (d->type == DEVICE_TYPE_SINK) ? d->sink->driver : d->source->driver;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &driver);
-}
-
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    pa_module *owner_module = NULL;
-    const char *object_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    owner_module = (d->type == DEVICE_TYPE_SINK) ? d->sink->module : d->source->module;
-
-    if (!owner_module) {
-        if (d->type == DEVICE_TYPE_SINK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Sink %s doesn't have an owner module.", d->sink->name);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Source %s doesn't have an owner module.", d->source->name);
-        return;
-    }
-
-    object_path = pa_dbusiface_core_get_module_path(d->core, owner_module);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_card(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    pa_card *card = NULL;
-    const char *object_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    card = (d->type == DEVICE_TYPE_SINK) ? d->sink->card : d->source->card;
-
-    if (!card) {
-        if (d->type == DEVICE_TYPE_SINK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Sink %s doesn't belong to any card.", d->sink->name);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Source %s doesn't belong to any card.", d->source->name);
-        return;
-    }
-
-    object_path = pa_dbusiface_core_get_card_path(d->core, card);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t sample_format = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    sample_format = (d->type == DEVICE_TYPE_SINK) ? d->sink->sample_spec.format : d->source->sample_spec.format;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sample_format);
-}
-
-static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t sample_rate = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    sample_rate = (d->type == DEVICE_TYPE_SINK) ? d->sink->sample_spec.rate : d->source->sample_spec.rate;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sample_rate);
-}
-
-static void handle_get_channels(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    pa_channel_map *channel_map = NULL;
-    dbus_uint32_t channels[PA_CHANNELS_MAX];
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    channel_map = (d->type == DEVICE_TYPE_SINK) ? &d->sink->channel_map : &d->source->channel_map;
-
-    for (i = 0; i < channel_map->channels; ++i)
-        channels[i] = channel_map->map[i];
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, channels, channel_map->channels);
-}
-
-static void handle_get_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t volume[PA_CHANNELS_MAX];
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    for (i = 0; i < d->volume.channels; ++i)
-        volume[i] = d->volume.values[i];
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, volume, d->volume.channels);
-}
-
-static void handle_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    DBusMessageIter array_iter;
-    int device_channels = 0;
-    dbus_uint32_t *volume = NULL;
-    int n_volume_entries = 0;
-    pa_cvolume new_vol;
-    int i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(d);
-
-    pa_cvolume_init(&new_vol);
-
-    device_channels = (d->type == DEVICE_TYPE_SINK) ? d->sink->channel_map.channels : d->source->channel_map.channels;
-
-    new_vol.channels = device_channels;
-
-    dbus_message_iter_recurse(iter, &array_iter);
-    dbus_message_iter_get_fixed_array(&array_iter, &volume, &n_volume_entries);
-
-    if (n_volume_entries != device_channels) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "Expected %u volume entries, got %i.", device_channels, n_volume_entries);
-        return;
-    }
-
-    for (i = 0; i < n_volume_entries; ++i) {
-        if (volume[i] > PA_VOLUME_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Too large volume value: %u", volume[i]);
-            return;
-        }
-        new_vol.values[i] = volume[i];
-    }
-
-    if (d->type == DEVICE_TYPE_SINK)
-        pa_sink_set_volume(d->sink, &new_vol, TRUE, TRUE);
-    else
-        pa_source_set_volume(d->source, &new_vol, TRUE);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_has_flat_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t has_flat_volume = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    has_flat_volume = (d->type == DEVICE_TYPE_SINK) ? (d->sink->flags & PA_SINK_FLAT_VOLUME) : FALSE;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &has_flat_volume);
-}
-
-static void handle_get_has_convertible_to_decibel_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t has_convertible_to_decibel_volume = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    has_convertible_to_decibel_volume = (d->type == DEVICE_TYPE_SINK)
-                                        ? (d->sink->flags & PA_SINK_DECIBEL_VOLUME)
-                                        : (d->source->flags & PA_SOURCE_DECIBEL_VOLUME);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &has_convertible_to_decibel_volume);
-}
-
-static void handle_get_base_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t base_volume;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    base_volume = (d->type == DEVICE_TYPE_SINK) ? d->sink->base_volume : d->source->base_volume;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &base_volume);
-}
-
-static void handle_get_volume_steps(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t volume_steps;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    volume_steps = (d->type == DEVICE_TYPE_SINK) ? d->sink->n_volume_steps : d->source->n_volume_steps;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &volume_steps);
-}
-
-static void handle_get_mute(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &d->mute);
-}
-
-static void handle_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t mute = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(d);
-
-    dbus_message_iter_get_basic(iter, &mute);
-
-    if (d->type == DEVICE_TYPE_SINK)
-        pa_sink_set_mute(d->sink, mute, TRUE);
-    else
-        pa_source_set_mute(d->source, mute, TRUE);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_has_hardware_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t has_hardware_volume = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    has_hardware_volume = (d->type == DEVICE_TYPE_SINK)
-                          ? (d->sink->flags & PA_SINK_HW_VOLUME_CTRL)
-                          : (d->source->flags & PA_SOURCE_HW_VOLUME_CTRL);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &has_hardware_volume);
-}
-
-static void handle_get_has_hardware_mute(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t has_hardware_mute = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    has_hardware_mute = (d->type == DEVICE_TYPE_SINK)
-                        ? (d->sink->flags & PA_SINK_HW_MUTE_CTRL)
-                        : (d->source->flags & PA_SOURCE_HW_MUTE_CTRL);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &has_hardware_mute);
-}
-
-static void handle_get_configured_latency(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint64_t configured_latency = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    configured_latency = (d->type == DEVICE_TYPE_SINK)
-                         ? pa_sink_get_requested_latency(d->sink)
-                         : pa_source_get_requested_latency(d->source);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT64, &configured_latency);
-}
-
-static void handle_get_has_dynamic_latency(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t has_dynamic_latency = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    has_dynamic_latency = (d->type == DEVICE_TYPE_SINK)
-                          ? (d->sink->flags & PA_SINK_DYNAMIC_LATENCY)
-                          : (d->source->flags & PA_SOURCE_DYNAMIC_LATENCY);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &has_dynamic_latency);
-}
-
-static void handle_get_latency(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint64_t latency = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    if (d->type == DEVICE_TYPE_SINK && !(d->sink->flags & PA_SINK_LATENCY))
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sink %s doesn't support latency querying.", d->sink->name);
-    else if (d->type == DEVICE_TYPE_SOURCE && !(d->source->flags & PA_SOURCE_LATENCY))
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Source %s doesn't support latency querying.", d->source->name);
-    return;
-
-    latency = (d->type == DEVICE_TYPE_SINK) ? pa_sink_get_latency(d->sink) : pa_source_get_latency(d->source);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT64, &latency);
-}
-
-static void handle_get_is_hardware_device(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t is_hardware_device = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    is_hardware_device = (d->type == DEVICE_TYPE_SINK)
-                         ? (d->sink->flags & PA_SINK_HARDWARE)
-                         : (d->source->flags & PA_SOURCE_HARDWARE);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &is_hardware_device);
-}
-
-static void handle_get_is_network_device(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t is_network_device = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    is_network_device = (d->type == DEVICE_TYPE_SINK)
-                        ? (d->sink->flags & PA_SINK_NETWORK)
-                        : (d->source->flags & PA_SOURCE_NETWORK);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &is_network_device);
-}
-
-static void handle_get_state(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_uint32_t state;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    state = (d->type == DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &state);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_ports(pa_dbusiface_device *d, unsigned *n) {
-    const char **ports;
-    unsigned i = 0;
-    void *state = NULL;
-    pa_dbusiface_device_port *port = NULL;
-
-    pa_assert(d);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(d->ports);
-
-    if (*n == 0)
-        return NULL;
-
-    ports = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(port, d->ports, state)
-        ports[i++] = pa_dbusiface_device_port_get_path(port);
-
-    return ports;
-}
-
-static void handle_get_ports(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char **ports = NULL;
-    unsigned n_ports = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    ports = get_ports(d, &n_ports);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, ports, n_ports);
-
-    pa_xfree(ports);
-}
-
-static void handle_get_active_port(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *active_port;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    if (!d->active_port) {
-        pa_assert(pa_hashmap_isempty(d->ports));
-
-        if (d->type == DEVICE_TYPE_SINK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "The sink %s has no ports, and therefore there's no active port either.", d->sink->name);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "The source %s has no ports, and therefore there's no active port either.", d->source->name);
-        return;
-    }
-
-    active_port = pa_dbusiface_device_port_get_path(pa_hashmap_get(d->ports, d->active_port->name));
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &active_port);
-}
-
-static void handle_set_active_port(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *new_active_path;
-    pa_dbusiface_device_port *new_active;
-    int r;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(d);
-
-    if (!d->active_port) {
-        pa_assert(pa_hashmap_isempty(d->ports));
-
-        if (d->type == DEVICE_TYPE_SINK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "The sink %s has no ports, and therefore there's no active port either.", d->sink->name);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "The source %s has no ports, and therefore there's no active port either.", d->source->name);
-        return;
-    }
-
-    dbus_message_iter_get_basic(iter, &new_active_path);
-
-    if (!(new_active = pa_hashmap_get(d->ports, new_active_path))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "No such port: %s", new_active_path);
-        return;
-    }
-
-    if (d->type == DEVICE_TYPE_SINK) {
-        if ((r = pa_sink_set_port(d->sink, pa_dbusiface_device_port_get_name(new_active), TRUE)) < 0) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
-                               "Internal error in PulseAudio: pa_sink_set_port() failed with error code %i.", r);
-            return;
-        }
-    } else {
-        if ((r = pa_source_set_port(d->source, pa_dbusiface_device_port_get_name(new_active), TRUE)) < 0) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
-                               "Internal error in PulseAudio: pa_source_set_port() failed with error code %i.", r);
-            return;
-        }
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    pa_dbus_send_proplist_variant_reply(conn, msg, d->proplist);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t idx = 0;
-    const char *name = NULL;
-    const char *driver = NULL;
-    pa_module *owner_module = NULL;
-    const char *owner_module_path = NULL;
-    pa_card *card = NULL;
-    const char *card_path = NULL;
-    dbus_uint32_t sample_format = 0;
-    dbus_uint32_t sample_rate = 0;
-    pa_channel_map *channel_map = NULL;
-    dbus_uint32_t channels[PA_CHANNELS_MAX];
-    dbus_uint32_t volume[PA_CHANNELS_MAX];
-    dbus_bool_t has_flat_volume = FALSE;
-    dbus_bool_t has_convertible_to_decibel_volume = FALSE;
-    dbus_uint32_t base_volume = 0;
-    dbus_uint32_t volume_steps = 0;
-    dbus_bool_t has_hardware_volume = FALSE;
-    dbus_bool_t has_hardware_mute = FALSE;
-    dbus_uint64_t configured_latency = 0;
-    dbus_bool_t has_dynamic_latency = FALSE;
-    dbus_uint64_t latency = 0;
-    dbus_bool_t is_hardware_device = FALSE;
-    dbus_bool_t is_network_device = FALSE;
-    dbus_uint32_t state = 0;
-    const char **ports = NULL;
-    unsigned n_ports = 0;
-    const char *active_port = NULL;
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    if (d->type == DEVICE_TYPE_SINK) {
-        idx = d->sink->index;
-        name = d->sink->name;
-        driver = d->sink->driver;
-        owner_module = d->sink->module;
-        card = d->sink->card;
-        sample_format = d->sink->sample_spec.format;
-        sample_rate = d->sink->sample_spec.rate;
-        channel_map = &d->sink->channel_map;
-        has_flat_volume = d->sink->flags & PA_SINK_FLAT_VOLUME;
-        has_convertible_to_decibel_volume = d->sink->flags & PA_SINK_DECIBEL_VOLUME;
-        base_volume = d->sink->base_volume;
-        volume_steps = d->sink->n_volume_steps;
-        has_hardware_volume = d->sink->flags & PA_SINK_HW_VOLUME_CTRL;
-        has_hardware_mute = d->sink->flags & PA_SINK_HW_MUTE_CTRL;
-        configured_latency = pa_sink_get_requested_latency(d->sink);
-        has_dynamic_latency = d->sink->flags & PA_SINK_DYNAMIC_LATENCY;
-        latency = pa_sink_get_latency(d->sink);
-        is_hardware_device = d->sink->flags & PA_SINK_HARDWARE;
-        is_network_device = d->sink->flags & PA_SINK_NETWORK;
-        state = pa_sink_get_state(d->sink);
-    } else {
-        idx = d->source->index;
-        name = d->source->name;
-        driver = d->source->driver;
-        owner_module = d->source->module;
-        card = d->source->card;
-        sample_format = d->source->sample_spec.format;
-        sample_rate = d->source->sample_spec.rate;
-        channel_map = &d->source->channel_map;
-        has_flat_volume = FALSE;
-        has_convertible_to_decibel_volume = d->source->flags & PA_SOURCE_DECIBEL_VOLUME;
-        base_volume = d->source->base_volume;
-        volume_steps = d->source->n_volume_steps;
-        has_hardware_volume = d->source->flags & PA_SOURCE_HW_VOLUME_CTRL;
-        has_hardware_mute = d->source->flags & PA_SOURCE_HW_MUTE_CTRL;
-        configured_latency = pa_source_get_requested_latency(d->source);
-        has_dynamic_latency = d->source->flags & PA_SOURCE_DYNAMIC_LATENCY;
-        latency = pa_source_get_latency(d->source);
-        is_hardware_device = d->source->flags & PA_SOURCE_HARDWARE;
-        is_network_device = d->source->flags & PA_SOURCE_NETWORK;
-        state = pa_source_get_state(d->source);
-    }
-    if (owner_module)
-        owner_module_path = pa_dbusiface_core_get_module_path(d->core, owner_module);
-    if (card)
-        card_path = pa_dbusiface_core_get_card_path(d->core, card);
-    for (i = 0; i < channel_map->channels; ++i)
-        channels[i] = channel_map->map[i];
-    for (i = 0; i < d->volume.channels; ++i)
-        volume[i] = d->volume.values[i];
-    ports = get_ports(d, &n_ports);
-    if (d->active_port)
-        active_port = pa_dbusiface_device_port_get_path(pa_hashmap_get(d->ports, d->active_port->name));
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &idx);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &name);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DRIVER].property_name, DBUS_TYPE_STRING, &driver);
-
-    if (owner_module)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_OWNER_MODULE].property_name, DBUS_TYPE_OBJECT_PATH, &owner_module_path);
-
-    if (card)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CARD].property_name, DBUS_TYPE_OBJECT_PATH, &card_path);
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_FORMAT].property_name, DBUS_TYPE_UINT32, &sample_format);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_RATE].property_name, DBUS_TYPE_UINT32, &sample_rate);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CHANNELS].property_name, DBUS_TYPE_UINT32, channels, channel_map->channels);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_VOLUME].property_name, DBUS_TYPE_UINT32, volume, d->volume.channels);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_HAS_FLAT_VOLUME].property_name, DBUS_TYPE_BOOLEAN, &has_flat_volume);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_HAS_CONVERTIBLE_TO_DECIBEL_VOLUME].property_name, DBUS_TYPE_BOOLEAN, &has_convertible_to_decibel_volume);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_BASE_VOLUME].property_name, DBUS_TYPE_UINT32, &base_volume);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_VOLUME_STEPS].property_name, DBUS_TYPE_UINT32, &volume_steps);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_MUTE].property_name, DBUS_TYPE_BOOLEAN, &d->mute);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_HAS_HARDWARE_VOLUME].property_name, DBUS_TYPE_BOOLEAN, &has_hardware_volume);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_HAS_HARDWARE_MUTE].property_name, DBUS_TYPE_BOOLEAN, &has_hardware_mute);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CONFIGURED_LATENCY].property_name, DBUS_TYPE_UINT64, &configured_latency);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_HAS_DYNAMIC_LATENCY].property_name, DBUS_TYPE_BOOLEAN, &has_dynamic_latency);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_LATENCY].property_name, DBUS_TYPE_UINT64, &latency);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_IS_HARDWARE_DEVICE].property_name, DBUS_TYPE_BOOLEAN, &is_hardware_device);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_IS_NETWORK_DEVICE].property_name, DBUS_TYPE_BOOLEAN, &is_network_device);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_STATE].property_name, DBUS_TYPE_UINT32, &state);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PORTS].property_name, DBUS_TYPE_OBJECT_PATH, ports, n_ports);
-
-    if (active_port)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ACTIVE_PORT].property_name, DBUS_TYPE_OBJECT_PATH, &active_port);
-
-    pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, d->proplist);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(ports);
-}
-
-static void handle_suspend(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    dbus_bool_t suspend = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_BOOLEAN, &suspend, DBUS_TYPE_INVALID));
-
-    if ((d->type == DEVICE_TYPE_SINK) && (pa_sink_suspend(d->sink, suspend, PA_SUSPEND_USER) < 0)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Internal error in PulseAudio: pa_sink_suspend() failed.");
-        return;
-    } else if ((d->type == DEVICE_TYPE_SOURCE) && (pa_source_suspend(d->source, suspend, PA_SUSPEND_USER) < 0)) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Internal error in PulseAudio: pa_source_suspend() failed.");
-        return;
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_port_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *port_name = NULL;
-    pa_dbusiface_device_port *port = NULL;
-    const char *port_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &port_name, DBUS_TYPE_INVALID));
-
-    if (!(port = pa_hashmap_get(d->ports, port_name))) {
-        if (d->type == DEVICE_TYPE_SINK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND,
-                               "%s: No such port on sink %s.", port_name, d->sink->name);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND,
-                               "%s: No such port on source %s.", port_name, d->source->name);
-        return;
-    }
-
-    port_path = pa_dbusiface_device_port_get_path(port);
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &port_path);
-}
-
-static void handle_sink_get_monitor_source(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *monitor_source = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-    pa_assert(d->type == DEVICE_TYPE_SINK);
-
-    monitor_source = pa_dbusiface_core_get_source_path(d->core, d->sink->monitor_source);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &monitor_source);
-}
-
-static void handle_sink_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    const char *monitor_source = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-    pa_assert(d->type == DEVICE_TYPE_SINK);
-
-    monitor_source = pa_dbusiface_core_get_source_path(d->core, d->sink->monitor_source);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[SINK_PROPERTY_HANDLER_MONITOR_SOURCE].property_name, DBUS_TYPE_OBJECT_PATH, &monitor_source);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-}
-
-static void handle_source_get_monitor_of_sink(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    const char *monitor_of_sink = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-    pa_assert(d->type == DEVICE_TYPE_SOURCE);
-
-    if (!d->source->monitor_of) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Source %s is not a monitor source.", d->source->name);
-        return;
-    }
-
-    monitor_of_sink = pa_dbusiface_core_get_sink_path(d->core, d->source->monitor_of);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &monitor_of_sink);
-}
-
-static void handle_source_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    const char *monitor_of_sink = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(d);
-    pa_assert(d->type == DEVICE_TYPE_SOURCE);
-
-    if (d->source->monitor_of)
-        monitor_of_sink = pa_dbusiface_core_get_sink_path(d->core, d->source->monitor_of);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    if (monitor_of_sink)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[SOURCE_PROPERTY_HANDLER_MONITOR_OF_SINK].property_name, DBUS_TYPE_OBJECT_PATH, &monitor_of_sink);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-}
-
-static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_device *d = userdata;
-    DBusMessage *signal_msg = NULL;
-    const pa_cvolume *new_volume = NULL;
-    pa_bool_t new_mute = FALSE;
-    pa_sink_state_t new_sink_state = 0;
-    pa_source_state_t new_source_state = 0;
-    pa_device_port *new_active_port = NULL;
-    pa_proplist *new_proplist = NULL;
-    unsigned i = 0;
-
-    pa_assert(c);
-    pa_assert(d);
-
-    if ((d->type == DEVICE_TYPE_SINK && idx != d->sink->index) || (d->type == DEVICE_TYPE_SOURCE && idx != d->source->index))
-        return;
-
-    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
-        return;
-
-    pa_assert(((d->type == DEVICE_TYPE_SINK)
-                && ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SINK))
-              || ((d->type == DEVICE_TYPE_SOURCE)
-                   && ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE)));
-
-    new_volume = (d->type == DEVICE_TYPE_SINK)
-                 ? pa_sink_get_volume(d->sink, FALSE)
-                 : pa_source_get_volume(d->source, FALSE);
-
-    if (!pa_cvolume_equal(&d->volume, new_volume)) {
-        dbus_uint32_t volume[PA_CHANNELS_MAX];
-        dbus_uint32_t *volume_ptr = volume;
-
-        d->volume = *new_volume;
-
-        for (i = 0; i < d->volume.channels; ++i)
-            volume[i] = d->volume.values[i];
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-							  PA_DBUSIFACE_DEVICE_INTERFACE,
-							  signals[SIGNAL_VOLUME_UPDATED].name));
-        pa_assert_se(dbus_message_append_args(signal_msg,
-                                              DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &volume_ptr, d->volume.channels,
-                                              DBUS_TYPE_INVALID));
-
-        pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-
-    new_mute = (d->type == DEVICE_TYPE_SINK) ? pa_sink_get_mute(d->sink, FALSE) : pa_source_get_mute(d->source, FALSE);
-
-    if (d->mute != new_mute) {
-        d->mute = new_mute;
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-							  PA_DBUSIFACE_DEVICE_INTERFACE,
-							  signals[SIGNAL_MUTE_UPDATED].name));
-        pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &d->mute, DBUS_TYPE_INVALID));
-
-        pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-
-    if (d->type == DEVICE_TYPE_SINK)
-        new_sink_state = pa_sink_get_state(d->sink);
-    else
-        new_source_state = pa_source_get_state(d->source);
-
-    if ((d->type == DEVICE_TYPE_SINK && d->sink_state != new_sink_state)
-        || (d->type == DEVICE_TYPE_SOURCE && d->source_state != new_source_state)) {
-        dbus_uint32_t state = 0;
-
-        if (d->type == DEVICE_TYPE_SINK)
-            d->sink_state = new_sink_state;
-        else
-            d->source_state = new_source_state;
-
-        state = (d->type == DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-							  PA_DBUSIFACE_DEVICE_INTERFACE,
-							  signals[SIGNAL_STATE_UPDATED].name));
-        pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID));
-
-        pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-
-    new_active_port = (d->type == DEVICE_TYPE_SINK) ? d->sink->active_port : d->source->active_port;
-
-    if (d->active_port != new_active_port) {
-        const char *object_path = NULL;
-
-        d->active_port = new_active_port;
-        object_path = pa_dbusiface_device_port_get_path(pa_hashmap_get(d->ports, d->active_port->name));
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-							  PA_DBUSIFACE_DEVICE_INTERFACE,
-							  signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
-        pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
-
-        pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-
-    new_proplist = (d->type == DEVICE_TYPE_SINK) ? d->sink->proplist : d->source->proplist;
-
-    if (!pa_proplist_equal(d->proplist, new_proplist)) {
-        DBusMessageIter msg_iter;
-
-        pa_proplist_update(d->proplist, PA_UPDATE_SET, new_proplist);
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-							  PA_DBUSIFACE_DEVICE_INTERFACE,
-							  signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
-        dbus_message_iter_init_append(signal_msg, &msg_iter);
-        pa_dbus_append_proplist(&msg_iter, d->proplist);
-
-        pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-}
-
-pa_dbusiface_device *pa_dbusiface_device_new_sink(pa_dbusiface_core *core, pa_sink *sink) {
-    pa_dbusiface_device *d = NULL;
-
-    pa_assert(core);
-    pa_assert(sink);
-
-    d = pa_xnew0(pa_dbusiface_device, 1);
-    d->core = core;
-    d->sink = pa_sink_ref(sink);
-    d->type = DEVICE_TYPE_SINK;
-    d->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, SINK_OBJECT_NAME, sink->index);
-    d->volume = *pa_sink_get_volume(sink, FALSE);
-    d->mute = pa_sink_get_mute(sink, FALSE);
-    d->sink_state = pa_sink_get_state(sink);
-    d->ports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    d->next_port_index = 0;
-    d->active_port = NULL;
-    d->proplist = pa_proplist_copy(sink->proplist);
-    d->dbus_protocol = pa_dbus_protocol_get(sink->core);
-    d->subscription = pa_subscription_new(sink->core, PA_SUBSCRIPTION_MASK_SINK, subscription_cb, d);
-
-    if (sink->ports) {
-        pa_device_port *port;
-        void *state = NULL;
-
-        PA_HASHMAP_FOREACH(port, sink->ports, state) {
-            pa_dbusiface_device_port *p = pa_dbusiface_device_port_new(d, sink->core, port, d->next_port_index++);
-            pa_hashmap_put(d->ports, pa_dbusiface_device_port_get_name(p), p);
-        }
-        pa_assert_se(d->active_port = sink->active_port);
-    }
-
-    pa_assert_se(pa_dbus_protocol_add_interface(d->dbus_protocol, d->path, &device_interface_info, d) >= 0);
-    pa_assert_se(pa_dbus_protocol_add_interface(d->dbus_protocol, d->path, &sink_interface_info, d) >= 0);
-
-    return d;
-}
-
-pa_dbusiface_device *pa_dbusiface_device_new_source(pa_dbusiface_core *core, pa_source *source) {
-    pa_dbusiface_device *d = NULL;
-
-    pa_assert(core);
-    pa_assert(source);
-
-    d = pa_xnew0(pa_dbusiface_device, 1);
-    d->core = core;
-    d->source = pa_source_ref(source);
-    d->type = DEVICE_TYPE_SOURCE;
-    d->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, SOURCE_OBJECT_NAME, source->index);
-    d->volume = *pa_source_get_volume(source, FALSE);
-    d->mute = pa_source_get_mute(source, FALSE);
-    d->source_state = pa_source_get_state(source);
-    d->ports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    d->next_port_index = 0;
-    d->active_port = NULL;
-    d->proplist = pa_proplist_copy(source->proplist);
-    d->dbus_protocol = pa_dbus_protocol_get(source->core);
-    d->subscription = pa_subscription_new(source->core, PA_SUBSCRIPTION_MASK_SOURCE, subscription_cb, d);
-
-    if (source->ports) {
-        pa_device_port *port;
-        void *state = NULL;
-
-        PA_HASHMAP_FOREACH(port, source->ports, state) {
-            pa_dbusiface_device_port *p = pa_dbusiface_device_port_new(d, source->core, port, d->next_port_index++);
-            pa_hashmap_put(d->ports, pa_dbusiface_device_port_get_name(p), p);
-        }
-        pa_assert_se(d->active_port = source->active_port);
-    }
-
-    pa_assert_se(pa_dbus_protocol_add_interface(d->dbus_protocol, d->path, &device_interface_info, d) >= 0);
-    pa_assert_se(pa_dbus_protocol_add_interface(d->dbus_protocol, d->path, &source_interface_info, d) >= 0);
-
-    return d;
-}
-
-static void port_free_cb(void *p, void *userdata) {
-    pa_dbusiface_device_port *port = p;
-
-    pa_assert(port);
-
-    pa_dbusiface_device_port_free(port);
-}
-
-void pa_dbusiface_device_free(pa_dbusiface_device *d) {
-    pa_assert(d);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(d->dbus_protocol, d->path, device_interface_info.name) >= 0);
-
-    if (d->type == DEVICE_TYPE_SINK) {
-        pa_assert_se(pa_dbus_protocol_remove_interface(d->dbus_protocol, d->path, sink_interface_info.name) >= 0);
-        pa_sink_unref(d->sink);
-
-    } else {
-        pa_assert_se(pa_dbus_protocol_remove_interface(d->dbus_protocol, d->path, source_interface_info.name) >= 0);
-        pa_source_unref(d->source);
-    }
-    pa_hashmap_free(d->ports, port_free_cb, NULL);
-    pa_proplist_free(d->proplist);
-    pa_dbus_protocol_unref(d->dbus_protocol);
-    pa_subscription_free(d->subscription);
-
-    pa_xfree(d->path);
-    pa_xfree(d);
-}
-
-const char *pa_dbusiface_device_get_path(pa_dbusiface_device *d) {
-    pa_assert(d);
-
-    return d->path;
-}
-
-pa_sink *pa_dbusiface_device_get_sink(pa_dbusiface_device *d) {
-    pa_assert(d);
-    pa_assert(d->type == DEVICE_TYPE_SINK);
-
-    return d->sink;
-}
-
-pa_source *pa_dbusiface_device_get_source(pa_dbusiface_device *d) {
-    pa_assert(d);
-    pa_assert(d->type == DEVICE_TYPE_SOURCE);
-
-    return d->source;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-#ifndef foodbusifacedevicehfoo
-#define foodbusifacedevicehfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interfaces org.PulseAudio.Core1.Device,
- * org.PulseAudio.Core1.Sink and org.PulseAudio.Core1.Source.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the interface
- * documentation.
- */
-
-#include <pulsecore/protocol-dbus.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/source.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_DEVICE_INTERFACE PA_DBUS_CORE_INTERFACE ".Device"
-#define PA_DBUSIFACE_SINK_INTERFACE PA_DBUS_CORE_INTERFACE ".Sink"
-#define PA_DBUSIFACE_SOURCE_INTERFACE PA_DBUS_CORE_INTERFACE ".Source"
-
-typedef struct pa_dbusiface_device pa_dbusiface_device;
-
-pa_dbusiface_device *pa_dbusiface_device_new_sink(pa_dbusiface_core *core, pa_sink *sink);
-pa_dbusiface_device *pa_dbusiface_device_new_source(pa_dbusiface_core *core, pa_source *source);
-void pa_dbusiface_device_free(pa_dbusiface_device *d);
-
-const char *pa_dbusiface_device_get_path(pa_dbusiface_device *d);
-
-pa_sink *pa_dbusiface_device_get_sink(pa_dbusiface_device *d);
-pa_source *pa_dbusiface_device_get_source(pa_dbusiface_device *d);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device-port.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device-port.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device-port.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device-port.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,190 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-
-#include "iface-device-port.h"
-
-#define OBJECT_NAME "port"
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_description(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_priority(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-struct pa_dbusiface_device_port {
-    uint32_t index;
-    pa_device_port *port;
-    char *path;
-    pa_dbus_protocol *dbus_protocol;
-};
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_DESCRIPTION,
-    PROPERTY_HANDLER_PRIORITY,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]       = { .property_name = "Index",       .type = "u", .get_cb = handle_get_index,       .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]        = { .property_name = "Name",        .type = "s", .get_cb = handle_get_name,        .set_cb = NULL },
-    [PROPERTY_HANDLER_DESCRIPTION] = { .property_name = "Description", .type = "s", .get_cb = handle_get_description, .set_cb = NULL },
-    [PROPERTY_HANDLER_PRIORITY]    = { .property_name = "Priority",    .type = "u", .get_cb = handle_get_priority,    .set_cb = NULL },
-};
-
-static pa_dbus_interface_info port_interface_info = {
-    .name = PA_DBUSIFACE_DEVICE_PORT_INTERFACE,
-    .method_handlers = NULL,
-    .n_method_handlers = 0,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = NULL,
-    .n_signals = 0
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device_port *p = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &p->index);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device_port *p = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &p->port->name);
-}
-
-static void handle_get_description(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device_port *p = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &p->port->description);
-}
-
-static void handle_get_priority(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device_port *p = userdata;
-    dbus_uint32_t priority = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    priority = p->port->priority;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &priority);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_device_port *p = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t priority = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(p);
-
-    priority = p->port->priority;
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &p->index);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &p->port->name);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DESCRIPTION].property_name, DBUS_TYPE_STRING, &p->port->description);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PRIORITY].property_name, DBUS_TYPE_UINT32, &priority);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-pa_dbusiface_device_port *pa_dbusiface_device_port_new(
-        pa_dbusiface_device *device,
-        pa_core *core,
-        pa_device_port *port,
-        uint32_t idx) {
-    pa_dbusiface_device_port *p = NULL;
-
-    pa_assert(device);
-    pa_assert(core);
-    pa_assert(port);
-
-    p = pa_xnew(pa_dbusiface_device_port, 1);
-    p->index = idx;
-    p->port = port;
-    p->path = pa_sprintf_malloc("%s/%s%u", pa_dbusiface_device_get_path(device), OBJECT_NAME, idx);
-    p->dbus_protocol = pa_dbus_protocol_get(core);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(p->dbus_protocol, p->path, &port_interface_info, p) >= 0);
-
-    return p;
-}
-
-void pa_dbusiface_device_port_free(pa_dbusiface_device_port *p) {
-    pa_assert(p);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(p->dbus_protocol, p->path, port_interface_info.name) >= 0);
-
-    pa_dbus_protocol_unref(p->dbus_protocol);
-
-    pa_xfree(p->path);
-    pa_xfree(p);
-}
-
-const char *pa_dbusiface_device_port_get_path(pa_dbusiface_device_port *p) {
-    pa_assert(p);
-
-    return p->path;
-}
-
-const char *pa_dbusiface_device_port_get_name(pa_dbusiface_device_port *p) {
-    pa_assert(p);
-
-    return p->port->name;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device-port.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device-port.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-device-port.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-device-port.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-#ifndef foodbusifacedeviceporthfoo
-#define foodbusifacedeviceporthfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.DevicePort.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the DevicePort interface
- * documentation.
- */
-
-#include <pulsecore/protocol-dbus.h>
-#include <pulsecore/sink.h>
-
-#include "iface-device.h"
-
-#define PA_DBUSIFACE_DEVICE_PORT_INTERFACE PA_DBUS_CORE_INTERFACE ".DevicePort"
-
-typedef struct pa_dbusiface_device_port pa_dbusiface_device_port;
-
-pa_dbusiface_device_port *pa_dbusiface_device_port_new(
-        pa_dbusiface_device *device,
-        pa_core *core,
-        pa_device_port *port,
-        uint32_t idx);
-void pa_dbusiface_device_port_free(pa_dbusiface_device_port *p);
-
-const char *pa_dbusiface_device_port_get_path(pa_dbusiface_device_port *p);
-const char *pa_dbusiface_device_port_get_name(pa_dbusiface_device_port *p);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-memstats.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-memstats.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-memstats.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-memstats.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,231 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulsecore/core-scache.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-memstats.h"
-
-#define OBJECT_NAME "memstats"
-
-static void handle_get_current_memblocks(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_current_memblocks_size(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_accumulated_memblocks(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_accumulated_memblocks_size(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_cache_size(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-struct pa_dbusiface_memstats {
-    pa_core *core;
-    char *path;
-    pa_dbus_protocol *dbus_protocol;
-};
-
-enum property_handler_index {
-    PROPERTY_HANDLER_CURRENT_MEMBLOCKS,
-    PROPERTY_HANDLER_CURRENT_MEMBLOCKS_SIZE,
-    PROPERTY_HANDLER_ACCUMULATED_MEMBLOCKS,
-    PROPERTY_HANDLER_ACCUMULATED_MEMBLOCKS_SIZE,
-    PROPERTY_HANDLER_SAMPLE_CACHE_SIZE,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_CURRENT_MEMBLOCKS]          = { .property_name = "CurrentMemblocks",         .type = "u", .get_cb = handle_get_current_memblocks,          .set_cb = NULL },
-    [PROPERTY_HANDLER_CURRENT_MEMBLOCKS_SIZE]     = { .property_name = "CurrentMemblocksSize",     .type = "u", .get_cb = handle_get_current_memblocks_size,     .set_cb = NULL },
-    [PROPERTY_HANDLER_ACCUMULATED_MEMBLOCKS]      = { .property_name = "AccumulatedMemblocks",     .type = "u", .get_cb = handle_get_accumulated_memblocks,      .set_cb = NULL },
-    [PROPERTY_HANDLER_ACCUMULATED_MEMBLOCKS_SIZE] = { .property_name = "AccumulatedMemblocksSize", .type = "u", .get_cb = handle_get_accumulated_memblocks_size, .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_CACHE_SIZE]          = { .property_name = "SampleCacheSize",          .type = "u", .get_cb = handle_get_sample_cache_size,          .set_cb = NULL }
-};
-
-static pa_dbus_interface_info memstats_interface_info = {
-    .name = PA_DBUSIFACE_MEMSTATS_INTERFACE,
-    .method_handlers = NULL,
-    .n_method_handlers = 0,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = NULL,
-    .n_signals = 0
-};
-
-static void handle_get_current_memblocks(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_memstats *m = userdata;
-    const pa_mempool_stat *stat;
-    dbus_uint32_t current_memblocks;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    stat = pa_mempool_get_stat(m->core->mempool);
-
-    current_memblocks = pa_atomic_load(&stat->n_allocated);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &current_memblocks);
-}
-
-static void handle_get_current_memblocks_size(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_memstats *m = userdata;
-    const pa_mempool_stat *stat;
-    dbus_uint32_t current_memblocks_size;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    stat = pa_mempool_get_stat(m->core->mempool);
-
-    current_memblocks_size = pa_atomic_load(&stat->allocated_size);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &current_memblocks_size);
-}
-
-static void handle_get_accumulated_memblocks(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_memstats *m = userdata;
-    const pa_mempool_stat *stat;
-    dbus_uint32_t accumulated_memblocks;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    stat = pa_mempool_get_stat(m->core->mempool);
-
-    accumulated_memblocks = pa_atomic_load(&stat->n_accumulated);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &accumulated_memblocks);
-}
-
-static void handle_get_accumulated_memblocks_size(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_memstats *m = userdata;
-    const pa_mempool_stat *stat;
-    dbus_uint32_t accumulated_memblocks_size;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    stat = pa_mempool_get_stat(m->core->mempool);
-
-    accumulated_memblocks_size = pa_atomic_load(&stat->accumulated_size);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &accumulated_memblocks_size);
-}
-
-static void handle_get_sample_cache_size(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_memstats *m = userdata;
-    dbus_uint32_t sample_cache_size;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    sample_cache_size = pa_scache_total_size(m->core);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sample_cache_size);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_memstats *m = userdata;
-    const pa_mempool_stat *stat;
-    dbus_uint32_t current_memblocks;
-    dbus_uint32_t current_memblocks_size;
-    dbus_uint32_t accumulated_memblocks;
-    dbus_uint32_t accumulated_memblocks_size;
-    dbus_uint32_t sample_cache_size;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    stat = pa_mempool_get_stat(m->core->mempool);
-
-    current_memblocks = pa_atomic_load(&stat->n_allocated);
-    current_memblocks_size = pa_atomic_load(&stat->allocated_size);
-    accumulated_memblocks = pa_atomic_load(&stat->n_accumulated);
-    accumulated_memblocks_size = pa_atomic_load(&stat->accumulated_size);
-    sample_cache_size = pa_scache_total_size(m->core);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CURRENT_MEMBLOCKS].property_name, DBUS_TYPE_UINT32, &current_memblocks);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CURRENT_MEMBLOCKS_SIZE].property_name, DBUS_TYPE_UINT32, &current_memblocks_size);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ACCUMULATED_MEMBLOCKS].property_name, DBUS_TYPE_UINT32, &accumulated_memblocks);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ACCUMULATED_MEMBLOCKS_SIZE].property_name, DBUS_TYPE_UINT32, &accumulated_memblocks_size);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_CACHE_SIZE].property_name, DBUS_TYPE_UINT32, &sample_cache_size);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-}
-
-pa_dbusiface_memstats *pa_dbusiface_memstats_new(pa_dbusiface_core *dbus_core, pa_core *core) {
-    pa_dbusiface_memstats *m;
-
-    pa_assert(dbus_core);
-    pa_assert(core);
-
-    m = pa_xnew(pa_dbusiface_memstats, 1);
-    m->core = pa_core_ref(core);
-    m->path = pa_sprintf_malloc("%s/%s", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME);
-    m->dbus_protocol = pa_dbus_protocol_get(core);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(m->dbus_protocol, m->path, &memstats_interface_info, m) >= 0);
-
-    return m;
-}
-
-void pa_dbusiface_memstats_free(pa_dbusiface_memstats *m) {
-    pa_assert(m);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(m->dbus_protocol, m->path, memstats_interface_info.name) >= 0);
-
-    pa_xfree(m->path);
-
-    pa_dbus_protocol_unref(m->dbus_protocol);
-    pa_core_unref(m->core);
-
-    pa_xfree(m);
-}
-
-const char *pa_dbusiface_memstats_get_path(pa_dbusiface_memstats *m) {
-    pa_assert(m);
-
-    return m->path;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-memstats.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-memstats.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-memstats.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-memstats.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#ifndef foodbusifacememstatshfoo
-#define foodbusifacememstatshfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.Memstats.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Memstats interface
- * documentation.
- */
-
-#include <pulsecore/core.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_MEMSTATS_INTERFACE PA_DBUS_CORE_INTERFACE ".Memstats"
-
-typedef struct pa_dbusiface_memstats pa_dbusiface_memstats;
-
-pa_dbusiface_memstats *pa_dbusiface_memstats_new(pa_dbusiface_core *dbus_core, pa_core *core);
-void pa_dbusiface_memstats_free(pa_dbusiface_memstats *m);
-
-const char *pa_dbusiface_memstats_get_path(pa_dbusiface_memstats *m);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-module.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-module.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-module.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-module.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,336 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-module.h"
-
-#define OBJECT_NAME "module"
-
-struct pa_dbusiface_module {
-    pa_module *module;
-    char *path;
-    pa_proplist *proplist;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_subscription *subscription;
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_arguments(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_usage_counter(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_unload(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_ARGUMENTS,
-    PROPERTY_HANDLER_USAGE_COUNTER,
-    PROPERTY_HANDLER_PROPERTY_LIST,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]         = { .property_name = "Index",        .type = "u",      .get_cb = handle_get_index,         .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]          = { .property_name = "Name",         .type = "s",      .get_cb = handle_get_name,          .set_cb = NULL },
-    [PROPERTY_HANDLER_ARGUMENTS]     = { .property_name = "Arguments",    .type = "a{ss}",  .get_cb = handle_get_arguments,     .set_cb = NULL },
-    [PROPERTY_HANDLER_USAGE_COUNTER] = { .property_name = "UsageCounter", .type = "u",      .get_cb = handle_get_usage_counter, .set_cb = NULL },
-    [PROPERTY_HANDLER_PROPERTY_LIST] = { .property_name = "PropertyList", .type = "a{say}", .get_cb = handle_get_property_list, .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_UNLOAD,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_UNLOAD] = {
-        .method_name = "Unload",
-        .arguments = NULL,
-        .n_arguments = 0,
-        .receive_cb = handle_unload }
-};
-
-enum signal_index {
-    SIGNAL_PROPERTY_LIST_UPDATED,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info property_list_updated_args[] =  { { "property_list", "a{say}", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info module_interface_info = {
-    .name = PA_DBUSIFACE_MODULE_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-    dbus_uint32_t idx = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    idx = m->module->index;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &m->module->name);
-}
-
-static void append_modargs_variant(DBusMessageIter *iter, pa_dbusiface_module *m) {
-    pa_modargs *ma = NULL;
-    DBusMessageIter variant_iter;
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    void *state = NULL;
-    const char *key = NULL;
-    const char *value = NULL;
-
-    pa_assert(iter);
-    pa_assert(m);
-
-    pa_assert_se(ma = pa_modargs_new(m->module->argument, NULL));
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "a{ss}", &variant_iter));
-    pa_assert_se(dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_ARRAY, "{ss}", &dict_iter));
-
-    for (state = NULL, key = pa_modargs_iterate(ma, &state); key; key = pa_modargs_iterate(ma, &state)) {
-        pa_assert_se(value = pa_modargs_get_value(ma, key, NULL));
-
-        pa_assert_se(dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-
-        pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &key));
-        pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &value));
-
-        pa_assert_se(dbus_message_iter_close_container(&dict_iter, &dict_entry_iter));
-    }
-
-    pa_assert_se(dbus_message_iter_close_container(&variant_iter, &dict_iter));
-    pa_assert_se(dbus_message_iter_close_container(iter, &variant_iter));
-
-    pa_modargs_free(ma);
-}
-
-static void handle_get_arguments(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    pa_assert_se(reply = dbus_message_new_method_return(msg));
-    dbus_message_iter_init_append(reply, &msg_iter);
-    append_modargs_variant(&msg_iter, m);
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-static void handle_get_usage_counter(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-    int real_counter_value = -1;
-    dbus_uint32_t usage_counter = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    if (!m->module->get_n_used || (real_counter_value = m->module->get_n_used(m->module)) < 0) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Module %u (%s) doesn't have a usage counter.", m->module->index, m->module->name);
-        return;
-    }
-
-    usage_counter = real_counter_value;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &usage_counter);
-}
-
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    pa_dbus_send_proplist_variant_reply(conn, msg, m->proplist);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    dbus_uint32_t idx = 0;
-    int real_counter_value = -1;
-    dbus_uint32_t usage_counter = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    idx = m->module->index;
-    if (m->module->get_n_used && (real_counter_value = m->module->get_n_used(m->module)) >= 0)
-        usage_counter = real_counter_value;
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &idx);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &m->module->name);
-
-    pa_assert_se(dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-    pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &property_handlers[PROPERTY_HANDLER_ARGUMENTS].property_name));
-    append_modargs_variant(&dict_entry_iter, m);
-    pa_assert_se(dbus_message_iter_close_container(&dict_iter, &dict_entry_iter));
-
-    if (real_counter_value >= 0)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ARGUMENTS].property_name, DBUS_TYPE_UINT32, &usage_counter);
-
-    pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, m->proplist);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-}
-
-static void handle_unload(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(m);
-
-    if (m->module->core->disallow_module_loading) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_ACCESS_DENIED, "The server is configured to disallow module unloading.");
-        return;
-    }
-
-    pa_module_unload_request(m->module, FALSE);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_module *m = userdata;
-    DBusMessage *signal_msg = NULL;
-
-    pa_assert(core);
-    pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_MODULE);
-    pa_assert(m);
-
-    /* We can't use idx != m->module->index, because the m->module pointer may
-     * be stale at this point. */
-    if (pa_idxset_get_by_index(core->modules, idx) != m->module)
-        return;
-
-    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
-        return;
-
-    if (!pa_proplist_equal(m->proplist, m->module->proplist)) {
-        DBusMessageIter msg_iter;
-
-        pa_proplist_update(m->proplist, PA_UPDATE_SET, m->module->proplist);
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(m->path,
-							  PA_DBUSIFACE_MODULE_INTERFACE,
-							  signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
-        dbus_message_iter_init_append(signal_msg, &msg_iter);
-        pa_dbus_append_proplist(&msg_iter, m->proplist);
-
-        pa_dbus_protocol_send_signal(m->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-}
-
-pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module) {
-    pa_dbusiface_module *m;
-
-    pa_assert(module);
-
-    m = pa_xnew0(pa_dbusiface_module, 1);
-    m->module = module;
-    m->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, module->index);
-    m->proplist = pa_proplist_copy(module->proplist);
-    m->dbus_protocol = pa_dbus_protocol_get(module->core);
-    m->subscription = pa_subscription_new(module->core, PA_SUBSCRIPTION_MASK_MODULE, subscription_cb, m);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(m->dbus_protocol, m->path, &module_interface_info, m) >= 0);
-
-    return m;
-}
-
-void pa_dbusiface_module_free(pa_dbusiface_module *m) {
-    pa_assert(m);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(m->dbus_protocol, m->path, module_interface_info.name) >= 0);
-
-    pa_proplist_free(m->proplist);
-    pa_dbus_protocol_unref(m->dbus_protocol);
-    pa_subscription_free(m->subscription);
-
-    pa_xfree(m->path);
-    pa_xfree(m);
-}
-
-const char *pa_dbusiface_module_get_path(pa_dbusiface_module *m) {
-    pa_assert(m);
-
-    return m->path;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-module.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-module.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-module.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-module.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#ifndef foodbusifacemodulehfoo
-#define foodbusifacemodulehfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.Module.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Module interface
- * documentation.
- */
-
-#include <pulsecore/module.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_MODULE_INTERFACE PA_DBUS_CORE_INTERFACE ".Module"
-
-typedef struct pa_dbusiface_module pa_dbusiface_module;
-
-pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module);
-void pa_dbusiface_module_free(pa_dbusiface_module *m);
-
-const char *pa_dbusiface_module_get_path(pa_dbusiface_module *m);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-sample.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-sample.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-sample.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-sample.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,519 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/namereg.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-sample.h"
-
-#define OBJECT_NAME "sample"
-
-struct pa_dbusiface_sample {
-    pa_dbusiface_core *core;
-
-    pa_scache_entry *sample;
-    char *path;
-    pa_proplist *proplist;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_subscription *subscription;
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_channels(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_default_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_duration(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_bytes(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_play(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_play_to_sink(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_remove(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_NAME,
-    PROPERTY_HANDLER_SAMPLE_FORMAT,
-    PROPERTY_HANDLER_SAMPLE_RATE,
-    PROPERTY_HANDLER_CHANNELS,
-    PROPERTY_HANDLER_DEFAULT_VOLUME,
-    PROPERTY_HANDLER_DURATION,
-    PROPERTY_HANDLER_BYTES,
-    PROPERTY_HANDLER_PROPERTY_LIST,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]          = { .property_name = "Index",         .type = "u",      .get_cb = handle_get_index,          .set_cb = NULL },
-    [PROPERTY_HANDLER_NAME]           = { .property_name = "Name",          .type = "s",      .get_cb = handle_get_name,           .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_FORMAT]  = { .property_name = "SampleFormat",  .type = "u",      .get_cb = handle_get_sample_format,  .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_RATE]    = { .property_name = "SampleRate",    .type = "u",      .get_cb = handle_get_sample_rate,    .set_cb = NULL },
-    [PROPERTY_HANDLER_CHANNELS]       = { .property_name = "Channels",      .type = "au",     .get_cb = handle_get_channels,       .set_cb = NULL },
-    [PROPERTY_HANDLER_DEFAULT_VOLUME] = { .property_name = "DefaultVolume", .type = "au",     .get_cb = handle_get_default_volume, .set_cb = NULL },
-    [PROPERTY_HANDLER_DURATION]       = { .property_name = "Duration",      .type = "t",      .get_cb = handle_get_duration,       .set_cb = NULL },
-    [PROPERTY_HANDLER_BYTES]          = { .property_name = "Bytes",         .type = "u",      .get_cb = handle_get_bytes,          .set_cb = NULL },
-    [PROPERTY_HANDLER_PROPERTY_LIST]  = { .property_name = "PropertyList",  .type = "a{say}", .get_cb = handle_get_property_list,  .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_PLAY,
-    METHOD_HANDLER_PLAY_TO_SINK,
-    METHOD_HANDLER_REMOVE,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info play_args[] = { { "volume", "u", "in" }, { "property_list", "a{say}", "in" } };
-static pa_dbus_arg_info play_to_sink_args[] = { { "sink",          "o",      "in" },
-                                                { "volume",        "u",      "in" },
-                                                { "property_list", "a{say}", "in" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_PLAY] = {
-        .method_name = "Play",
-        .arguments = play_args,
-        .n_arguments = sizeof(play_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_play },
-    [METHOD_HANDLER_PLAY_TO_SINK] = {
-        .method_name = "PlayToSink",
-        .arguments = play_to_sink_args,
-        .n_arguments = sizeof(play_to_sink_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_play_to_sink },
-    [METHOD_HANDLER_REMOVE] = {
-        .method_name = "Remove",
-        .arguments = NULL,
-        .n_arguments = 0,
-        .receive_cb = handle_remove }
-};
-
-enum signal_index {
-    SIGNAL_PROPERTY_LIST_UPDATED,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info property_list_updated_args[] = { { "property_list", "a{say}", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info sample_interface_info = {
-    .name = PA_DBUSIFACE_SAMPLE_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint32_t idx = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    idx = s->sample->index;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
-}
-
-static void handle_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &s->sample->name);
-}
-
-static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint32_t sample_format = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (!s->sample->memchunk.memblock) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sample %s isn't loaded into memory yet, so its sample format is unknown.", s->sample->name);
-        return;
-    }
-
-    sample_format = s->sample->sample_spec.format;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sample_format);
-}
-
-static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint32_t sample_rate = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (!s->sample->memchunk.memblock) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sample %s isn't loaded into memory yet, so its sample rate is unknown.", s->sample->name);
-        return;
-    }
-
-    sample_rate = s->sample->sample_spec.rate;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sample_rate);
-}
-
-static void handle_get_channels(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint32_t channels[PA_CHANNELS_MAX];
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (!s->sample->memchunk.memblock) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sample %s isn't loaded into memory yet, so its channel map is unknown.", s->sample->name);
-        return;
-    }
-
-    for (i = 0; i < s->sample->channel_map.channels; ++i)
-        channels[i] = s->sample->channel_map.map[i];
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, channels, s->sample->channel_map.channels);
-}
-
-static void handle_get_default_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint32_t default_volume[PA_CHANNELS_MAX];
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (!s->sample->volume_is_set) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sample %s doesn't have default volume stored.", s->sample->name);
-        return;
-    }
-
-    for (i = 0; i < s->sample->volume.channels; ++i)
-        default_volume[i] = s->sample->volume.values[i];
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, default_volume, s->sample->volume.channels);
-}
-
-static void handle_get_duration(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint64_t duration = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (!s->sample->memchunk.memblock) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sample %s isn't loaded into memory yet, so its duration is unknown.", s->sample->name);
-        return;
-    }
-
-    duration = pa_bytes_to_usec(s->sample->memchunk.length, &s->sample->sample_spec);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT64, &duration);
-}
-
-static void handle_get_bytes(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    dbus_uint32_t bytes = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (!s->sample->memchunk.memblock) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                           "Sample %s isn't loaded into memory yet, so its size is unknown.", s->sample->name);
-        return;
-    }
-
-    bytes = s->sample->memchunk.length;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &bytes);
-}
-
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_dbus_send_proplist_variant_reply(conn, msg, s->proplist);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t idx = 0;
-    dbus_uint32_t sample_format = 0;
-    dbus_uint32_t sample_rate = 0;
-    dbus_uint32_t channels[PA_CHANNELS_MAX];
-    dbus_uint32_t default_volume[PA_CHANNELS_MAX];
-    dbus_uint64_t duration = 0;
-    dbus_uint32_t bytes = 0;
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    idx = s->sample->index;
-    if (s->sample->memchunk.memblock) {
-        sample_format = s->sample->sample_spec.format;
-        sample_rate = s->sample->sample_spec.rate;
-        for (i = 0; i < s->sample->channel_map.channels; ++i)
-            channels[i] = s->sample->channel_map.map[i];
-        duration = pa_bytes_to_usec(s->sample->memchunk.length, &s->sample->sample_spec);
-        bytes = s->sample->memchunk.length;
-    }
-    if (s->sample->volume_is_set) {
-        for (i = 0; i < s->sample->volume.channels; ++i)
-            default_volume[i] = s->sample->volume.values[i];
-    }
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &idx);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &s->sample->name);
-
-    if (s->sample->memchunk.memblock) {
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_FORMAT].property_name, DBUS_TYPE_UINT32, &sample_format);
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_RATE].property_name, DBUS_TYPE_UINT32, &sample_rate);
-        pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CHANNELS].property_name, DBUS_TYPE_UINT32, channels, s->sample->channel_map.channels);
-    }
-
-    if (s->sample->volume_is_set)
-        pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DEFAULT_VOLUME].property_name, DBUS_TYPE_UINT32, default_volume, s->sample->volume.channels);
-
-    if (s->sample->memchunk.memblock) {
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DURATION].property_name, DBUS_TYPE_UINT64, &duration);
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_BYTES].property_name, DBUS_TYPE_UINT32, &bytes);
-    }
-
-    pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, s->proplist);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-static void handle_play(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    DBusMessageIter msg_iter;
-    dbus_uint32_t volume = 0;
-    pa_proplist *property_list = NULL;
-    pa_sink *sink = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_assert_se(dbus_message_iter_init(msg, &msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &volume);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    if (!(property_list = pa_dbus_get_proplist_arg(conn, msg, &msg_iter)))
-        return;
-
-    if (volume > PA_VOLUME_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume.");
-        goto finish;
-    }
-
-    if (!(sink = pa_namereg_get_default_sink(s->sample->core))) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
-                           "Can't play sample %s, because there are no sinks available.", s->sample->name);
-        goto finish;
-    }
-
-    if (pa_scache_play_item(s->sample->core, s->sample->name, sink, volume, property_list, NULL) < 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Playing sample %s failed.", s->sample->name);
-        goto finish;
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-finish:
-    if (property_list)
-        pa_proplist_free(property_list);
-}
-
-static void handle_play_to_sink(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    DBusMessageIter msg_iter;
-    const char *sink_path = NULL;
-    dbus_uint32_t volume = 0;
-    pa_proplist *property_list = NULL;
-    pa_sink *sink = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_assert_se(dbus_message_iter_init(msg, &msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &sink_path);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &volume);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    if (!(property_list = pa_dbus_get_proplist_arg(conn, msg, &msg_iter)))
-        return;
-
-    if (!(sink = pa_dbusiface_core_get_sink(s->core, sink_path))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such sink.", sink_path);
-        goto finish;
-    }
-
-    if (volume > PA_VOLUME_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume.");
-        goto finish;
-    }
-
-    if (pa_scache_play_item(s->sample->core, s->sample->name, sink, volume, property_list, NULL) < 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Playing sample %s failed.", s->sample->name);
-        goto finish;
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-finish:
-    if (property_list)
-        pa_proplist_free(property_list);
-}
-
-static void handle_remove(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (pa_scache_remove_item(s->sample->core, s->sample->name) < 0) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Removing sample %s failed.", s->sample->name);
-        return;
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_sample *s = userdata;
-    DBusMessage *signal_msg = NULL;
-
-    pa_assert(c);
-    pa_assert(s);
-
-    /* We can't use idx != s->sample->index, because the s->sample pointer may
-     * be stale at this point. */
-    if (pa_idxset_get_by_index(c->scache, idx) != s->sample)
-        return;
-
-    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
-        return;
-
-    if (!pa_proplist_equal(s->proplist, s->sample->proplist)) {
-        DBusMessageIter msg_iter;
-
-        pa_proplist_update(s->proplist, PA_UPDATE_SET, s->sample->proplist);
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							  PA_DBUSIFACE_SAMPLE_INTERFACE,
-							  signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
-        dbus_message_iter_init_append(signal_msg, &msg_iter);
-        pa_dbus_append_proplist(&msg_iter, s->proplist);
-
-        pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-}
-
-pa_dbusiface_sample *pa_dbusiface_sample_new(pa_dbusiface_core *core, pa_scache_entry *sample) {
-    pa_dbusiface_sample *s = NULL;
-
-    pa_assert(core);
-    pa_assert(sample);
-
-    s = pa_xnew0(pa_dbusiface_sample, 1);
-    s->core = core;
-    s->sample = sample;
-    s->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, sample->index);
-    s->proplist = pa_proplist_copy(sample->proplist);
-    s->dbus_protocol = pa_dbus_protocol_get(sample->core);
-    s->subscription = pa_subscription_new(sample->core, PA_SUBSCRIPTION_MASK_SAMPLE_CACHE, subscription_cb, s);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(s->dbus_protocol, s->path, &sample_interface_info, s) >= 0);
-
-    return s;
-}
-
-void pa_dbusiface_sample_free(pa_dbusiface_sample *s) {
-    pa_assert(s);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(s->dbus_protocol, s->path, sample_interface_info.name) >= 0);
-
-    pa_proplist_free(s->proplist);
-    pa_dbus_protocol_unref(s->dbus_protocol);
-    pa_subscription_free(s->subscription);
-
-    pa_xfree(s->path);
-    pa_xfree(s);
-}
-
-const char *pa_dbusiface_sample_get_path(pa_dbusiface_sample *s) {
-    pa_assert(s);
-
-    return s->path;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-sample.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-sample.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-sample.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-sample.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#ifndef foodbusifacesamplehfoo
-#define foodbusifacesamplehfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.Sample.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Sample interface
- * documentation.
- */
-
-#include <pulsecore/core-scache.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_SAMPLE_INTERFACE PA_DBUS_CORE_INTERFACE ".Sample"
-
-typedef struct pa_dbusiface_sample pa_dbusiface_sample;
-
-pa_dbusiface_sample *pa_dbusiface_sample_new(pa_dbusiface_core *core, pa_scache_entry *sample);
-void pa_dbusiface_sample_free(pa_dbusiface_sample *c);
-
-const char *pa_dbusiface_sample_get_path(pa_dbusiface_sample *c);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-stream.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-stream.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-stream.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-stream.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,894 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-  Copyright 2009 Vincent Filali-Ansary <filali.v@azurdigitalnetworks.net>
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-stream.h"
-
-#define PLAYBACK_OBJECT_NAME "playback_stream"
-#define RECORD_OBJECT_NAME "record_stream"
-
-enum stream_type {
-    STREAM_TYPE_PLAYBACK,
-    STREAM_TYPE_RECORD
-};
-
-struct pa_dbusiface_stream {
-    pa_dbusiface_core *core;
-
-    union {
-        pa_sink_input *sink_input;
-        pa_source_output *source_output;
-    };
-    enum stream_type type;
-    char *path;
-    union {
-        pa_sink *sink;
-        pa_source *source;
-    };
-    uint32_t sample_rate;
-    pa_cvolume volume;
-    dbus_bool_t mute;
-    pa_proplist *proplist;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_subscription *subscription;
-    pa_hook_slot *send_event_slot;
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_client(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_device(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_channels(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_mute(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_get_buffer_latency(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_device_latency(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_resample_method(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_move(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_kill(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INDEX,
-    PROPERTY_HANDLER_DRIVER,
-    PROPERTY_HANDLER_OWNER_MODULE,
-    PROPERTY_HANDLER_CLIENT,
-    PROPERTY_HANDLER_DEVICE,
-    PROPERTY_HANDLER_SAMPLE_FORMAT,
-    PROPERTY_HANDLER_SAMPLE_RATE,
-    PROPERTY_HANDLER_CHANNELS,
-    PROPERTY_HANDLER_VOLUME,
-    PROPERTY_HANDLER_MUTE,
-    PROPERTY_HANDLER_BUFFER_LATENCY,
-    PROPERTY_HANDLER_DEVICE_LATENCY,
-    PROPERTY_HANDLER_RESAMPLE_METHOD,
-    PROPERTY_HANDLER_PROPERTY_LIST,
-    PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INDEX]           = { .property_name = "Index",          .type = "u",      .get_cb = handle_get_index,           .set_cb = NULL },
-    [PROPERTY_HANDLER_DRIVER]          = { .property_name = "Driver",         .type = "s",      .get_cb = handle_get_driver,          .set_cb = NULL },
-    [PROPERTY_HANDLER_OWNER_MODULE]    = { .property_name = "OwnerModule",    .type = "o",      .get_cb = handle_get_owner_module,    .set_cb = NULL },
-    [PROPERTY_HANDLER_CLIENT]          = { .property_name = "Client",         .type = "o",      .get_cb = handle_get_client,          .set_cb = NULL },
-    [PROPERTY_HANDLER_DEVICE]          = { .property_name = "Device",         .type = "o",      .get_cb = handle_get_device,          .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_FORMAT]   = { .property_name = "SampleFormat",   .type = "u",      .get_cb = handle_get_sample_format,   .set_cb = NULL },
-    [PROPERTY_HANDLER_SAMPLE_RATE]     = { .property_name = "SampleRate",     .type = "u",      .get_cb = handle_get_sample_rate,     .set_cb = NULL },
-    [PROPERTY_HANDLER_CHANNELS]        = { .property_name = "Channels",       .type = "au",     .get_cb = handle_get_channels,        .set_cb = NULL },
-    [PROPERTY_HANDLER_VOLUME]          = { .property_name = "Volume",         .type = "au",     .get_cb = handle_get_volume,          .set_cb = handle_set_volume },
-    [PROPERTY_HANDLER_MUTE]            = { .property_name = "Mute",           .type = "b",      .get_cb = handle_get_mute,            .set_cb = handle_set_mute },
-    [PROPERTY_HANDLER_BUFFER_LATENCY]  = { .property_name = "BufferLatency",  .type = "t",      .get_cb = handle_get_buffer_latency,  .set_cb = NULL },
-    [PROPERTY_HANDLER_DEVICE_LATENCY]  = { .property_name = "DeviceLatency",  .type = "t",      .get_cb = handle_get_device_latency,  .set_cb = NULL },
-    [PROPERTY_HANDLER_RESAMPLE_METHOD] = { .property_name = "ResampleMethod", .type = "s",      .get_cb = handle_get_resample_method, .set_cb = NULL },
-    [PROPERTY_HANDLER_PROPERTY_LIST]   = { .property_name = "PropertyList",   .type = "a{say}", .get_cb = handle_get_property_list,   .set_cb = NULL }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_MOVE,
-    METHOD_HANDLER_KILL,
-    METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info move_args[] = { { "device", "o", "in" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_MOVE] = {
-        .method_name = "Move",
-        .arguments = move_args,
-        .n_arguments = sizeof(move_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_move },
-    [METHOD_HANDLER_KILL] = {
-        .method_name = "Kill",
-        .arguments = NULL,
-        .n_arguments = 0,
-        .receive_cb = handle_kill }
-};
-
-enum signal_index {
-    SIGNAL_DEVICE_UPDATED,
-    SIGNAL_SAMPLE_RATE_UPDATED,
-    SIGNAL_VOLUME_UPDATED,
-    SIGNAL_MUTE_UPDATED,
-    SIGNAL_PROPERTY_LIST_UPDATED,
-    SIGNAL_STREAM_EVENT,
-    SIGNAL_MAX
-};
-
-static pa_dbus_arg_info device_updated_args[]        = { { "device",        "o",      NULL } };
-static pa_dbus_arg_info sample_rate_updated_args[]   = { { "sample_rate",   "u",      NULL } };
-static pa_dbus_arg_info volume_updated_args[]        = { { "volume",        "au",     NULL } };
-static pa_dbus_arg_info mute_updated_args[]          = { { "muted",         "b",      NULL } };
-static pa_dbus_arg_info property_list_updated_args[] = { { "property_list", "a{say}", NULL } };
-static pa_dbus_arg_info stream_event_args[]          = { { "name",          "s",      NULL }, { "property_list", "a{say}", NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_DEVICE_UPDATED]        = { .name = "DeviceUpdated",       .arguments = device_updated_args,        .n_arguments = 1 },
-    [SIGNAL_SAMPLE_RATE_UPDATED]   = { .name = "SampleRateUpdated",   .arguments = sample_rate_updated_args,   .n_arguments = 1 },
-    [SIGNAL_VOLUME_UPDATED]        = { .name = "VolumeUpdated",       .arguments = volume_updated_args,        .n_arguments = 1 },
-    [SIGNAL_MUTE_UPDATED]          = { .name = "MuteUpdated",         .arguments = mute_updated_args,          .n_arguments = 1 },
-    [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 },
-    [SIGNAL_STREAM_EVENT]          = { .name = "StreamEvent",         .arguments = stream_event_args,          .n_arguments = sizeof(stream_event_args) / sizeof(pa_dbus_arg_info) }
-};
-
-static pa_dbus_interface_info stream_interface_info = {
-    .name = PA_DBUSIFACE_STREAM_INTERFACE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    dbus_uint32_t idx;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    idx = (s->type == STREAM_TYPE_PLAYBACK) ? s->sink_input->index : s->source_output->index;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
-}
-
-static void handle_get_driver(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    const char *driver = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    driver = (s->type == STREAM_TYPE_PLAYBACK) ? s->sink_input->driver : s->source_output->driver;
-
-    if (!driver) {
-        if (s->type == STREAM_TYPE_PLAYBACK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Playback stream %u doesn't have a driver.", s->sink_input->index);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Record stream %u doesn't have a driver.", s->source_output->index);
-        return;
-    }
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &driver);
-}
-
-static void handle_get_owner_module(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    pa_module *owner_module = NULL;
-    const char *object_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    owner_module = (s->type == STREAM_TYPE_PLAYBACK) ? s->sink_input->module : s->source_output->module;
-
-    if (!owner_module) {
-        if (s->type == STREAM_TYPE_PLAYBACK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Playback stream %u doesn't have an owner module.", s->sink_input->index);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Record stream %u doesn't have an owner module.", s->source_output->index);
-        return;
-    }
-
-    object_path = pa_dbusiface_core_get_module_path(s->core, owner_module);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_client(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    pa_client *client = NULL;
-    const char *object_path = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    client = (s->type == STREAM_TYPE_PLAYBACK) ? s->sink_input->client : s->source_output->client;
-
-    if (!client) {
-        if (s->type == STREAM_TYPE_PLAYBACK)
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Playback stream %u isn't associated to any client.", s->sink_input->index);
-        else
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
-                               "Record stream %u isn't associated to any client.", s->source_output->index);
-        return;
-    }
-
-    object_path = pa_dbusiface_core_get_client_path(s->core, client);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &object_path);
-}
-
-static void handle_get_device(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    const char *device = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK)
-        device = pa_dbusiface_core_get_sink_path(s->core, s->sink);
-    else
-        device = pa_dbusiface_core_get_source_path(s->core, s->source);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &device);
-}
-
-static void handle_get_sample_format(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    dbus_uint32_t sample_format = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    sample_format = (s->type == STREAM_TYPE_PLAYBACK)
-                    ? s->sink_input->sample_spec.format
-                    : s->source_output->sample_spec.format;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &sample_format);
-}
-
-static void handle_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &s->sample_rate);
-}
-
-static void handle_get_channels(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    pa_channel_map *channel_map = NULL;
-    dbus_uint32_t channels[PA_CHANNELS_MAX];
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    channel_map = (s->type == STREAM_TYPE_PLAYBACK) ? &s->sink_input->channel_map : &s->source_output->channel_map;
-
-    for (i = 0; i < channel_map->channels; ++i)
-        channels[i] = channel_map->map[i];
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, channels, channel_map->channels);
-}
-
-static void handle_get_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    dbus_uint32_t volume[PA_CHANNELS_MAX];
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_RECORD) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Record streams don't have volume.");
-        return;
-    }
-
-    for (i = 0; i < s->volume.channels; ++i)
-        volume[i] = s->volume.values[i];
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_UINT32, volume, s->volume.channels);
-}
-
-static void handle_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    DBusMessageIter array_iter;
-    int stream_channels = 0;
-    dbus_uint32_t *volume = NULL;
-    int n_volume_entries = 0;
-    pa_cvolume new_vol;
-    int i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_RECORD) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Record streams don't have volume.");
-        return;
-    }
-
-    pa_cvolume_init(&new_vol);
-
-    stream_channels = s->sink_input->channel_map.channels;
-
-    new_vol.channels = stream_channels;
-
-    dbus_message_iter_recurse(iter, &array_iter);
-    dbus_message_iter_get_fixed_array(&array_iter, &volume, &n_volume_entries);
-
-    if (n_volume_entries != stream_channels) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS,
-                           "Expected %u volume entries, got %u.", stream_channels, n_volume_entries);
-        return;
-    }
-
-    for (i = 0; i < n_volume_entries; ++i) {
-        if (volume[i] > PA_VOLUME_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Too large volume value: %u", volume[i]);
-            return;
-        }
-        new_vol.values[i] = volume[i];
-    }
-
-    pa_sink_input_set_volume(s->sink_input, &new_vol, TRUE, TRUE);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_get_mute(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_RECORD) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Record streams don't have mute.");
-        return;
-    }
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &s->mute);
-}
-
-static void handle_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    dbus_bool_t mute = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(s);
-
-    dbus_message_iter_get_basic(iter, &mute);
-
-    if (s->type == STREAM_TYPE_RECORD) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Record streams don't have mute.");
-        return;
-    }
-
-    pa_sink_input_set_mute(s->sink_input, mute, TRUE);
-
-    pa_dbus_send_empty_reply(conn, msg);
-};
-
-static void handle_get_buffer_latency(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    dbus_uint64_t buffer_latency = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK)
-        buffer_latency = pa_sink_input_get_latency(s->sink_input, NULL);
-    else
-        buffer_latency = pa_source_output_get_latency(s->source_output, NULL);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT64, &buffer_latency);
-}
-
-static void handle_get_device_latency(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    dbus_uint64_t device_latency = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK)
-        pa_sink_input_get_latency(s->sink_input, &device_latency);
-    else
-        pa_source_output_get_latency(s->source_output, &device_latency);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT64, &device_latency);
-}
-
-static void handle_get_resample_method(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    const char *resample_method = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK)
-        resample_method = pa_resample_method_to_string(s->sink_input->actual_resample_method);
-    else
-        resample_method = pa_resample_method_to_string(s->source_output->actual_resample_method);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &resample_method);
-}
-
-static void handle_get_property_list(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_dbus_send_proplist_variant_reply(conn, msg, s->proplist);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t idx = 0;
-    const char *driver = NULL;
-    pa_module *owner_module = NULL;
-    const char *owner_module_path = NULL;
-    pa_client *client = NULL;
-    const char *client_path = NULL;
-    const char *device = NULL;
-    dbus_uint32_t sample_format = 0;
-    pa_channel_map *channel_map = NULL;
-    dbus_uint32_t channels[PA_CHANNELS_MAX];
-    dbus_uint32_t volume[PA_CHANNELS_MAX];
-    dbus_uint64_t buffer_latency = 0;
-    dbus_uint64_t device_latency = 0;
-    const char *resample_method = NULL;
-    unsigned i = 0;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        idx = s->sink_input->index;
-        driver = s->sink_input->driver;
-        owner_module = s->sink_input->module;
-        client = s->sink_input->client;
-        device = pa_dbusiface_core_get_sink_path(s->core, s->sink);
-        sample_format = s->sink_input->sample_spec.format;
-        channel_map = &s->sink_input->channel_map;
-        for (i = 0; i < s->volume.channels; ++i)
-            volume[i] = s->volume.values[i];
-        buffer_latency = pa_sink_input_get_latency(s->sink_input, &device_latency);
-        resample_method = pa_resample_method_to_string(s->sink_input->actual_resample_method);
-    } else {
-        idx = s->source_output->index;
-        driver = s->source_output->driver;
-        owner_module = s->source_output->module;
-        client = s->source_output->client;
-        device = pa_dbusiface_core_get_source_path(s->core, s->source);
-        sample_format = s->source_output->sample_spec.format;
-        channel_map = &s->source_output->channel_map;
-        buffer_latency = pa_source_output_get_latency(s->source_output, &device_latency);
-        resample_method = pa_resample_method_to_string(s->source_output->actual_resample_method);
-    }
-    if (owner_module)
-        owner_module_path = pa_dbusiface_core_get_module_path(s->core, owner_module);
-    if (client)
-        client_path = pa_dbusiface_core_get_client_path(s->core, client);
-    for (i = 0; i < channel_map->channels; ++i)
-        channels[i] = channel_map->map[i];
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &idx);
-
-    if (driver)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DRIVER].property_name, DBUS_TYPE_STRING, &driver);
-
-    if (owner_module)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_OWNER_MODULE].property_name, DBUS_TYPE_OBJECT_PATH, &owner_module_path);
-
-    if (client)
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CLIENT].property_name, DBUS_TYPE_OBJECT_PATH, &client_path);
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_FORMAT].property_name, DBUS_TYPE_UINT32, &sample_format);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SAMPLE_RATE].property_name, DBUS_TYPE_UINT32, &s->sample_rate);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_CHANNELS].property_name, DBUS_TYPE_UINT32, channels, channel_map->channels);
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_VOLUME].property_name, DBUS_TYPE_UINT32, volume, s->volume.channels);
-        pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_MUTE].property_name, DBUS_TYPE_BOOLEAN, &s->mute);
-    }
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_BUFFER_LATENCY].property_name, DBUS_TYPE_UINT64, &buffer_latency);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_DEVICE_LATENCY].property_name, DBUS_TYPE_UINT64, &device_latency);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_RESAMPLE_METHOD].property_name, DBUS_TYPE_STRING, &resample_method);
-    pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, s->proplist);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-static void handle_move(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    const char *device = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &device, DBUS_TYPE_INVALID));
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        pa_sink *sink = pa_dbusiface_core_get_sink(s->core, device);
-
-        if (!sink) {
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such sink.", device);
-            return;
-        }
-
-        if (pa_sink_input_move_to(s->sink_input, sink, TRUE) < 0) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
-                               "Moving playback stream %u to sink %s failed.", s->sink_input->index, sink->name);
-            return;
-        }
-    } else {
-        pa_source *source = pa_dbusiface_core_get_source(s->core, device);
-
-        if (!source) {
-            pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "%s: No such source.", device);
-            return;
-        }
-
-        if (pa_source_output_move_to(s->source_output, source, TRUE) < 0) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
-                               "Moving record stream %u to source %s failed.", s->source_output->index, source->name);
-            return;
-        }
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void handle_kill(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK)
-        pa_sink_input_kill(s->sink_input);
-    else
-        pa_source_output_kill(s->source_output);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    pa_dbusiface_stream *s = userdata;
-    DBusMessage *signal_msg = NULL;
-    const char *new_device_path = NULL;
-    uint32_t new_sample_rate = 0;
-    pa_proplist *new_proplist = NULL;
-    unsigned i = 0;
-
-    pa_assert(c);
-    pa_assert(s);
-
-    if ((s->type == STREAM_TYPE_PLAYBACK && idx != s->sink_input->index)
-        || (s->type == STREAM_TYPE_RECORD && idx != s->source_output->index))
-        return;
-
-    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
-        return;
-
-    pa_assert(((s->type == STREAM_TYPE_PLAYBACK)
-                && ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SINK_INPUT))
-              || ((s->type == STREAM_TYPE_RECORD)
-                   && ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT)));
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        pa_sink *new_sink = s->sink_input->sink;
-
-        if (s->sink != new_sink) {
-            pa_sink_unref(s->sink);
-            s->sink = pa_sink_ref(new_sink);
-
-            new_device_path = pa_dbusiface_core_get_sink_path(s->core, new_sink);
-
-            pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							      PA_DBUSIFACE_STREAM_INTERFACE,
-							      signals[SIGNAL_DEVICE_UPDATED].name));
-            pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
-
-            pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-            dbus_message_unref(signal_msg);
-            signal_msg = NULL;
-        }
-    } else {
-        pa_source *new_source = s->source_output->source;
-
-        if (s->source != new_source) {
-            pa_source_unref(s->source);
-            s->source = pa_source_ref(new_source);
-
-            new_device_path = pa_dbusiface_core_get_source_path(s->core, new_source);
-
-            pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							      PA_DBUSIFACE_STREAM_INTERFACE,
-							      signals[SIGNAL_DEVICE_UPDATED].name));
-            pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
-
-            pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-            dbus_message_unref(signal_msg);
-            signal_msg = NULL;
-        }
-    }
-
-    new_sample_rate = (s->type == STREAM_TYPE_PLAYBACK) ? s->sink_input->sample_spec.rate : s->source_output->sample_spec.rate;
-
-    if (s->sample_rate != new_sample_rate) {
-        s->sample_rate = new_sample_rate;
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							  PA_DBUSIFACE_STREAM_INTERFACE,
-							  signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
-        pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &s->sample_rate, DBUS_TYPE_INVALID));
-
-        pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        pa_cvolume new_volume;
-        pa_bool_t new_mute = FALSE;
-
-        pa_sink_input_get_volume(s->sink_input, &new_volume, TRUE);
-
-        if (!pa_cvolume_equal(&s->volume, &new_volume)) {
-            dbus_uint32_t volume[PA_CHANNELS_MAX];
-            dbus_uint32_t *volume_ptr = volume;
-
-            s->volume = new_volume;
-
-            for (i = 0; i < s->volume.channels; ++i)
-                volume[i] = s->volume.values[i];
-
-            pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							      PA_DBUSIFACE_STREAM_INTERFACE,
-							      signals[SIGNAL_VOLUME_UPDATED].name));
-            pa_assert_se(dbus_message_append_args(signal_msg,
-                                                  DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &volume_ptr, s->volume.channels,
-                                                  DBUS_TYPE_INVALID));
-
-            pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-            dbus_message_unref(signal_msg);
-            signal_msg = NULL;
-        }
-
-        new_mute = pa_sink_input_get_mute(s->sink_input);
-
-        if (s->mute != new_mute) {
-            s->mute = new_mute;
-
-            pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							      PA_DBUSIFACE_STREAM_INTERFACE,
-							      signals[SIGNAL_MUTE_UPDATED].name));
-            pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &s->mute, DBUS_TYPE_INVALID));
-
-            pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-            dbus_message_unref(signal_msg);
-            signal_msg = NULL;
-        }
-    }
-
-    new_proplist = (s->type == STREAM_TYPE_PLAYBACK) ? s->sink_input->proplist : s->source_output->proplist;
-
-    if (!pa_proplist_equal(s->proplist, new_proplist)) {
-        DBusMessageIter msg_iter;
-
-        pa_proplist_update(s->proplist, PA_UPDATE_SET, new_proplist);
-
-        pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-							  PA_DBUSIFACE_STREAM_INTERFACE,
-							  signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
-        dbus_message_iter_init_append(signal_msg, &msg_iter);
-        pa_dbus_append_proplist(&msg_iter, s->proplist);
-
-        pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-        dbus_message_unref(signal_msg);
-        signal_msg = NULL;
-    }
-}
-
-static pa_hook_result_t send_event_cb(void *hook_data, void *call_data, void *slot_data) {
-    pa_dbusiface_stream *s = slot_data;
-    DBusMessage *signal_msg = NULL;
-    DBusMessageIter msg_iter;
-    const char *name = NULL;
-    pa_proplist *property_list = NULL;
-
-    pa_assert(call_data);
-    pa_assert(s);
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        pa_sink_input_send_event_hook_data *data = call_data;
-
-        if (data->sink_input != s->sink_input)
-            return PA_HOOK_OK;
-
-        name = data->event;
-        property_list = data->data;
-    } else {
-        pa_source_output_send_event_hook_data *data = call_data;
-
-        if (data->source_output != s->source_output)
-            return PA_HOOK_OK;
-
-        name = data->event;
-        property_list = data->data;
-    }
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-						      PA_DBUSIFACE_STREAM_INTERFACE,
-						      signals[SIGNAL_STREAM_EVENT].name));
-    dbus_message_iter_init_append(signal_msg, &msg_iter);
-    pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
-    pa_dbus_append_proplist(&msg_iter, property_list);
-
-    pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-
-    return PA_HOOK_OK;
-}
-
-pa_dbusiface_stream *pa_dbusiface_stream_new_playback(pa_dbusiface_core *core, pa_sink_input *sink_input) {
-    pa_dbusiface_stream *s;
-
-    pa_assert(core);
-    pa_assert(sink_input);
-
-    s = pa_xnew(pa_dbusiface_stream, 1);
-    s->core = core;
-    s->sink_input = pa_sink_input_ref(sink_input);
-    s->type = STREAM_TYPE_PLAYBACK;
-    s->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, PLAYBACK_OBJECT_NAME, sink_input->index);
-    s->sink = pa_sink_ref(sink_input->sink);
-    s->sample_rate = sink_input->sample_spec.rate;
-    pa_sink_input_get_volume(sink_input, &s->volume, TRUE);
-    s->mute = pa_sink_input_get_mute(sink_input);
-    s->proplist = pa_proplist_copy(sink_input->proplist);
-    s->dbus_protocol = pa_dbus_protocol_get(sink_input->core);
-    s->subscription = pa_subscription_new(sink_input->core, PA_SUBSCRIPTION_MASK_SINK_INPUT, subscription_cb, s);
-    s->send_event_slot = pa_hook_connect(&sink_input->core->hooks[PA_CORE_HOOK_SINK_INPUT_SEND_EVENT],
-                                         PA_HOOK_NORMAL,
-                                         send_event_cb,
-                                         s);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(s->dbus_protocol, s->path, &stream_interface_info, s) >= 0);
-
-    return s;
-}
-
-pa_dbusiface_stream *pa_dbusiface_stream_new_record(pa_dbusiface_core *core, pa_source_output *source_output) {
-    pa_dbusiface_stream *s;
-
-    pa_assert(core);
-    pa_assert(source_output);
-
-    s = pa_xnew(pa_dbusiface_stream, 1);
-    s->core = core;
-    s->source_output = pa_source_output_ref(source_output);
-    s->type = STREAM_TYPE_RECORD;
-    s->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, RECORD_OBJECT_NAME, source_output->index);
-    s->source = pa_source_ref(source_output->source);
-    s->sample_rate = source_output->sample_spec.rate;
-    pa_cvolume_init(&s->volume);
-    s->mute = FALSE;
-    s->proplist = pa_proplist_copy(source_output->proplist);
-    s->dbus_protocol = pa_dbus_protocol_get(source_output->core);
-    s->subscription = pa_subscription_new(source_output->core, PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT, subscription_cb, s);
-    s->send_event_slot = pa_hook_connect(&source_output->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_SEND_EVENT],
-                                         PA_HOOK_NORMAL,
-                                         send_event_cb,
-                                         s);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(s->dbus_protocol, s->path, &stream_interface_info, s) >= 0);
-
-    return s;
-}
-
-void pa_dbusiface_stream_free(pa_dbusiface_stream *s) {
-    pa_assert(s);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(s->dbus_protocol, s->path, stream_interface_info.name) >= 0);
-
-    if (s->type == STREAM_TYPE_PLAYBACK) {
-        pa_sink_input_unref(s->sink_input);
-        pa_sink_unref(s->sink);
-    } else {
-        pa_source_output_unref(s->source_output);
-        pa_source_unref(s->source);
-    }
-
-    pa_proplist_free(s->proplist);
-    pa_dbus_protocol_unref(s->dbus_protocol);
-    pa_subscription_free(s->subscription);
-    pa_hook_slot_free(s->send_event_slot);
-
-    pa_xfree(s->path);
-    pa_xfree(s);
-}
-
-const char *pa_dbusiface_stream_get_path(pa_dbusiface_stream *s) {
-    pa_assert(s);
-
-    return s->path;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-stream.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-stream.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/iface-stream.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/iface-stream.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#ifndef foodbusifacestreamhfoo
-#define foodbusifacestreamhfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-/* This object implements the D-Bus interface org.PulseAudio.Core1.Stream.
- *
- * See http://pulseaudio.org/wiki/DBusInterface for the Stream interface
- * documentation.
- */
-
-#include <pulsecore/protocol-dbus.h>
-#include <pulsecore/sink-input.h>
-#include <pulsecore/source-output.h>
-
-#include "iface-core.h"
-
-#define PA_DBUSIFACE_STREAM_INTERFACE PA_DBUS_CORE_INTERFACE ".Stream"
-
-typedef struct pa_dbusiface_stream pa_dbusiface_stream;
-
-pa_dbusiface_stream *pa_dbusiface_stream_new_playback(pa_dbusiface_core *core, pa_sink_input *sink_input);
-pa_dbusiface_stream *pa_dbusiface_stream_new_record(pa_dbusiface_core *core, pa_source_output *source_output);
-void pa_dbusiface_stream_free(pa_dbusiface_stream *s);
-
-const char *pa_dbusiface_stream_get_path(pa_dbusiface_stream *s);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/module-dbus-protocol.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/module-dbus-protocol.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/dbus/module-dbus-protocol.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/dbus/module-dbus-protocol.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,607 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-  Copyright 2006 Lennart Poettering
-  Copyright 2006 Shams E. King
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulse/mainloop-api.h>
-#include <pulse/timeval.h>
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/client.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/idxset.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/module.h>
-#include <pulsecore/protocol-dbus.h>
-
-#include "iface-client.h"
-#include "iface-core.h"
-
-#include "module-dbus-protocol-symdef.h"
-
-PA_MODULE_DESCRIPTION("D-Bus interface");
-PA_MODULE_USAGE(
-        "access=local|remote|local,remote "
-        "tcp_port=<port number>");
-PA_MODULE_LOAD_ONCE(TRUE);
-PA_MODULE_AUTHOR("Tanu Kaskinen");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-
-#define CLEANUP_INTERVAL 10 /* seconds */
-
-enum server_type {
-    SERVER_TYPE_LOCAL,
-    SERVER_TYPE_TCP
-};
-
-struct server;
-struct connection;
-
-struct userdata {
-    pa_module *module;
-    pa_bool_t local_access;
-    pa_bool_t remote_access;
-    uint32_t tcp_port;
-
-    struct server *local_server;
-    struct server *tcp_server;
-
-    pa_idxset *connections;
-
-    pa_time_event *cleanup_event;
-
-    pa_dbus_protocol *dbus_protocol;
-    pa_dbusiface_core *core_iface;
-};
-
-struct server {
-    struct userdata *userdata;
-    enum server_type type;
-    DBusServer *dbus_server;
-};
-
-struct connection {
-    struct server *server;
-    pa_dbus_wrap_connection *wrap_conn;
-    pa_client *client;
-};
-
-static const char* const valid_modargs[] = {
-    "access",
-    "tcp_port",
-    NULL
-};
-
-static void connection_free(struct connection *c) {
-    pa_assert(c);
-
-    pa_assert_se(pa_dbus_protocol_unregister_connection(c->server->userdata->dbus_protocol, pa_dbus_wrap_connection_get(c->wrap_conn)) >= 0);
-
-    pa_client_free(c->client);
-    pa_assert_se(pa_idxset_remove_by_data(c->server->userdata->connections, c, NULL));
-    pa_dbus_wrap_connection_free(c->wrap_conn);
-    pa_xfree(c);
-}
-
-/* Called from pa_client_kill(). */
-static void client_kill_cb(pa_client *c) {
-    struct connection *conn;
-
-    pa_assert(c);
-    pa_assert(c->userdata);
-
-    conn = c->userdata;
-    connection_free(conn);
-    c->userdata = NULL;
-
-    pa_log_info("Connection killed.");
-}
-
-/* Called from pa_client_send_event(). */
-static void client_send_event_cb(pa_client *c, const char *name, pa_proplist *data) {
-    struct connection *conn = NULL;
-    DBusMessage *signal_msg = NULL;
-    DBusMessageIter msg_iter;
-
-    pa_assert(c);
-    pa_assert(name);
-    pa_assert(data);
-    pa_assert(c->userdata);
-
-    conn = c->userdata;
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(pa_dbusiface_core_get_client_path(conn->server->userdata->core_iface, c),
-						      PA_DBUSIFACE_CLIENT_INTERFACE,
-						      "ClientEvent"));
-    dbus_message_iter_init_append(signal_msg, &msg_iter);
-    pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
-    pa_dbus_append_proplist(&msg_iter, data);
-
-    pa_assert_se(dbus_connection_send(pa_dbus_wrap_connection_get(conn->wrap_conn), signal_msg, NULL));
-    dbus_message_unref(signal_msg);
-}
-
-/* Called by D-Bus at the authentication phase. */
-static dbus_bool_t user_check_cb(DBusConnection *connection, unsigned long uid, void *data) {
-    pa_log_debug("Allowing connection by user %lu.", uid);
-
-    return TRUE;
-}
-
-/* Called by D-Bus when a new client connection is received. */
-static void connection_new_cb(DBusServer *dbus_server, DBusConnection *new_connection, void *data) {
-    struct server *s = data;
-    struct connection *c;
-    pa_client_new_data new_data;
-    pa_client *client;
-
-    pa_assert(new_connection);
-    pa_assert(s);
-
-    pa_client_new_data_init(&new_data);
-    new_data.module = s->userdata->module;
-    new_data.driver = __FILE__;
-    pa_proplist_sets(new_data.proplist, PA_PROP_APPLICATION_NAME, "D-Bus client");
-    client = pa_client_new(s->userdata->module->core, &new_data);
-    pa_client_new_data_done(&new_data);
-
-    if (!client) {
-        dbus_connection_close(new_connection);
-        return;
-    }
-
-    if (s->type == SERVER_TYPE_TCP || s->userdata->module->core->server_type == PA_SERVER_TYPE_SYSTEM) {
-        /* FIXME: Here we allow anyone from anywhere to access the server,
-         * anonymously. Access control should be configurable. */
-        dbus_connection_set_unix_user_function(new_connection, user_check_cb, NULL, NULL);
-        dbus_connection_set_allow_anonymous(new_connection, TRUE);
-    }
-
-    c = pa_xnew(struct connection, 1);
-    c->server = s;
-    c->wrap_conn = pa_dbus_wrap_connection_new_from_existing(s->userdata->module->core->mainloop, TRUE, new_connection);
-    c->client = client;
-
-    c->client->kill = client_kill_cb;
-    c->client->send_event = client_send_event_cb;
-    c->client->userdata = c;
-
-    pa_idxset_put(s->userdata->connections, c, NULL);
-
-    pa_assert_se(pa_dbus_protocol_register_connection(s->userdata->dbus_protocol, new_connection, c->client) >= 0);
-}
-
-/* Called by PA mainloop when a D-Bus fd watch event needs handling. */
-static void io_event_cb(pa_mainloop_api *mainloop, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
-    unsigned int flags = 0;
-    DBusWatch *watch = userdata;
-
-#if HAVE_DBUS_WATCH_GET_UNIX_FD
-    pa_assert(fd == dbus_watch_get_unix_fd(watch));
-#else
-    pa_assert(fd == dbus_watch_get_fd(watch));
-#endif
-
-    if (!dbus_watch_get_enabled(watch)) {
-        pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd);
-        return;
-    }
-
-    if (events & PA_IO_EVENT_INPUT)
-        flags |= DBUS_WATCH_READABLE;
-    if (events & PA_IO_EVENT_OUTPUT)
-        flags |= DBUS_WATCH_WRITABLE;
-    if (events & PA_IO_EVENT_HANGUP)
-        flags |= DBUS_WATCH_HANGUP;
-    if (events & PA_IO_EVENT_ERROR)
-        flags |= DBUS_WATCH_ERROR;
-
-    dbus_watch_handle(watch, flags);
-}
-
-/* Called by PA mainloop when a D-Bus timer event needs handling. */
-static void time_event_cb(pa_mainloop_api *mainloop, pa_time_event* e, const struct timeval *tv, void *userdata) {
-    DBusTimeout *timeout = userdata;
-
-    if (dbus_timeout_get_enabled(timeout)) {
-        struct timeval next = *tv;
-        dbus_timeout_handle(timeout);
-
-        /* restart it for the next scheduled time */
-        pa_timeval_add(&next, (pa_usec_t) dbus_timeout_get_interval(timeout) * 1000);
-        mainloop->time_restart(e, &next);
-    }
-}
-
-/* Translates D-Bus fd watch event flags to PA IO event flags. */
-static pa_io_event_flags_t get_watch_flags(DBusWatch *watch) {
-    unsigned int flags;
-    pa_io_event_flags_t events = 0;
-
-    pa_assert(watch);
-
-    flags = dbus_watch_get_flags(watch);
-
-    /* no watch flags for disabled watches */
-    if (!dbus_watch_get_enabled(watch))
-        return PA_IO_EVENT_NULL;
-
-    if (flags & DBUS_WATCH_READABLE)
-        events |= PA_IO_EVENT_INPUT;
-    if (flags & DBUS_WATCH_WRITABLE)
-        events |= PA_IO_EVENT_OUTPUT;
-
-    return events | PA_IO_EVENT_HANGUP | PA_IO_EVENT_ERROR;
-}
-
-/* Called by D-Bus when a D-Bus fd watch event is added. */
-static dbus_bool_t watch_add_cb(DBusWatch *watch, void *data) {
-    struct server *s = data;
-    pa_mainloop_api *mainloop;
-    pa_io_event *ev;
-
-    pa_assert(watch);
-    pa_assert(s);
-
-    mainloop = s->userdata->module->core->mainloop;
-
-    ev = mainloop->io_new(
-            mainloop,
-#if HAVE_DBUS_WATCH_GET_UNIX_FD
-            dbus_watch_get_unix_fd(watch),
-#else
-            dbus_watch_get_fd(watch),
-#endif
-            get_watch_flags(watch), io_event_cb, watch);
-
-    dbus_watch_set_data(watch, ev, NULL);
-
-    return TRUE;
-}
-
-/* Called by D-Bus when a D-Bus fd watch event is removed. */
-static void watch_remove_cb(DBusWatch *watch, void *data) {
-    struct server *s = data;
-    pa_io_event *ev;
-
-    pa_assert(watch);
-    pa_assert(s);
-
-    if ((ev = dbus_watch_get_data(watch)))
-        s->userdata->module->core->mainloop->io_free(ev);
-}
-
-/* Called by D-Bus when a D-Bus fd watch event is toggled. */
-static void watch_toggled_cb(DBusWatch *watch, void *data) {
-    struct server *s = data;
-    pa_io_event *ev;
-
-    pa_assert(watch);
-    pa_assert(s);
-
-    pa_assert_se(ev = dbus_watch_get_data(watch));
-
-    /* get_watch_flags() checks if the watch is enabled */
-    s->userdata->module->core->mainloop->io_enable(ev, get_watch_flags(watch));
-}
-
-/* Called by D-Bus when a D-Bus timer event is added. */
-static dbus_bool_t timeout_add_cb(DBusTimeout *timeout, void *data) {
-    struct server *s = data;
-    pa_mainloop_api *mainloop;
-    pa_time_event *ev;
-    struct timeval tv;
-
-    pa_assert(timeout);
-    pa_assert(s);
-
-    if (!dbus_timeout_get_enabled(timeout))
-        return FALSE;
-
-    mainloop = s->userdata->module->core->mainloop;
-
-    pa_gettimeofday(&tv);
-    pa_timeval_add(&tv, (pa_usec_t) dbus_timeout_get_interval(timeout) * 1000);
-
-    ev = mainloop->time_new(mainloop, &tv, time_event_cb, timeout);
-
-    dbus_timeout_set_data(timeout, ev, NULL);
-
-    return TRUE;
-}
-
-/* Called by D-Bus when a D-Bus timer event is removed. */
-static void timeout_remove_cb(DBusTimeout *timeout, void *data) {
-    struct server *s = data;
-    pa_time_event *ev;
-
-    pa_assert(timeout);
-    pa_assert(s);
-
-    if ((ev = dbus_timeout_get_data(timeout)))
-        s->userdata->module->core->mainloop->time_free(ev);
-}
-
-/* Called by D-Bus when a D-Bus timer event is toggled. */
-static void timeout_toggled_cb(DBusTimeout *timeout, void *data) {
-    struct server *s = data;
-    pa_mainloop_api *mainloop;
-    pa_time_event *ev;
-
-    pa_assert(timeout);
-    pa_assert(s);
-
-    mainloop = s->userdata->module->core->mainloop;
-
-    pa_assert_se(ev = dbus_timeout_get_data(timeout));
-
-    if (dbus_timeout_get_enabled(timeout)) {
-        struct timeval tv;
-
-        pa_gettimeofday(&tv);
-        pa_timeval_add(&tv, (pa_usec_t) dbus_timeout_get_interval(timeout) * 1000);
-
-        mainloop->time_restart(ev, &tv);
-    } else
-        mainloop->time_restart(ev, NULL);
-}
-
-static void server_free(struct server *s) {
-    pa_assert(s);
-
-    if (s->dbus_server) {
-        dbus_server_disconnect(s->dbus_server);
-        dbus_server_unref(s->dbus_server);
-    }
-
-    pa_xfree(s);
-}
-
-static struct server *start_server(struct userdata *u, const char *address, enum server_type type) {
-    /* XXX: We assume that when we unref the DBusServer instance at module
-     * shutdown, nobody else holds any references to it. If we stop assuming
-     * that someday, dbus_server_set_new_connection_function,
-     * dbus_server_set_watch_functions and dbus_server_set_timeout_functions
-     * calls should probably register free callbacks, instead of providing NULL
-     * as they do now. */
-
-    struct server *s = NULL;
-    DBusError error;
-
-    pa_assert(u);
-    pa_assert(address);
-
-    dbus_error_init(&error);
-
-    s = pa_xnew0(struct server, 1);
-    s->userdata = u;
-    s->dbus_server = dbus_server_listen(address, &error);
-
-    if (dbus_error_is_set(&error)) {
-        pa_log("dbus_server_listen() failed: %s: %s", error.name, error.message);
-        goto fail;
-    }
-
-    dbus_server_set_new_connection_function(s->dbus_server, connection_new_cb, s, NULL);
-
-    if (!dbus_server_set_watch_functions(s->dbus_server, watch_add_cb, watch_remove_cb, watch_toggled_cb, s, NULL)) {
-        pa_log("dbus_server_set_watch_functions() ran out of memory.");
-        goto fail;
-    }
-
-    if (!dbus_server_set_timeout_functions(s->dbus_server, timeout_add_cb, timeout_remove_cb, timeout_toggled_cb, s, NULL)) {
-        pa_log("dbus_server_set_timeout_functions() ran out of memory.");
-        goto fail;
-    }
-
-    return s;
-
-fail:
-    if (s)
-        server_free(s);
-
-    dbus_error_free(&error);
-
-    return NULL;
-}
-
-static struct server *start_local_server(struct userdata *u) {
-    struct server *s = NULL;
-    char *address = NULL;
-
-    pa_assert(u);
-
-    address = pa_get_dbus_address_from_server_type(u->module->core->server_type);
-
-    s = start_server(u, address, SERVER_TYPE_LOCAL); /* May return NULL */
-
-    pa_xfree(address);
-
-    return s;
-}
-
-static struct server *start_tcp_server(struct userdata *u) {
-    struct server *s = NULL;
-    char *address = NULL;
-
-    pa_assert(u);
-
-    address = pa_sprintf_malloc("tcp:host=127.0.0.1,port=%u", u->tcp_port);
-
-    s = start_server(u, address, SERVER_TYPE_TCP); /* May return NULL */
-
-    pa_xfree(address);
-
-    return s;
-}
-
-static int get_access_arg(pa_modargs *ma, pa_bool_t *local_access, pa_bool_t *remote_access) {
-    const char *value = NULL;
-
-    pa_assert(ma);
-    pa_assert(local_access);
-    pa_assert(remote_access);
-
-    if (!(value = pa_modargs_get_value(ma, "access", NULL)))
-        return 0;
-
-    if (!strcmp(value, "local")) {
-        *local_access = TRUE;
-        *remote_access = FALSE;
-    } else if (!strcmp(value, "remote")) {
-        *local_access = FALSE;
-        *remote_access = TRUE;
-    } else if (!strcmp(value, "local,remote")) {
-        *local_access = TRUE;
-        *remote_access = TRUE;
-    } else
-        return -1;
-
-    return 0;
-}
-
-/* Frees dead client connections. Called every CLEANUP_INTERVAL seconds. */
-static void cleanup_cb(pa_mainloop_api *a, pa_time_event *e, const struct timeval *tv, void *userdata) {
-    struct userdata *u = userdata;
-    struct connection *conn = NULL;
-    uint32_t idx;
-    struct timeval cleanup_timeval;
-    unsigned free_count = 0;
-
-    for (conn = pa_idxset_first(u->connections, &idx); conn; conn = pa_idxset_next(u->connections, &idx)) {
-        if (!dbus_connection_get_is_connected(pa_dbus_wrap_connection_get(conn->wrap_conn))) {
-            connection_free(conn);
-            ++free_count;
-        }
-    }
-
-    if (free_count > 0)
-        pa_log_debug("Freed %u dead D-Bus client connections.", free_count);
-
-    pa_gettimeofday(&cleanup_timeval);
-    cleanup_timeval.tv_sec += CLEANUP_INTERVAL;
-    u->module->core->mainloop->time_restart(e, &cleanup_timeval);
-}
-
-int pa__init(pa_module *m) {
-    struct userdata *u = NULL;
-    pa_modargs *ma = NULL;
-    struct timeval cleanup_timeval;
-
-    pa_assert(m);
-
-    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log("Failed to parse module arguments.");
-        goto fail;
-    }
-
-    m->userdata = u = pa_xnew0(struct userdata, 1);
-    u->module = m;
-    u->local_access = TRUE;
-    u->remote_access = FALSE;
-    u->tcp_port = PA_DBUS_DEFAULT_PORT;
-
-    if (get_access_arg(ma, &u->local_access, &u->remote_access) < 0) {
-        pa_log("Invalid access argument: '%s'", pa_modargs_get_value(ma, "access", NULL));
-        goto fail;
-    }
-
-    if (pa_modargs_get_value_u32(ma, "tcp_port", &u->tcp_port) < 0 || u->tcp_port < 1 || u->tcp_port > 49150) {
-        pa_log("Invalid tcp_port argument: '%s'", pa_modargs_get_value(ma, "tcp_port", NULL));
-        goto fail;
-    }
-
-    if (u->local_access && !(u->local_server = start_local_server(u))) {
-        pa_log("Starting the local D-Bus server failed.");
-        goto fail;
-    }
-
-    if (u->remote_access && !(u->tcp_server = start_tcp_server(u))) {
-        pa_log("Starting the D-Bus server for remote connections failed.");
-        goto fail;
-    }
-
-    u->connections = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-
-    pa_gettimeofday(&cleanup_timeval);
-    cleanup_timeval.tv_sec += CLEANUP_INTERVAL;
-    u->cleanup_event = m->core->mainloop->time_new(m->core->mainloop, &cleanup_timeval, cleanup_cb, u);
-
-    u->dbus_protocol = pa_dbus_protocol_get(m->core);
-    u->core_iface = pa_dbusiface_core_new(m->core);
-
-    return 0;
-
-fail:
-    if (ma)
-        pa_modargs_free(ma);
-
-    pa__done(m);
-
-    return -1;
-}
-
-/* Called by idxset when the connection set is freed. */
-static void connection_free_cb(void *p, void *userdata) {
-    struct connection *conn = p;
-
-    pa_assert(conn);
-
-    connection_free(conn);
-}
-
-void pa__done(pa_module *m) {
-    struct userdata *u;
-
-    pa_assert(m);
-
-    if (!(u = m->userdata))
-        return;
-
-    if (u->core_iface)
-        pa_dbusiface_core_free(u->core_iface);
-
-    if (u->cleanup_event)
-        m->core->mainloop->time_free(u->cleanup_event);
-
-    if (u->connections)
-        pa_idxset_free(u->connections, connection_free_cb, NULL);
-
-    if (u->tcp_server)
-        server_free(u->tcp_server);
-
-    if (u->local_server)
-        server_free(u->local_server);
-
-    if (u->dbus_protocol)
-        pa_dbus_protocol_unref(u->dbus_protocol);
-
-    pa_xfree(u);
-    m->userdata = NULL;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-bonjour-publish.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-bonjour-publish.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-bonjour-publish.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-bonjour-publish.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,516 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Daniel Mack
-  based on module-zeroconf-publish.c
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2.1 of the
-  License, or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <dns_sd.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <pulse/xmalloc.h>
-#include <pulse/util.h>
-
-#include <pulsecore/parseaddr.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/source.h>
-#include <pulsecore/native-common.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/log.h>
-#include <pulsecore/core-subscribe.h>
-#include <pulsecore/dynarray.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/avahi-wrap.h>
-#include <pulsecore/endianmacros.h>
-#include <pulsecore/protocol-native.h>
-
-#include "module-bonjour-publish-symdef.h"
-
-PA_MODULE_AUTHOR("Daniel Mack");
-PA_MODULE_DESCRIPTION("Mac OS X Bonjour Service Publisher");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
-
-#define SERVICE_TYPE_SINK "_pulse-sink._tcp"
-#define SERVICE_TYPE_SOURCE "_pulse-source._tcp"
-#define SERVICE_TYPE_SERVER "_pulse-server._tcp"
-
-static const char* const valid_modargs[] = {
-    NULL
-};
-
-enum service_subtype {
-    SUBTYPE_HARDWARE,
-    SUBTYPE_VIRTUAL,
-    SUBTYPE_MONITOR
-};
-
-struct service {
-    struct userdata *userdata;
-    DNSServiceRef service;
-    DNSRecordRef rec, rec2;
-    char *service_name;
-    pa_object *device;
-    enum service_subtype subtype;
-};
-
-struct userdata {
-    pa_core *core;
-    pa_module *module;
-
-    pa_hashmap *services;
-    char *service_name;
-
-    pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot;
-
-    pa_native_protocol *native;
-    DNSServiceRef main_service;
-};
-
-static void get_service_data(struct service *s, pa_sample_spec *ret_ss, pa_channel_map *ret_map, const char **ret_name, pa_proplist **ret_proplist, enum service_subtype *ret_subtype) {
-    pa_assert(s);
-    pa_assert(ret_ss);
-    pa_assert(ret_proplist);
-    pa_assert(ret_subtype);
-
-    if (pa_sink_isinstance(s->device)) {
-        pa_sink *sink = PA_SINK(s->device);
-
-        *ret_ss = sink->sample_spec;
-        *ret_map = sink->channel_map;
-        *ret_name = sink->name;
-        *ret_proplist = sink->proplist;
-        *ret_subtype = sink->flags & PA_SINK_HARDWARE ? SUBTYPE_HARDWARE : SUBTYPE_VIRTUAL;
-
-    } else if (pa_source_isinstance(s->device)) {
-        pa_source *source = PA_SOURCE(s->device);
-
-        *ret_ss = source->sample_spec;
-        *ret_map = source->channel_map;
-        *ret_name = source->name;
-        *ret_proplist = source->proplist;
-        *ret_subtype = source->monitor_of ? SUBTYPE_MONITOR : (source->flags & PA_SOURCE_HARDWARE ? SUBTYPE_HARDWARE : SUBTYPE_VIRTUAL);
-
-    } else
-        pa_assert_not_reached();
-}
-
-static void txt_record_server_data(pa_core *c, TXTRecordRef *txt) {
-    char s[128];
-    char *t;
-
-    pa_assert(c);
-
-    TXTRecordSetValue(txt, "server-version", strlen(PACKAGE_NAME" "PACKAGE_VERSION), PACKAGE_NAME" "PACKAGE_VERSION);
-
-    t = pa_get_user_name_malloc();
-    TXTRecordSetValue(txt, "user-name", strlen(t), t);
-    pa_xfree(t);
-
-    t = pa_machine_id();
-    TXTRecordSetValue(txt, "machine-id", strlen(t), t);
-    pa_xfree(t);
-
-    t = pa_uname_string();
-    TXTRecordSetValue(txt, "uname", strlen(t), t);
-    pa_xfree(t);
-
-    t = pa_get_fqdn(s, sizeof(s));
-    TXTRecordSetValue(txt, "fqdn", strlen(t), t);
-
-    snprintf(s, sizeof(s), "0x%08x", c->cookie);
-    TXTRecordSetValue(txt, "cookie", strlen(s), s);
-}
-
-static void service_free(struct service *s);
-
-static void dns_service_register_reply(DNSServiceRef sdRef,
-                                       DNSServiceFlags flags,
-                                       DNSServiceErrorType errorCode,
-                                       const char *name,
-                                       const char *regtype,
-                                       const char *domain,
-                                       void *context) {
-    struct service *s = context;
-
-    pa_assert(s);
-
-    switch (errorCode) {
-    case kDNSServiceErr_NameConflict:
-        pa_log("DNS service reported kDNSServiceErr_NameConflict\n");
-        service_free(s);
-        break;
-
-    case kDNSServiceErr_NoError:
-    default:
-        break;
-    }
-}
-
-static uint16_t compute_port(struct userdata *u) {
-    pa_strlist *i;
-
-    pa_assert(u);
-
-    for (i = pa_native_protocol_servers(u->native); i; i = pa_strlist_next(i)) {
-        pa_parsed_address a;
-
-        if (pa_parse_address(pa_strlist_data(i), &a) >= 0 &&
-            (a.type == PA_PARSED_ADDRESS_TCP4 ||
-             a.type == PA_PARSED_ADDRESS_TCP6 ||
-             a.type == PA_PARSED_ADDRESS_TCP_AUTO) &&
-            a.port > 0) {
-
-            pa_xfree(a.path_or_host);
-            return a.port;
-        }
-
-        pa_xfree(a.path_or_host);
-    }
-
-    return PA_NATIVE_DEFAULT_PORT;
-}
-
-static int publish_service(struct service *s) {
-    int r = -1;
-    TXTRecordRef txt;
-    DNSServiceErrorType err;
-    const char *name = NULL, *t;
-    pa_proplist *proplist = NULL;
-    pa_sample_spec ss;
-    pa_channel_map map;
-    char cm[PA_CHANNEL_MAP_SNPRINT_MAX], tmp[64];
-    enum service_subtype subtype;
-
-    const char * const subtype_text[] = {
-        [SUBTYPE_HARDWARE] = "hardware",
-        [SUBTYPE_VIRTUAL] = "virtual",
-        [SUBTYPE_MONITOR] = "monitor"
-    };
-
-    pa_assert(s);
-
-    if (s->service) {
-        DNSServiceRefDeallocate(s->service);
-        s->service = NULL;
-    }
-
-    TXTRecordCreate(&txt, 0, NULL);
-
-    txt_record_server_data(s->userdata->core, &txt);
-
-    get_service_data(s, &ss, &map, &name, &proplist, &subtype);
-    TXTRecordSetValue(&txt, "device", strlen(name), name);
-
-    snprintf(tmp, sizeof(tmp), "%u", ss.rate);
-    TXTRecordSetValue(&txt, "rate", strlen(tmp), tmp);
-
-    snprintf(tmp, sizeof(tmp), "%u", ss.channels);
-    TXTRecordSetValue(&txt, "channels", strlen(tmp), tmp);
-
-    t = pa_sample_format_to_string(ss.format);
-    TXTRecordSetValue(&txt, "format", strlen(t), t);
-
-    t = pa_channel_map_snprint(cm, sizeof(cm), &map);
-    TXTRecordSetValue(&txt, "channel_map", strlen(t), t);
-
-    t = subtype_text[subtype];
-    TXTRecordSetValue(&txt, "subtype", strlen(t), t);
-
-    if ((t = pa_proplist_gets(proplist, PA_PROP_DEVICE_DESCRIPTION)))
-        TXTRecordSetValue(&txt, "description", strlen(t), t);
-    if ((t = pa_proplist_gets(proplist, PA_PROP_DEVICE_ICON_NAME)))
-        TXTRecordSetValue(&txt, "icon-name", strlen(t), t);
-    if ((t = pa_proplist_gets(proplist, PA_PROP_DEVICE_VENDOR_NAME)))
-        TXTRecordSetValue(&txt, "vendor-name", strlen(t), t);
-    if ((t = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME)))
-        TXTRecordSetValue(&txt, "product-name", strlen(t), t);
-    if ((t = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS)))
-        TXTRecordSetValue(&txt, "class", strlen(t), t);
-    if ((t = pa_proplist_gets(proplist, PA_PROP_DEVICE_FORM_FACTOR)))
-        TXTRecordSetValue(&txt, "form-factor", strlen(t), t);
-
-    err = DNSServiceRegister(&s->service,
-                             0,         /* flags */
-                             kDNSServiceInterfaceIndexAny,
-                             s->service_name,
-                             pa_sink_isinstance(s->device) ? SERVICE_TYPE_SINK : SERVICE_TYPE_SOURCE,
-                             NULL,      /* domain */
-                             NULL,      /* host */
-                             compute_port(s->userdata),
-                             TXTRecordGetLength(&txt),
-                             TXTRecordGetBytesPtr(&txt),
-                             dns_service_register_reply, s);
-
-    if (err != kDNSServiceErr_NoError) {
-        pa_log("DNSServiceRegister() returned err %d", err);
-        goto finish;
-    }
-
-    pa_log_debug("Successfully registered Bonjour services for >%s<.", s->service_name);
-    return 0;
-
-finish:
-
-    /* Remove this service */
-    if (r < 0)
-        service_free(s);
-
-    TXTRecordDeallocate(&txt);
-
-    return r;
-}
-
-static struct service *get_service(struct userdata *u, pa_object *device) {
-    struct service *s;
-    char *hn, *un;
-    const char *n;
-
-    pa_assert(u);
-    pa_object_assert_ref(device);
-
-    if ((s = pa_hashmap_get(u->services, device)))
-        return s;
-
-    s = pa_xnew0(struct service, 1);
-    s->userdata = u;
-    s->device = device;
-
-    if (pa_sink_isinstance(device)) {
-        if (!(n = pa_proplist_gets(PA_SINK(device)->proplist, PA_PROP_DEVICE_DESCRIPTION)))
-            n = PA_SINK(device)->name;
-    } else {
-        if (!(n = pa_proplist_gets(PA_SOURCE(device)->proplist, PA_PROP_DEVICE_DESCRIPTION)))
-            n = PA_SOURCE(device)->name;
-    }
-
-    hn = pa_get_host_name_malloc();
-    un = pa_get_user_name_malloc();
-
-    s->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s: %s", un, hn, n), kDNSServiceMaxDomainName-1);
-
-    pa_xfree(un);
-    pa_xfree(hn);
-
-    pa_hashmap_put(u->services, s->device, s);
-
-    return s;
-}
-
-static void service_free(struct service *s) {
-    pa_assert(s);
-
-    pa_hashmap_remove(s->userdata->services, s->device);
-
-    if (s->service)
-        DNSServiceRefDeallocate(s->service);
-
-    pa_xfree(s->service_name);
-    pa_xfree(s);
-}
-
-static pa_bool_t shall_ignore(pa_object *o) {
-    pa_object_assert_ref(o);
-
-    if (pa_sink_isinstance(o))
-        return !!(PA_SINK(o)->flags & PA_SINK_NETWORK);
-
-    if (pa_source_isinstance(o))
-        return PA_SOURCE(o)->monitor_of || (PA_SOURCE(o)->flags & PA_SOURCE_NETWORK);
-
-    pa_assert_not_reached();
-}
-
-static pa_hook_result_t device_new_or_changed_cb(pa_core *c, pa_object *o, struct userdata *u) {
-    pa_assert(c);
-    pa_object_assert_ref(o);
-
-    if (!shall_ignore(o))
-        publish_service(get_service(u, o));
-
-    return PA_HOOK_OK;
-}
-
-static pa_hook_result_t device_unlink_cb(pa_core *c, pa_object *o, struct userdata *u) {
-    struct service *s;
-
-    pa_assert(c);
-    pa_object_assert_ref(o);
-
-    if ((s = pa_hashmap_get(u->services, o)))
-        service_free(s);
-
-    return PA_HOOK_OK;
-}
-
-static int publish_main_service(struct userdata *u) {
-    DNSServiceErrorType err;
-    TXTRecordRef txt;
-
-    pa_assert(u);
-
-    if (u->main_service) {
-        DNSServiceRefDeallocate(u->main_service);
-        u->main_service = NULL;
-    }
-
-    TXTRecordCreate(&txt, 0, NULL);
-    txt_record_server_data(u->core, &txt);
-
-    err = DNSServiceRegister(&u->main_service,
-                             0, /* flags */
-                             kDNSServiceInterfaceIndexAny,
-                             u->service_name,
-                             SERVICE_TYPE_SERVER,
-                             NULL, /* domain */
-                             NULL, /* host */
-                             compute_port(u),
-                             TXTRecordGetLength(&txt),
-                             TXTRecordGetBytesPtr(&txt),
-                             NULL, NULL);
-
-    if (err != kDNSServiceErr_NoError) {
-        pa_log("%s(): DNSServiceRegister() returned err %d", __func__, err);
-        return err;
-    }
-
-    TXTRecordDeallocate(&txt);
-
-    return 0;
-}
-
-static int publish_all_services(struct userdata *u) {
-    pa_sink *sink;
-    pa_source *source;
-    uint32_t idx;
-
-    pa_assert(u);
-
-    pa_log_debug("Publishing services in Bonjour");
-
-    for (sink = PA_SINK(pa_idxset_first(u->core->sinks, &idx)); sink; sink = PA_SINK(pa_idxset_next(u->core->sinks, &idx)))
-        if (!shall_ignore(PA_OBJECT(sink)))
-            publish_service(get_service(u, PA_OBJECT(sink)));
-
-    for (source = PA_SOURCE(pa_idxset_first(u->core->sources, &idx)); source; source = PA_SOURCE(pa_idxset_next(u->core->sources, &idx)))
-        if (!shall_ignore(PA_OBJECT(source)))
-            publish_service(get_service(u, PA_OBJECT(source)));
-
-    return publish_main_service(u);
-}
-
-static void unpublish_all_services(struct userdata *u) {
-    void *state = NULL;
-    struct service *s;
-
-    pa_assert(u);
-
-    pa_log_debug("Unpublishing services in Bonjour");
-
-    while ((s = pa_hashmap_iterate(u->services, &state, NULL)))
-        service_free(s);
-
-    if (u->main_service)
-        DNSServiceRefDeallocate(u->main_service);
-}
-
-int pa__init(pa_module*m) {
-
-    struct userdata *u;
-    pa_modargs *ma = NULL;
-    char *hn, *un;
-
-    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log("Failed to parse module arguments.");
-        goto fail;
-    }
-
-    m->userdata = u = pa_xnew0(struct userdata, 1);
-    u->core = m->core;
-    u->module = m;
-    u->native = pa_native_protocol_get(u->core);
-
-    u->services = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-
-    u->sink_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
-    u->sink_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
-    u->sink_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u);
-    u->source_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
-    u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
-    u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u);
-
-    un = pa_get_user_name_malloc();
-    hn = pa_get_host_name_malloc();
-    u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), kDNSServiceMaxDomainName-1);
-    pa_xfree(un);
-    pa_xfree(hn);
-
-    publish_all_services(u);
-    pa_modargs_free(ma);
-
-    return 0;
-
-fail:
-    pa__done(m);
-
-    if (ma)
-        pa_modargs_free(ma);
-
-    return -1;
-}
-
-void pa__done(pa_module*m) {
-    struct userdata*u;
-    pa_assert(m);
-
-    if (!(u = m->userdata))
-        return;
-
-    unpublish_all_services(u);
-
-    if (u->services)
-        pa_hashmap_free(u->services, NULL, NULL);
-
-    if (u->sink_new_slot)
-        pa_hook_slot_free(u->sink_new_slot);
-    if (u->source_new_slot)
-        pa_hook_slot_free(u->source_new_slot);
-    if (u->sink_changed_slot)
-        pa_hook_slot_free(u->sink_changed_slot);
-    if (u->source_changed_slot)
-        pa_hook_slot_free(u->source_changed_slot);
-    if (u->sink_unlink_slot)
-        pa_hook_slot_free(u->sink_unlink_slot);
-    if (u->source_unlink_slot)
-        pa_hook_slot_free(u->source_unlink_slot);
-
-    if (u->native)
-        pa_native_protocol_unref(u->native);
-
-    pa_xfree(u->service_name);
-    pa_xfree(u);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-cli.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-cli.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-cli.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-cli.c	2010-01-15 23:21:18.000000000 +0000
@@ -105,7 +105,7 @@
      * of log messages, particularly because if stdout and stderr are
      * dup'ed they share the same O_NDELAY, too. */
 
-    if ((fd = pa_open_cloexec("/dev/tty", O_RDWR|O_NONBLOCK, 0)) >= 0) {
+    if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) {
         io = pa_iochannel_new(m->core->mainloop, fd, fd);
         pa_log_debug("Managed to open /dev/tty.");
     } else {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-combine.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-combine.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-combine.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-combine.c	2010-01-15 23:21:18.000000000 +0000
@@ -890,7 +890,7 @@
             1,
             0,
             0,
-            NULL);
+            &u->sink->silence);
 
     pa_assert_se(pa_idxset_put(u->outputs, o, NULL) == 0);
     update_description(u);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-console-kit.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-console-kit.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-console-kit.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-console-kit.c	2010-01-15 23:21:18.000000000 +0000
@@ -67,6 +67,7 @@
     pa_core *core;
     pa_dbus_connection *connection;
     pa_hashmap *sessions;
+    pa_bool_t filter_added;
 };
 
 static void add_session(struct userdata *u, const char *id) {
@@ -300,7 +301,7 @@
         goto fail;
     }
 
-    m->userdata = u = pa_xnew(struct userdata, 1);
+    m->userdata = u = pa_xnew0(struct userdata, 1);
     u->core = m->core;
     u->module = m;
     u->connection = connection;
@@ -311,6 +312,8 @@
         goto fail;
     }
 
+    u->filter_added = TRUE;
+
     if (pa_dbus_add_matches(
                 pa_dbus_connection_get(connection), &error,
                 "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'",
@@ -359,7 +362,9 @@
                 "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'",
                 "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionRemoved'", NULL);
 
-        dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
+        if (u->filter_added)
+            dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
+
         pa_dbus_connection_unref(u->connection);
     }
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-default-device-restore.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-default-device-restore.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-default-device-restore.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-default-device-restore.c	2010-01-15 23:21:18.000000000 +0000
@@ -60,7 +60,7 @@
 
     if (u->core->default_sink)
         pa_log_info("Manually configured default sink, not overwriting.");
-    else if ((f = pa_fopen_cloexec(u->sink_filename, "r"))) {
+    else if ((f = fopen(u->sink_filename, "r"))) {
         char ln[256] = "";
         pa_sink *s;
 
@@ -81,7 +81,7 @@
 
     if (u->core->default_source)
         pa_log_info("Manually configured default source, not overwriting.");
-    else if ((f = pa_fopen_cloexec(u->source_filename, "r"))) {
+    else if ((f = fopen(u->source_filename, "r"))) {
         char ln[256] = "";
         pa_source *s;
 
@@ -108,7 +108,7 @@
         return;
 
     if (u->sink_filename) {
-        if ((f = pa_fopen_cloexec(u->sink_filename, "w"))) {
+        if ((f = fopen(u->sink_filename, "w"))) {
             pa_sink *s = pa_namereg_get_default_sink(u->core);
             fprintf(f, "%s\n", s ? s->name : "");
             fclose(f);
@@ -117,7 +117,7 @@
     }
 
     if (u->source_filename) {
-        if ((f = pa_fopen_cloexec(u->source_filename, "w"))) {
+        if ((f = fopen(u->source_filename, "w"))) {
             pa_source *s = pa_namereg_get_default_source(u->core);
             fprintf(f, "%s\n", s ? s->name : "");
             fclose(f);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-detect.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-detect.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-detect.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-detect.c	2010-01-15 23:21:18.000000000 +0000
@@ -63,7 +63,7 @@
     FILE *f;
     int n = 0, n_sink = 0, n_source = 0;
 
-    if (!(f = pa_fopen_cloexec("/proc/asound/devices", "r"))) {
+    if (!(f = fopen("/proc/asound/devices", "r"))) {
 
         if (errno != ENOENT)
             pa_log_error("open(\"/proc/asound/devices\") failed: %s", pa_cstrerror(errno));
@@ -124,9 +124,9 @@
     FILE *f;
     int n = 0, b = 0;
 
-    if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
-        !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
-        !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {
+    if (!(f = fopen("/dev/sndstat", "r")) &&
+        !(f = fopen("/proc/sndstat", "r")) &&
+        !(f = fopen("/proc/asound/oss/sndstat", "r"))) {
 
         if (errno != ENOENT)
             pa_log_error("failed to open OSS sndstat device: %s", pa_cstrerror(errno));
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-device-manager.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-device-manager.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-device-manager.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-device-manager.c	2010-01-15 23:21:18.000000000 +0000
@@ -1032,27 +1032,27 @@
 
         if ((e = read_entry(u, name))) {
             uint32_t idx;
-            char *device_name;
+            char *devname;
             uint32_t found_index = PA_INVALID_INDEX;
 
-            if ((device_name = get_name(name, "sink:"))) {
+            if ((devname = get_name(name, "sink:"))) {
                 pa_sink* s;
                 PA_IDXSET_FOREACH(s, u->core->sinks, idx) {
-                    if (strcmp(s->name, device_name) == 0) {
+                    if (strcmp(s->name, devname) == 0) {
                         found_index = s->index;
                         break;
                     }
                 }
-                pa_xfree(device_name);
-            } else if ((device_name = get_name(name, "source:"))) {
+                pa_xfree(devname);
+            } else if ((devname = get_name(name, "source:"))) {
                 pa_source* s;
                 PA_IDXSET_FOREACH(s, u->core->sources, idx) {
-                    if (strcmp(s->name, device_name) == 0) {
+                    if (strcmp(s->name, devname) == 0) {
                         found_index = s->index;
                         break;
                     }
                 }
-                pa_xfree(device_name);
+                pa_xfree(devname);
             }
 
             pa_tagstruct_puts(reply, name);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-equalizer-sink.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-equalizer-sink.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-equalizer-sink.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-equalizer-sink.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,2204 +0,0 @@
-/***
-This file is part of PulseAudio.
-
-This module is based off Lennart Poettering's LADSPA sink and swaps out
-LADSPA functionality for a dbus-aware STFT OLA based digital equalizer.
-All new work is published under Pulseaudio's original license.
-Copyright 2009 Jason Newton <nevion@gmail.com>
-
-Original Author:
-Copyright 2004-2008 Lennart Poettering
-
-PulseAudio is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation; either version 2.1 of the License,
-or (at your option) any later version.
-
-PulseAudio is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <float.h>
-#include <math.h>
-#include <fftw3.h>
-#include <string.h>
-
-#include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
-#include <pulse/timeval.h>
-
-#include <pulsecore/core-rtclock.h>
-#include <pulsecore/aupdate.h>
-#include <pulsecore/core-error.h>
-#include <pulsecore/namereg.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/module.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/log.h>
-#include <pulsecore/thread.h>
-#include <pulsecore/thread-mq.h>
-#include <pulsecore/rtpoll.h>
-#include <pulsecore/sample-util.h>
-#include <pulsecore/shared.h>
-#include <pulsecore/idxset.h>
-#include <pulsecore/strlist.h>
-#include <pulsecore/database.h>
-#include <pulsecore/protocol-dbus.h>
-#include <pulsecore/dbus-util.h>
-
-#include <stdint.h>
-#include <time.h>
-
-
-//#undef __SSE2__
-#ifdef __SSE2__
-#include <xmmintrin.h>
-#include <emmintrin.h>
-#endif
-
-
-
-#include "module-equalizer-sink-symdef.h"
-
-PA_MODULE_AUTHOR("Jason Newton");
-PA_MODULE_DESCRIPTION(_("General Purpose Equalizer"));
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(FALSE);
-PA_MODULE_USAGE(_("sink=<sink to connect to> "));
-
-#define MEMBLOCKQ_MAXLENGTH (16*1024*1024)
-
-
-struct userdata {
-    pa_module *module;
-    pa_sink *sink;
-    pa_sink_input *sink_input;
-    char *name;
-
-    size_t channels;
-    size_t fft_size;//length (res) of fft
-    size_t window_size;/*
-                        *sliding window size
-                        *effectively chooses R
-                        */
-    size_t R;/* the hop size between overlapping windows
-              * the latency of the filter, calculated from window_size
-              * based on constraints of COLA and window function
-              */
-    //for twiddling with pulseaudio
-    size_t overlap_size;//window_size-R
-    size_t samples_gathered;
-    size_t input_buffer_max;
-    //message
-    float *W;//windowing function (time domain)
-    float *work_buffer, **input, **overlap_accum;
-    fftwf_complex *output_window;
-    fftwf_plan forward_plan, inverse_plan;
-    //size_t samplings;
-
-    float **Xs;
-    float ***Hs;//thread updatable copies of the freq response filters (magintude based)
-    pa_aupdate **a_H;
-    pa_memblockq *input_q;
-    char *output_buffer;
-    size_t output_buffer_length;
-    size_t output_buffer_max_length;
-    pa_memblockq *output_q;
-    pa_bool_t first_iteration;
-
-    pa_dbus_protocol *dbus_protocol;
-    char *dbus_path;
-    pa_bool_t set_default;
-
-    pa_database *database;
-    char **base_profiles;
-};
-
-static const char* const valid_modargs[] = {
-    "sink_name",
-    "sink_properties",
-    "master",
-    "format",
-    "rate",
-    "set_default",
-    "channels",
-    "channel_map",
-    NULL
-};
-
-
-#define v_size 4
-#define SINKLIST "equalized_sinklist"
-#define EQDB "equalizer_db"
-#define EQ_STATE_DB "equalizer-state"
-#define FILTER_SIZE (u->fft_size / 2 + 1)
-#define CHANNEL_PROFILE_SIZE (FILTER_SIZE + 1)
-#define FILTER_STATE_SIZE (CHANNEL_PROFILE_SIZE * u->channels)
-static void dbus_init(struct userdata *u);
-static void dbus_done(struct userdata *u);
-
-static void hanning_window(float *W, size_t window_size){
-    //h=.5*(1-cos(2*pi*j/(window_size+1)), COLA for R=(M+1)/2
-    for(size_t i=0; i < window_size;++i){
-        W[i] = (float).5*(1-cos(2*M_PI*i/(window_size+1)));
-    }
-}
-
-static void fix_filter(float *H, size_t fft_size){
-    //divide out the fft gain
-    for(size_t i = 0; i < fft_size / 2 + 1; ++i){
-        H[i] /= fft_size;
-    }
-}
-
-static void interpolate(float *signal, size_t length, uint32_t *xs, float *ys, size_t n_points){
-    //Note that xs must be monotonically increasing!
-    float x_range_lower, x_range_upper, c0;
-    pa_assert_se(n_points>=2);
-    pa_assert_se(xs[0] == 0);
-    pa_assert_se(xs[n_points - 1] == length - 1);
-    for(size_t x = 0, x_range_lower_i = 0; x < length-1; ++x){
-        pa_assert(x_range_lower_i < n_points-1);
-        x_range_lower = (float) (xs[x_range_lower_i]);
-        x_range_upper = (float) (xs[x_range_lower_i+1]);
-        pa_assert_se(x_range_lower < x_range_upper);
-        pa_assert_se(x >= x_range_lower);
-        pa_assert_se(x <= x_range_upper);
-        //bilinear-interpolation of coefficients specified
-        c0 = (x-x_range_lower)/(x_range_upper-x_range_lower);
-        pa_assert_se(c0 >= 0&&c0 <= 1.0);
-        signal[x] = ((1.0f - c0) * ys[x_range_lower_i] + c0 * ys[x_range_lower_i + 1]);
-        while(x >= xs[x_range_lower_i + 1]){
-            x_range_lower_i++;
-        }
-    }
-    signal[length-1]=ys[n_points-1];
-}
-
-static int is_monotonic(const uint32_t *xs,size_t length){
-    if(length<2){
-        return 1;
-    }
-    for(size_t i = 1; i < length; ++i){
-        if(xs[i]<=xs[i-1]){
-            return 0;
-        }
-    }
-    return 1;
-}
-
-//ensure's memory allocated is a multiple of v_size
-//and aligned
-static void * alloc(size_t x,size_t s){
-    size_t f = PA_ROUND_UP(x*s, sizeof(float)*v_size);
-    float *t;
-    pa_assert(f >= x*s);
-    t = fftwf_malloc(f);
-    memset(t, 0, f);
-    return t;
-}
-
-static void alloc_input_buffers(struct userdata *u, size_t min_buffer_length){
-    if(min_buffer_length <= u->input_buffer_max){
-        return;
-    }
-    pa_assert(min_buffer_length >= u->window_size);
-    for(size_t c = 0; c < u->channels; ++c){
-        float *tmp = alloc(min_buffer_length, sizeof(float));
-        if(u->input[c]){
-            if(!u->first_iteration){
-                memcpy(tmp, u->input[c], u->overlap_size * sizeof(float));
-            }
-            free(u->input[c]);
-        }
-        u->input[c] = tmp;
-    }
-    u->input_buffer_max = min_buffer_length;
-}
-
-/* Called from I/O thread context */
-static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
-    struct userdata *u = PA_SINK(o)->userdata;
-
-    switch (code) {
-
-        case PA_SINK_MESSAGE_GET_LATENCY: {
-            //size_t fs=pa_frame_size(&u->sink->sample_spec);
-
-            /* The sink is _put() before the sink input is, so let's
-             * make sure we don't access it in that time. Also, the
-             * sink input is first shut down, the sink second. */
-            if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
-                !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state)) {
-                *((pa_usec_t*) data) = 0;
-                return 0;
-            }
-
-            *((pa_usec_t*) data) =
-                /* Get the latency of the master sink */
-                pa_sink_get_latency_within_thread(u->sink_input->sink) +
-
-                /* Add the latency internal to our sink input on top */
-                pa_bytes_to_usec(pa_memblockq_get_length(u->output_q), &u->sink_input->sink->sample_spec) +
-                pa_bytes_to_usec(pa_memblockq_get_length(u->sink_input->thread_info.render_memblockq), &u->sink_input->sink->sample_spec) +
-                pa_bytes_to_usec(pa_memblockq_get_length(u->input_q), &u->sink_input->sink->sample_spec);
-            //    pa_bytes_to_usec(u->samples_gathered * fs, &u->sink->sample_spec);
-            //+ pa_bytes_to_usec(u->latency * fs, ss)
-            return 0;
-        }
-    }
-
-    return pa_sink_process_msg(o, code, data, offset, chunk);
-}
-
-
-/* Called from main context */
-static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state) {
-    struct userdata *u;
-
-    pa_sink_assert_ref(s);
-    pa_assert_se(u = s->userdata);
-
-    if (!PA_SINK_IS_LINKED(state) ||
-        !PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(u->sink_input)))
-        return 0;
-
-    pa_sink_input_cork(u->sink_input, state == PA_SINK_SUSPENDED);
-    return 0;
-}
-
-/* Called from I/O thread context */
-static void sink_request_rewind_cb(pa_sink *s) {
-    struct userdata *u;
-
-    pa_sink_assert_ref(s);
-    pa_assert_se(u = s->userdata);
-
-    if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
-        !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state))
-        return;
-
-    /* Just hand this one over to the master sink */
-    pa_sink_input_request_rewind(u->sink_input, s->thread_info.rewind_nbytes+pa_memblockq_get_length(u->input_q), TRUE, FALSE, FALSE);
-}
-
-/* Called from I/O thread context */
-static void sink_update_requested_latency_cb(pa_sink *s) {
-    struct userdata *u;
-
-    pa_sink_assert_ref(s);
-    pa_assert_se(u = s->userdata);
-
-    if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
-        !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state))
-        return;
-
-    /* Just hand this one over to the master sink */
-    pa_sink_input_set_requested_latency_within_thread(
-            u->sink_input,
-            pa_sink_get_requested_latency_within_thread(s));
-}
-
-/* Called from main context */
-static void sink_set_volume_cb(pa_sink *s) {
-    struct userdata *u;
-
-    pa_sink_assert_ref(s);
-    pa_assert_se(u = s->userdata);
-
-    if (!PA_SINK_IS_LINKED(pa_sink_get_state(s)) ||
-        !PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(u->sink_input)))
-        return;
-
-    pa_sink_input_set_volume(u->sink_input, &s->real_volume, s->save_volume, TRUE);
-}
-
-/* Called from main context */
-static void sink_set_mute_cb(pa_sink *s) {
-    struct userdata *u;
-
-    pa_sink_assert_ref(s);
-    pa_assert_se(u = s->userdata);
-
-    if (!PA_SINK_IS_LINKED(pa_sink_get_state(s)) ||
-        !PA_SINK_INPUT_IS_LINKED(pa_sink_input_get_state(u->sink_input)))
-        return;
-
-    pa_sink_input_set_mute(u->sink_input, s->muted, s->save_muted);
-}
-
-#if 1
-//reference implementation
-static void dsp_logic(
-    float * restrict dst,//used as a temp array too, needs to be fft_length!
-    float * restrict src,/*input data w/ overlap at start,
-                               *automatically cycled in routine
-                               */
-    float * restrict overlap,
-    const float X,//multipliar
-    const float * restrict H,//The freq. magnitude scalers filter
-    const float * restrict W,//The windowing function
-    fftwf_complex * restrict output_window,//The transformed window'd src
-    struct userdata *u){
-    //use a linear-phase sliding STFT and overlap-add method (for each channel)
-    //window the data
-    for(size_t j = 0; j < u->window_size; ++j){
-        dst[j] = X * W[j] * src[j];
-    }
-    //zero padd the the remaining fft window
-    memset(dst + u->window_size, 0, (u->fft_size - u->window_size) * sizeof(float));
-    //Processing is done here!
-    //do fft
-    fftwf_execute_dft_r2c(u->forward_plan, dst, output_window);
-    //perform filtering
-    for(size_t j = 0; j < FILTER_SIZE; ++j){
-        u->output_window[j][0] *= H[j];
-        u->output_window[j][1] *= H[j];
-    }
-    //inverse fft
-    fftwf_execute_dft_c2r(u->inverse_plan, output_window, dst);
-    ////debug: tests overlaping add
-    ////and negates ALL PREVIOUS processing
-    ////yields a perfect reconstruction if COLA is held
-    //for(size_t j = 0; j < u->window_size; ++j){
-    //    u->work_buffer[j] = u->W[j] * u->input[c][j];
-    //}
-
-    //overlap add and preserve overlap component from this window (linear phase)
-    for(size_t j = 0; j < u->overlap_size; ++j){
-        u->work_buffer[j] += overlap[j];
-        overlap[j] = dst[u->R + j];
-    }
-    ////debug: tests if basic buffering works
-    ////shouldn't modify the signal AT ALL (beyond roundoff)
-    //for(size_t j = 0; j < u->window_size;++j){
-    //    u->work_buffer[j] = u->input[c][j];
-    //}
-
-    //preseve the needed input for the next window's overlap
-    memmove(src, src + u->R,
-        (u->samples_gathered - u->R) * sizeof(float)
-    );
-}
-#else
-typedef float v4sf __attribute__ ((__aligned__(v_size * sizeof(float))));
-typedef union float_vector {
-    float f[v_size];
-    v4sf v;
-    __m128 m;
-} float_vector_t;
-
-//regardless of sse enabled, the loops in here assume
-//16 byte aligned addresses and memory allocations divisible by v_size
-static void dsp_logic(
-    float * restrict dst,//used as a temp array too, needs to be fft_length!
-    float * restrict src,/*input data w/ overlap at start,
-                               *automatically cycled in routine
-                               */
-    float * restrict overlap,//The size of the overlap
-    const float X,//multipliar
-    const float * restrict H,//The freq. magnitude scalers filter
-    const float * restrict W,//The windowing function
-    fftwf_complex * restrict output_window,//The transformed window'd src
-    struct userdata *u){//Collection of constants
-    const size_t overlap_size = PA_ROUND_UP(u->overlap_size, v_size);
-    float_vector_t x;
-    x.f[0] = x.f[1] = x.f[2] = x.f[3] = X;
-
-    //assert(u->samples_gathered >= u->R);
-    //use a linear-phase sliding STFT and overlap-add method
-    for(size_t j = 0; j < u->window_size; j += v_size){
-        //dst[j] = W[j] * src[j];
-        float_vector_t *d = (float_vector_t*) (dst + j);
-        float_vector_t *w = (float_vector_t*) (W + j);
-        float_vector_t *s = (float_vector_t*) (src + j);
-//#if __SSE2__
-        d->m = _mm_mul_ps(x.m, _mm_mul_ps(w->m, s->m));
-//        d->v = x->v * w->v * s->v;
-//#endif
-    }
-    //zero padd the the remaining fft window
-    memset(dst + u->window_size, 0, (u->fft_size - u->window_size) * sizeof(float));
-
-    //Processing is done here!
-    //do fft
-    fftwf_execute_dft_r2c(u->forward_plan, dst, output_window);
-    //perform filtering - purely magnitude based
-    for(size_t j = 0; j < FILTER_SIZE; j += v_size / 2){
-        //output_window[j][0]*=H[j];
-        //output_window[j][1]*=H[j];
-        float_vector_t *d = (float_vector_t*)( ((float *) output_window) + 2 * j);
-        float_vector_t h;
-        h.f[0] = h.f[1] = H[j];
-        h.f[2] = h.f[3] = H[j + 1];
-//#if __SSE2__
-        d->m = _mm_mul_ps(d->m, h.m);
-//#else
-//        d->v = d->v * h.v;
-//#endif
-    }
-
-    //inverse fft
-    fftwf_execute_dft_c2r(u->inverse_plan, output_window, dst);
-
-    ////debug: tests overlaping add
-    ////and negates ALL PREVIOUS processing
-    ////yields a perfect reconstruction if COLA is held
-    //for(size_t j = 0; j < u->window_size; ++j){
-    //    dst[j] = W[j] * src[j];
-    //}
-
-    //overlap add and preserve overlap component from this window (linear phase)
-    for(size_t j = 0; j < overlap_size; j += v_size){
-        //dst[j]+=overlap[j];
-        //overlap[j]+=dst[j+R];
-        float_vector_t *d = (float_vector_t*)(dst + j);
-        float_vector_t *o = (float_vector_t*)(overlap + j);
-//#if __SSE2__
-        d->m = _mm_add_ps(d->m, o->m);
-        o->m = ((float_vector_t*)(dst + u->R + j))->m;
-//#else
-//        d->v = d->v + o->v;
-//        o->v = ((float_vector_t*)(dst + u->R + j))->v;
-//#endif
-    }
-    //memcpy(overlap, dst+u->R, u->overlap_size * sizeof(float)); //overlap preserve (debug)
-    //zero out the bit beyond the real overlap so we don't add garbage next iteration
-    memset(overlap + u->overlap_size, 0, overlap_size - u->overlap_size);
-
-    ////debug: tests if basic buffering works
-    ////shouldn't modify the signal AT ALL (beyond roundoff)
-    //for(size_t j = 0; j < u->window_size; ++j){
-    //    dst[j] = src[j];
-    //}
-
-    //preseve the needed input for the next window's overlap
-    memmove(src, src + u->R,
-        (u->samples_gathered - u->R) * sizeof(float)
-    );
-}
-#endif
-
-static void flatten_to_memblockq(struct userdata *u){
-    size_t mbs = pa_mempool_block_size_max(u->sink->core->mempool);
-    pa_memchunk tchunk;
-    char *dst;
-    size_t i = 0;
-    while(i < u->output_buffer_length){
-        tchunk.index = 0;
-        tchunk.length = PA_MIN((u->output_buffer_length - i), mbs);
-        tchunk.memblock = pa_memblock_new(u->sink->core->mempool, tchunk.length);
-        //pa_log_debug("pushing %ld into the q", tchunk.length);
-        dst = pa_memblock_acquire(tchunk.memblock);
-        memcpy(dst, u->output_buffer + i, tchunk.length);
-        pa_memblock_release(tchunk.memblock);
-        pa_memblockq_push(u->output_q, &tchunk);
-        pa_memblock_unref(tchunk.memblock);
-        i += tchunk.length;
-    }
-}
-
-static void process_samples(struct userdata *u){
-    size_t fs = pa_frame_size(&(u->sink->sample_spec));
-    unsigned a_i;
-    float *H, X;
-    size_t iterations, offset;
-    pa_assert(u->samples_gathered >= u->window_size);
-    iterations = (u->samples_gathered - u->overlap_size) / u->R;
-    //make sure there is enough buffer memory allocated
-    if(iterations * u->R * fs > u->output_buffer_max_length){
-        u->output_buffer_max_length = iterations * u->R * fs;
-        if(u->output_buffer){
-            pa_xfree(u->output_buffer);
-        }
-        u->output_buffer = pa_xmalloc(u->output_buffer_max_length);
-    }
-    u->output_buffer_length = iterations * u->R * fs;
-
-    for(size_t iter = 0; iter < iterations; ++iter){
-        offset = iter * u->R * fs;
-        for(size_t c = 0;c < u->channels; c++) {
-            a_i = pa_aupdate_read_begin(u->a_H[c]);
-            X = u->Xs[c][a_i];
-            H = u->Hs[c][a_i];
-            dsp_logic(
-                u->work_buffer,
-                u->input[c],
-                u->overlap_accum[c],
-                X,
-                H,
-                u->W,
-                u->output_window,
-                u
-            );
-            pa_aupdate_read_end(u->a_H[c]);
-            if(u->first_iteration){
-                /* The windowing function will make the audio ramped in, as a cheap fix we can
-                 * undo the windowing (for non-zero window values)
-                 */
-                for(size_t i = 0; i < u->overlap_size; ++i){
-                    u->work_buffer[i] = u->W[i] <= FLT_EPSILON ? u->work_buffer[i] : u->work_buffer[i] / u->W[i];
-                }
-            }
-            pa_sample_clamp(PA_SAMPLE_FLOAT32NE, (uint8_t *) (((float *)u->output_buffer) + c) + offset, fs, u->work_buffer, sizeof(float), u->R);
-        }
-        if(u->first_iteration){
-            u->first_iteration = FALSE;
-        }
-        u->samples_gathered -= u->R;
-    }
-    flatten_to_memblockq(u);
-}
-
-static void input_buffer(struct userdata *u, pa_memchunk *in){
-    size_t fs = pa_frame_size(&(u->sink->sample_spec));
-    size_t samples = in->length/fs;
-    float *src = (float*) ((uint8_t*) pa_memblock_acquire(in->memblock) + in->index);
-    pa_assert(u->samples_gathered + samples <= u->input_buffer_max);
-    for(size_t c = 0; c < u->channels; c++) {
-        //buffer with an offset after the overlap from previous
-        //iterations
-        pa_assert_se(
-            u->input[c] + u->samples_gathered + samples <= u->input[c] + u->input_buffer_max
-        );
-        pa_sample_clamp(PA_SAMPLE_FLOAT32NE, u->input[c] + u->samples_gathered, sizeof(float), src + c, fs, samples);
-    }
-    u->samples_gathered += samples;
-    pa_memblock_release(in->memblock);
-}
-
-/* Called from I/O thread context */
-static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) {
-    struct userdata *u;
-    size_t fs, target_samples;
-    size_t mbs;
-    //struct timeval start, end;
-    pa_memchunk tchunk;
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-    pa_assert(chunk);
-    pa_assert(u->sink);
-    fs = pa_frame_size(&(u->sink->sample_spec));
-    mbs = pa_mempool_block_size_max(u->sink->core->mempool);
-    if(pa_memblockq_get_length(u->output_q) > 0){
-        //pa_log_debug("qsize is %ld", pa_memblockq_get_length(u->output_q));
-        goto END;
-    }
-    //nbytes = PA_MIN(nbytes, pa_mempool_block_size_max(u->sink->core->mempool));
-    target_samples = PA_ROUND_UP(nbytes / fs, u->R);
-    ////pa_log_debug("vanilla mbs = %ld",mbs);
-    //mbs = PA_ROUND_DOWN(mbs / fs, u->R);
-    //mbs = PA_MAX(mbs, u->R);
-    //target_samples = PA_MAX(target_samples, mbs);
-    //pa_log_debug("target samples: %ld", target_samples);
-    if(u->first_iteration){
-        //allocate request_size
-        target_samples = PA_MAX(target_samples, u->window_size);
-    }else{
-        //allocate request_size + overlap
-        target_samples += u->overlap_size;
-    }
-    alloc_input_buffers(u, target_samples);
-    //pa_log_debug("post target samples: %ld", target_samples);
-    chunk->memblock = NULL;
-
-    /* Hmm, process any rewind request that might be queued up */
-    pa_sink_process_rewind(u->sink, 0);
-
-    //pa_log_debug("start output-buffered %ld, input-buffered %ld, requested %ld",buffered_samples,u->samples_gathered,samples_requested);
-    //pa_rtclock_get(&start);
-    do{
-        size_t input_remaining = target_samples - u->samples_gathered;
-       // pa_log_debug("input remaining %ld samples", input_remaining);
-        pa_assert(input_remaining > 0);
-        while(pa_memblockq_peek(u->input_q, &tchunk) < 0){
-            //pa_sink_render(u->sink, input_remaining * fs, &tchunk);
-            pa_sink_render_full(u->sink, PA_MIN(input_remaining * fs, mbs), &tchunk);
-            pa_assert(tchunk.memblock);
-            pa_memblockq_push(u->input_q, &tchunk);
-            pa_memblock_unref(tchunk.memblock);
-        }
-        pa_assert(tchunk.memblock);
-        tchunk.length = PA_MIN(input_remaining * fs, tchunk.length);
-        pa_memblockq_drop(u->input_q, tchunk.length);
-        //pa_log_debug("asked for %ld input samples, got %ld samples",input_remaining,buffer->length/fs);
-        /* copy new input */
-        //pa_rtclock_get(start);
-       // pa_log_debug("buffering %ld bytes", tchunk.length);
-        input_buffer(u, &tchunk);
-        //pa_rtclock_get(&end);
-        //pa_log_debug("Took %0.5f seconds to setup", pa_timeval_diff(end, start) / (double) PA_USEC_PER_SEC);
-        pa_memblock_unref(tchunk.memblock);
-    }while(u->samples_gathered < target_samples);
-
-    //pa_rtclock_get(&end);
-    //pa_log_debug("Took %0.6f seconds to get data", (double) pa_timeval_diff(&end, &start) / PA_USEC_PER_SEC);
-
-    pa_assert(u->fft_size >= u->window_size);
-    pa_assert(u->R < u->window_size);
-    //pa_rtclock_get(&start);
-    /* process a block */
-    process_samples(u);
-    //pa_rtclock_get(&end);
-    //pa_log_debug("Took %0.6f seconds to process", (double) pa_timeval_diff(&end, &start) / PA_USEC_PER_SEC);
-END:
-    pa_assert_se(pa_memblockq_peek(u->output_q, chunk) >= 0);
-    pa_assert(chunk->memblock);
-    pa_memblockq_drop(u->output_q, chunk->length);
-    //pa_log_debug("gave %ld", chunk->length/fs);
-    //pa_log_debug("end pop");
-    return 0;
-}
-
-/* Called from main context */
-static void sink_input_volume_changed_cb(pa_sink_input *i) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_sink_volume_changed(u->sink, &i->volume);
-}
-
-/* Called from main context */
-static void sink_input_mute_changed_cb(pa_sink_input *i) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_sink_mute_changed(u->sink, i->muted);
-}
-
-static void reset_filter(struct userdata *u){
-    size_t fs = pa_frame_size(&u->sink->sample_spec);
-    size_t max_request;
-    u->samples_gathered = 0;
-    for(size_t i = 0; i < u->channels; ++i){
-        memset(u->overlap_accum[i], 0, u->overlap_size * sizeof(float));
-    }
-    u->first_iteration = TRUE;
-    //set buffer size to max request, no overlap copy
-    max_request = PA_ROUND_UP(pa_sink_input_get_max_request(u->sink_input) / fs , u->R);
-    max_request = PA_MAX(max_request, u->window_size);
-    pa_sink_set_max_request_within_thread(u->sink, max_request * fs);
-}
-
-/* Called from I/O thread context */
-static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) {
-    struct userdata *u;
-    size_t amount = 0;
-
-    pa_log_debug("Rewind callback!");
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    if (u->sink->thread_info.rewind_nbytes > 0) {
-        size_t max_rewrite;
-
-        //max_rewrite = nbytes;
-        max_rewrite = nbytes + pa_memblockq_get_length(u->input_q);
-        //PA_MIN(pa_memblockq_get_length(u->input_q), nbytes);
-        amount = PA_MIN(u->sink->thread_info.rewind_nbytes, max_rewrite);
-        u->sink->thread_info.rewind_nbytes = 0;
-
-        if (amount > 0) {
-            //invalidate the output q
-            pa_memblockq_seek(u->input_q, - (int64_t) amount, PA_SEEK_RELATIVE, TRUE);
-            pa_log("Resetting filter");
-            //reset_filter(u); //this is the "proper" thing to do...
-        }
-    }
-
-    pa_sink_process_rewind(u->sink, amount);
-    pa_memblockq_rewind(u->input_q, nbytes);
-}
-
-/* Called from I/O thread context */
-static void sink_input_update_max_rewind_cb(pa_sink_input *i, size_t nbytes) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_memblockq_set_maxrewind(u->input_q, nbytes);
-    pa_sink_set_max_rewind_within_thread(u->sink, nbytes);
-}
-
-/* Called from I/O thread context */
-static void sink_input_update_max_request_cb(pa_sink_input *i, size_t nbytes) {
-    struct userdata *u;
-    size_t fs;
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-    //if(u->first_iteration){
-    //    return;
-    //}
-    fs = pa_frame_size(&(u->sink->sample_spec));
-    pa_sink_set_max_request_within_thread(u->sink, PA_ROUND_UP(nbytes / fs, u->R) * fs);
-}
-
-/* Called from I/O thread context */
-static void sink_input_update_sink_latency_range_cb(pa_sink_input *i) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_sink_set_latency_range_within_thread(u->sink, i->sink->thread_info.min_latency, i->sink->thread_info.max_latency);
-}
-
-/* Called from I/O thread context */
-static void sink_input_update_sink_fixed_latency_cb(pa_sink_input *i) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_sink_set_fixed_latency_within_thread(u->sink, i->sink->thread_info.fixed_latency);
-}
-
-/* Called from I/O thread context */
-static void sink_input_detach_cb(pa_sink_input *i) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_sink_detach_within_thread(u->sink);
-
-    pa_sink_set_rtpoll(u->sink, NULL);
-}
-
-/* Called from I/O thread context */
-static void sink_input_attach_cb(pa_sink_input *i) {
-    struct userdata *u;
-    size_t fs, max_request;
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    pa_sink_set_rtpoll(u->sink, i->sink->thread_info.rtpoll);
-    pa_sink_set_latency_range_within_thread(u->sink, i->sink->thread_info.min_latency, i->sink->thread_info.max_latency);
-
-    pa_sink_set_fixed_latency_within_thread(u->sink, i->sink->thread_info.fixed_latency);
-    fs = pa_frame_size(&u->sink->sample_spec);
-    //set buffer size to max request, no overlap copy
-    max_request = PA_ROUND_UP(pa_sink_input_get_max_request(u->sink_input) / fs , u->R);
-    max_request = PA_MAX(max_request, u->window_size);
-    pa_sink_set_max_request_within_thread(u->sink, max_request * fs);
-    pa_sink_set_max_rewind_within_thread(u->sink, pa_sink_input_get_max_rewind(i));
-    pa_sink_attach_within_thread(u->sink);
-    if(u->set_default){
-        pa_log_debug("Setting default sink to %s", u->sink->name);
-        pa_namereg_set_default_sink(u->module->core, u->sink);
-    }
-}
-
-/* Called from main context */
-static void sink_input_kill_cb(pa_sink_input *i) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    /* The order here matters! We first kill the sink input, followed
-     * by the sink. That means the sink callbacks must be protected
-     * against an unconnected sink input! */
-    pa_sink_input_unlink(u->sink_input);
-    pa_sink_unlink(u->sink);
-
-    pa_sink_input_unref(u->sink_input);
-    u->sink_input = NULL;
-
-    pa_sink_unref(u->sink);
-    u->sink = NULL;
-
-    pa_module_unload_request(u->module, TRUE);
-}
-
-/* Called from IO thread context */
-static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t state) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    /* If we are added for the first time, ask for a rewinding so that
-     * we are heard right-away. */
-    if (PA_SINK_INPUT_IS_LINKED(state) &&
-        i->thread_info.state == PA_SINK_INPUT_INIT) {
-        pa_log_debug("Requesting rewind due to state change.");
-        pa_sink_input_request_rewind(i, 0, FALSE, TRUE, TRUE);
-    }
-}
-
-static void pack(char **strs, size_t len, char **packed, size_t *length){
-    size_t t_len = 0;
-    size_t headers = (1+len) * sizeof(uint16_t);
-    char *p;
-    for(size_t i = 0; i < len; ++i){
-        t_len += strlen(strs[i]);
-    }
-    *length = headers + t_len;
-    p = *packed = pa_xmalloc0(*length);
-    *((uint16_t *) p) = (uint16_t) len;
-    p += sizeof(uint16_t);
-    for(size_t i = 0; i < len; ++i){
-        uint16_t l = strlen(strs[i]);
-        *((uint16_t *) p) = (uint16_t) l;
-        p += sizeof(uint16_t);
-        memcpy(p, strs[i], l);
-        p += l;
-    }
-}
-static void unpack(char *str, size_t length, char ***strs, size_t *len){
-    char *p = str;
-    *len = *((uint16_t *) p);
-    p += sizeof(uint16_t);
-    *strs = pa_xnew(char *, *len);
-
-    for(size_t i = 0; i < *len; ++i){
-        size_t l = *((uint16_t *) p);
-        p += sizeof(uint16_t);
-        (*strs)[i] = pa_xnew(char, l + 1);
-        memcpy((*strs)[i], p, l);
-        (*strs)[i][l] = '\0';
-        p += l;
-    }
-}
-static void save_profile(struct userdata *u, size_t channel, char *name){
-    unsigned a_i;
-    const size_t profile_size = CHANNEL_PROFILE_SIZE * sizeof(float);
-    float *H_n, *profile;
-    const float *H;
-    pa_datum key, data;
-    profile = pa_xnew0(float, profile_size);
-    a_i = pa_aupdate_read_begin(u->a_H[channel]);
-    profile[0] = u->Xs[a_i][channel];
-    H = u->Hs[channel][a_i];
-    H_n = profile + 1;
-    for(size_t i = 0 ; i <= FILTER_SIZE; ++i){
-        H_n[i] = H[i] * u->fft_size;
-        //H_n[i] = H[i];
-    }
-    pa_aupdate_read_end(u->a_H[channel]);
-    key.data=name;
-    key.size = strlen(key.data);
-    data.data = profile;
-    data.size = profile_size;
-    pa_database_set(u->database, &key, &data, TRUE);
-    pa_database_sync(u->database);
-    if(u->base_profiles[channel]){
-        pa_xfree(u->base_profiles[channel]);
-    }
-    u->base_profiles[channel] = pa_xstrdup(name);
-}
-
-static void save_state(struct userdata *u){
-    unsigned a_i;
-    const size_t filter_state_size = FILTER_STATE_SIZE * sizeof(float);
-    float *H_n, *state;
-    float *H;
-    pa_datum key, data;
-    pa_database *database;
-    char *dbname;
-    char *state_name = u->name;
-    char *packed;
-    size_t packed_length;
-
-    pack(u->base_profiles, u->channels, &packed, &packed_length);
-    state = (float *) pa_xmalloc0(filter_state_size + packed_length);
-    memcpy(state + FILTER_STATE_SIZE, packed, packed_length);
-    pa_xfree(packed);
-
-    for(size_t c = 0; c < u->channels; ++c){
-        a_i = pa_aupdate_read_begin(u->a_H[c]);
-        state[c * CHANNEL_PROFILE_SIZE] = u->Xs[c][a_i];
-        H = u->Hs[c][a_i];
-        H_n = &state[c * CHANNEL_PROFILE_SIZE + 1];
-        memcpy(H_n, H, FILTER_SIZE * sizeof(float));
-        pa_aupdate_read_end(u->a_H[c]);
-    }
-
-    key.data = state_name;
-    key.size = strlen(key.data);
-    data.data = state;
-    data.size = filter_state_size + packed_length;
-    //thread safety for 0.9.17?
-    pa_assert_se(dbname = pa_state_path(EQ_STATE_DB, FALSE));
-    pa_assert_se(database = pa_database_open(dbname, TRUE));
-    pa_xfree(dbname);
-
-    pa_database_set(database, &key, &data, TRUE);
-    pa_database_sync(database);
-    pa_database_close(database);
-    pa_xfree(state);
-}
-
-static void remove_profile(pa_core *c, char *name){
-    pa_datum key;
-    pa_database *database;
-    key.data = name;
-    key.size = strlen(key.data);
-    pa_assert_se(database = pa_shared_get(c, EQDB));
-    pa_database_unset(database, &key);
-    pa_database_sync(database);
-}
-
-static const char* load_profile(struct userdata *u, size_t channel, char *name){
-    unsigned a_i;
-    pa_datum key, value;
-    const size_t profile_size = CHANNEL_PROFILE_SIZE * sizeof(float);
-    key.data = name;
-    key.size = strlen(key.data);
-    if(pa_database_get(u->database, &key, &value) != NULL){
-        if(value.size == profile_size){
-            float *profile = (float *) value.data;
-            a_i = pa_aupdate_write_begin(u->a_H[channel]);
-            u->Xs[channel][a_i] = profile[0];
-            memcpy(u->Hs[channel][a_i], profile + 1, FILTER_SIZE * sizeof(float));
-            fix_filter(u->Hs[channel][a_i], u->fft_size);
-            pa_aupdate_write_end(u->a_H[channel]);
-            pa_xfree(u->base_profiles[channel]);
-            u->base_profiles[channel] = pa_xstrdup(name);
-        }else{
-            return "incompatible size";
-        }
-        pa_datum_free(&value);
-    }else{
-        return "profile doesn't exist";
-    }
-    return NULL;
-}
-
-static void load_state(struct userdata *u){
-    unsigned a_i;
-    float *H;
-    pa_datum key, value;
-    pa_database *database;
-    char *dbname;
-    char *state_name = u->name;
-    pa_assert_se(dbname = pa_state_path(EQ_STATE_DB, FALSE));
-    database = pa_database_open(dbname, FALSE);
-    pa_xfree(dbname);
-    if(!database){
-        pa_log("No resume state");
-        return;
-    }
-
-    key.data = state_name;
-    key.size = strlen(key.data);
-
-    if(pa_database_get(database, &key, &value) != NULL){
-        if(value.size > FILTER_STATE_SIZE * sizeof(float) + sizeof(uint16_t)){
-            float *state = (float *) value.data;
-            size_t n_profs;
-            char **names;
-            for(size_t c = 0; c < u->channels; ++c){
-                a_i = pa_aupdate_write_begin(u->a_H[c]);
-                H = state + c * CHANNEL_PROFILE_SIZE + 1;
-                u->Xs[c][a_i] = state[c * CHANNEL_PROFILE_SIZE];
-                memcpy(u->Hs[c][a_i], H, FILTER_SIZE * sizeof(float));
-                pa_aupdate_write_end(u->a_H[c]);
-            }
-            unpack(((char *)value.data) + FILTER_STATE_SIZE * sizeof(float), value.size - FILTER_STATE_SIZE * sizeof(float), &names, &n_profs);
-            n_profs = PA_MIN(n_profs, u->channels);
-            for(size_t c = 0; c < n_profs; ++c){
-                pa_xfree(u->base_profiles[c]);
-                u->base_profiles[c] = names[c];
-            }
-            pa_xfree(names);
-        }
-        pa_datum_free(&value);
-    }else{
-        pa_log("resume state exists but is wrong size!");
-    }
-    pa_database_close(database);
-}
-
-/* Called from main context */
-static pa_bool_t sink_input_may_move_to_cb(pa_sink_input *i, pa_sink *dest) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-
-    return u->sink != dest;
-}
-
-/* Called from main context */
-static void sink_input_moving_cb(pa_sink_input *i, pa_sink *dest) {
-    struct userdata *u;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_se(u = i->userdata);
-    if (dest) {
-        pa_sink_set_asyncmsgq(u->sink, dest->asyncmsgq);
-        pa_sink_update_flags(u->sink, PA_SINK_LATENCY|PA_SINK_DYNAMIC_LATENCY, dest->flags);
-    } else
-        pa_sink_set_asyncmsgq(u->sink, NULL);
-}
-
-int pa__init(pa_module*m) {
-    struct userdata *u;
-    pa_sample_spec ss;
-    pa_channel_map map;
-    pa_modargs *ma;
-    const char *z;
-    pa_sink *master;
-    pa_sink_input_new_data sink_input_data;
-    pa_sink_new_data sink_data;
-    size_t fs;
-    float *H;
-    unsigned a_i;
-
-    pa_assert(m);
-
-    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log("Failed to parse module arguments.");
-        goto fail;
-    }
-
-    if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "master", NULL), PA_NAMEREG_SINK))) {
-        pa_log("Master sink not found, trying default");
-        master = pa_namereg_get_default_sink(m->core);
-        if(!master){
-            pa_log("no default sink found!");
-            goto fail;
-        }
-    }
-
-    ss = master->sample_spec;
-    ss.format = PA_SAMPLE_FLOAT32;
-    map = master->channel_map;
-    if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) {
-        pa_log("Invalid sample format specification or channel map");
-        goto fail;
-    }
-    fs = pa_frame_size(&ss);
-
-    u = pa_xnew0(struct userdata, 1);
-    u->module = m;
-    m->userdata = u;
-
-    u->set_default = TRUE;
-    pa_modargs_get_value_boolean(ma, "set_default", &u->set_default);
-
-    u->channels = ss.channels;
-    u->fft_size = pow(2, ceil(log(ss.rate) / log(2)));//probably unstable near corner cases of powers of 2
-    pa_log_debug("fft size: %ld", u->fft_size);
-    u->window_size = 15999;
-    if(u->window_size % 2 == 0){
-        u->window_size--;
-    }
-    u->R = (u->window_size + 1) / 2;
-    u->overlap_size = u->window_size - u->R;
-    u->samples_gathered = 0;
-    u->input_buffer_max = 0;
-    u->a_H = pa_xnew0(pa_aupdate *, u->channels);
-    u->Xs = pa_xnew0(float *, u->channels);
-    u->Hs = pa_xnew0(float **, u->channels);
-    for(size_t c = 0; c < u->channels; ++c){
-        u->Xs[c] = pa_xnew0(float, 2);
-        u->Hs[c] = pa_xnew0(float *, 2);
-        for(size_t i = 0; i < 2; ++i){
-            u->Hs[c][i] = alloc(FILTER_SIZE, sizeof(float));
-        }
-    }
-    u->W = alloc(u->window_size, sizeof(float));
-    u->work_buffer = alloc(u->fft_size, sizeof(float));
-    memset(u->work_buffer, 0, u->fft_size*sizeof(float));
-    u->input = pa_xnew0(float *, u->channels);
-    u->overlap_accum = pa_xnew0(float *, u->channels);
-    for(size_t c = 0; c < u->channels; ++c){
-        u->a_H[c] = pa_aupdate_new();
-        u->input[c] = NULL;
-        u->overlap_accum[c] = alloc(u->overlap_size, sizeof(float));
-    }
-    u->output_window = alloc((FILTER_SIZE), sizeof(fftwf_complex));
-    u->forward_plan = fftwf_plan_dft_r2c_1d(u->fft_size, u->work_buffer, u->output_window, FFTW_ESTIMATE);
-    u->inverse_plan = fftwf_plan_dft_c2r_1d(u->fft_size, u->output_window, u->work_buffer, FFTW_ESTIMATE);
-
-    hanning_window(u->W, u->window_size);
-    u->first_iteration = TRUE;
-
-    u->base_profiles = pa_xnew0(char *, u->channels);
-    for(size_t c = 0; c < u->channels; ++c){
-        u->base_profiles[c] = pa_xstrdup("default");
-    }
-
-    /* Create sink */
-    pa_sink_new_data_init(&sink_data);
-    sink_data.driver = __FILE__;
-    sink_data.module = m;
-    if (!(sink_data.name = pa_xstrdup(pa_modargs_get_value(ma, "sink_name", NULL))))
-        sink_data.name = pa_sprintf_malloc("%s.equalizer", master->name);
-    pa_sink_new_data_set_sample_spec(&sink_data, &ss);
-    pa_sink_new_data_set_channel_map(&sink_data, &map);
-    z = pa_proplist_gets(master->proplist, PA_PROP_DEVICE_DESCRIPTION);
-    pa_proplist_setf(sink_data.proplist, PA_PROP_DEVICE_DESCRIPTION, "FFT based equalizer on %s",z? z: master->name);
-    pa_proplist_sets(sink_data.proplist, PA_PROP_DEVICE_MASTER_DEVICE, master->name);
-    pa_proplist_sets(sink_data.proplist, PA_PROP_DEVICE_CLASS, "filter");
-
-    if (pa_modargs_get_proplist(ma, "sink_properties", sink_data.proplist, PA_UPDATE_REPLACE) < 0) {
-        pa_log("Invalid properties");
-        pa_sink_new_data_done(&sink_data);
-        goto fail;
-    }
-
-    u->sink = pa_sink_new(m->core, &sink_data,
-                          PA_SINK_HW_MUTE_CTRL|PA_SINK_HW_VOLUME_CTRL|PA_SINK_DECIBEL_VOLUME|
-                          (master->flags & (PA_SINK_LATENCY|PA_SINK_DYNAMIC_LATENCY)));
-    pa_sink_new_data_done(&sink_data);
-
-    if (!u->sink) {
-        pa_log("Failed to create sink.");
-        goto fail;
-    }
-    u->name=pa_xstrdup(u->sink->name);
-    u->sink->parent.process_msg = sink_process_msg_cb;
-    u->sink->set_state = sink_set_state_cb;
-    u->sink->update_requested_latency = sink_update_requested_latency_cb;
-    u->sink->request_rewind = sink_request_rewind_cb;
-    u->sink->set_volume = sink_set_volume_cb;
-    u->sink->set_mute = sink_set_mute_cb;
-    u->sink->userdata = u;
-    u->input_q = pa_memblockq_new(0,  MEMBLOCKQ_MAXLENGTH, 0, fs, 1, 1, 0, &u->sink->silence);
-    u->output_q = pa_memblockq_new(0,  MEMBLOCKQ_MAXLENGTH, 0, fs, 1, 1, 0, NULL);
-    u->output_buffer = NULL;
-    u->output_buffer_length = 0;
-    u->output_buffer_max_length = 0;
-
-    pa_sink_set_asyncmsgq(u->sink, master->asyncmsgq);
-    //pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->R*fs, &ss));
-
-    /* Create sink input */
-    pa_sink_input_new_data_init(&sink_input_data);
-    sink_input_data.driver = __FILE__;
-    sink_input_data.module = m;
-    sink_input_data.sink = master;
-    pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_NAME, "Equalized Stream");
-    pa_proplist_sets(sink_input_data.proplist, PA_PROP_MEDIA_ROLE, "filter");
-    pa_sink_input_new_data_set_sample_spec(&sink_input_data, &ss);
-    pa_sink_input_new_data_set_channel_map(&sink_input_data, &map);
-
-    pa_sink_input_new(&u->sink_input, m->core, &sink_input_data);
-    pa_sink_input_new_data_done(&sink_input_data);
-
-    if (!u->sink_input)
-        goto fail;
-
-    u->sink_input->pop = sink_input_pop_cb;
-    u->sink_input->process_rewind = sink_input_process_rewind_cb;
-    u->sink_input->update_max_rewind = sink_input_update_max_rewind_cb;
-    u->sink_input->update_max_request = sink_input_update_max_request_cb;
-    u->sink_input->update_sink_latency_range = sink_input_update_sink_latency_range_cb;
-    u->sink_input->update_sink_fixed_latency = sink_input_update_sink_fixed_latency_cb;
-    u->sink_input->kill = sink_input_kill_cb;
-    u->sink_input->attach = sink_input_attach_cb;
-    u->sink_input->detach = sink_input_detach_cb;
-    u->sink_input->state_change = sink_input_state_change_cb;
-    u->sink_input->may_move_to = sink_input_may_move_to_cb;
-    u->sink_input->moving = sink_input_moving_cb;
-    u->sink_input->volume_changed = sink_input_volume_changed_cb;
-    u->sink_input->mute_changed = sink_input_mute_changed_cb;
-
-    u->sink_input->userdata = u;
-
-    pa_sink_put(u->sink);
-    pa_sink_input_put(u->sink_input);
-
-    pa_modargs_free(ma);
-
-
-    dbus_init(u);
-
-    //default filter to these
-    for(size_t c = 0; c< u->channels; ++c){
-        a_i = pa_aupdate_write_begin(u->a_H[c]);
-        H = u->Hs[c][a_i];
-        u->Xs[c][a_i] = 1.0f;
-        for(size_t i = 0; i < FILTER_SIZE; ++i){
-            H[i] = 1.0 / sqrtf(2.0f);
-        }
-        fix_filter(H, u->fft_size);
-        pa_aupdate_write_end(u->a_H[c]);
-    }
-    //load old parameters
-    load_state(u);
-
-    return 0;
-
-fail:
-    if (ma)
-        pa_modargs_free(ma);
-
-
-    pa__done(m);
-
-    return -1;
-}
-
-int pa__get_n_used(pa_module *m) {
-    struct userdata *u;
-
-    pa_assert(m);
-    pa_assert_se(u = m->userdata);
-
-    return pa_sink_linked_by(u->sink);
-}
-
-void pa__done(pa_module*m) {
-    struct userdata *u;
-
-    pa_assert(m);
-
-    if (!(u = m->userdata))
-        return;
-
-    save_state(u);
-
-    dbus_done(u);
-
-    for(size_t c = 0; c < u->channels; ++c){
-        pa_xfree(u->base_profiles[c]);
-    }
-    pa_xfree(u->base_profiles);
-
-    /* See comments in sink_input_kill_cb() above regarding
-     * destruction order! */
-
-    if (u->sink_input)
-        pa_sink_input_unlink(u->sink_input);
-
-    if (u->sink)
-        pa_sink_unlink(u->sink);
-
-    if (u->sink_input)
-        pa_sink_input_unref(u->sink_input);
-
-    if (u->sink)
-        pa_sink_unref(u->sink);
-
-    if(u->output_buffer){
-        pa_xfree(u->output_buffer);
-    }
-    pa_memblockq_free(u->output_q);
-    pa_memblockq_free(u->input_q);
-
-    fftwf_destroy_plan(u->inverse_plan);
-    fftwf_destroy_plan(u->forward_plan);
-    pa_xfree(u->output_window);
-    for(size_t c=0; c < u->channels; ++c){
-        pa_aupdate_free(u->a_H[c]);
-        pa_xfree(u->overlap_accum[c]);
-        pa_xfree(u->input[c]);
-    }
-    pa_xfree(u->a_H);
-    pa_xfree(u->overlap_accum);
-    pa_xfree(u->input);
-    pa_xfree(u->work_buffer);
-    pa_xfree(u->W);
-    for(size_t c = 0; c < u->channels; ++c){
-        pa_xfree(u->Xs[c]);
-        for(size_t i = 0; i < 2; ++i){
-            pa_xfree(u->Hs[c][i]);
-        }
-        pa_xfree(u->Hs[c]);
-    }
-    pa_xfree(u->Xs);
-    pa_xfree(u->Hs);
-
-    pa_xfree(u->name);
-
-    pa_xfree(u);
-}
-
-/*
- * DBus Routines and Callbacks
- */
-#define EXTNAME "org.PulseAudio.Ext.Equalizing1"
-#define MANAGER_PATH "/org/pulseaudio/equalizing1"
-#define MANAGER_IFACE EXTNAME ".Manager"
-#define EQUALIZER_IFACE EXTNAME ".Equalizer"
-static void manager_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void manager_get_sinks(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void manager_get_profiles(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void manager_get_all(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void manager_handle_remove_profile(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_get_filter_rate(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_get_n_coefs(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_get_n_channels(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_get_all(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_save_profile(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_save_state(DBusConnection *conn, DBusMessage *msg, void *_u);
-static void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, void *_u);
-enum manager_method_index {
-    MANAGER_METHOD_REMOVE_PROFILE,
-    MANAGER_METHOD_MAX
-};
-
-pa_dbus_arg_info remove_profile_args[]={
-    {"name", "s","in"},
-};
-
-static pa_dbus_method_handler manager_methods[MANAGER_METHOD_MAX]={
-    [MANAGER_METHOD_REMOVE_PROFILE]{
-        .method_name="RemoveProfile",
-        .arguments=remove_profile_args,
-        .n_arguments=sizeof(remove_profile_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=manager_handle_remove_profile}
-};
-
-enum manager_handler_index {
-    MANAGER_HANDLER_REVISION,
-    MANAGER_HANDLER_EQUALIZED_SINKS,
-    MANAGER_HANDLER_PROFILES,
-    MANAGER_HANDLER_MAX
-};
-
-static pa_dbus_property_handler manager_handlers[MANAGER_HANDLER_MAX]={
-    [MANAGER_HANDLER_REVISION]={.property_name="InterfaceRevision",.type="u",.get_cb=manager_get_revision,.set_cb=NULL},
-    [MANAGER_HANDLER_EQUALIZED_SINKS]={.property_name="EqualizedSinks",.type="ao",.get_cb=manager_get_sinks,.set_cb=NULL},
-    [MANAGER_HANDLER_PROFILES]={.property_name="Profiles",.type="as",.get_cb=manager_get_profiles,.set_cb=NULL}
-};
-
-pa_dbus_arg_info sink_args[]={
-    {"sink", "o", NULL}
-};
-
-enum manager_signal_index{
-    MANAGER_SIGNAL_SINK_ADDED,
-    MANAGER_SIGNAL_SINK_REMOVED,
-    MANAGER_SIGNAL_PROFILES_CHANGED,
-    MANAGER_SIGNAL_MAX
-};
-
-static pa_dbus_signal_info manager_signals[MANAGER_SIGNAL_MAX]={
-    [MANAGER_SIGNAL_SINK_ADDED]={.name="SinkAdded", .arguments=sink_args, .n_arguments=sizeof(sink_args)/sizeof(pa_dbus_arg_info)},
-    [MANAGER_SIGNAL_SINK_REMOVED]={.name="SinkRemoved", .arguments=sink_args, .n_arguments=sizeof(sink_args)/sizeof(pa_dbus_arg_info)},
-    [MANAGER_SIGNAL_PROFILES_CHANGED]={.name="ProfilesChanged", .arguments=NULL, .n_arguments=0}
-};
-
-static pa_dbus_interface_info manager_info={
-    .name=MANAGER_IFACE,
-    .method_handlers=manager_methods,
-    .n_method_handlers=MANAGER_METHOD_MAX,
-    .property_handlers=manager_handlers,
-    .n_property_handlers=MANAGER_HANDLER_MAX,
-    .get_all_properties_cb=manager_get_all,
-    .signals=manager_signals,
-    .n_signals=MANAGER_SIGNAL_MAX
-};
-
-enum equalizer_method_index {
-    EQUALIZER_METHOD_FILTER_POINTS,
-    EQUALIZER_METHOD_SEED_FILTER,
-    EQUALIZER_METHOD_SAVE_PROFILE,
-    EQUALIZER_METHOD_LOAD_PROFILE,
-    EQUALIZER_METHOD_SET_FILTER,
-    EQUALIZER_METHOD_GET_FILTER,
-    EQUALIZER_METHOD_SAVE_STATE,
-    EQUALIZER_METHOD_GET_PROFILE_NAME,
-    EQUALIZER_METHOD_MAX
-};
-
-enum equalizer_handler_index {
-    EQUALIZER_HANDLER_REVISION,
-    EQUALIZER_HANDLER_SAMPLERATE,
-    EQUALIZER_HANDLER_FILTERSAMPLERATE,
-    EQUALIZER_HANDLER_N_COEFS,
-    EQUALIZER_HANDLER_N_CHANNELS,
-    EQUALIZER_HANDLER_MAX
-};
-
-pa_dbus_arg_info filter_points_args[]={
-    {"channel", "u","in"},
-    {"xs", "au","in"},
-    {"ys", "ad","out"},
-    {"preamp", "d","out"}
-};
-pa_dbus_arg_info seed_filter_args[]={
-    {"channel", "u","in"},
-    {"xs", "au","in"},
-    {"ys", "ad","in"},
-    {"preamp", "d","in"}
-};
-
-pa_dbus_arg_info set_filter_args[]={
-    {"channel", "u","in"},
-    {"ys", "ad","in"},
-    {"preamp", "d","in"}
-};
-pa_dbus_arg_info get_filter_args[]={
-    {"channel", "u","in"},
-    {"ys", "ad","out"},
-    {"preamp", "d","out"}
-};
-
-pa_dbus_arg_info save_profile_args[]={
-    {"channel", "u","in"},
-    {"name", "s","in"}
-};
-pa_dbus_arg_info load_profile_args[]={
-    {"channel", "u","in"},
-    {"name", "s","in"}
-};
-pa_dbus_arg_info base_profile_name_args[]={
-    {"channel", "u","in"},
-    {"name", "s","out"}
-};
-
-static pa_dbus_method_handler equalizer_methods[EQUALIZER_METHOD_MAX]={
-    [EQUALIZER_METHOD_SEED_FILTER]{
-        .method_name="SeedFilter",
-        .arguments=seed_filter_args,
-        .n_arguments=sizeof(seed_filter_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_seed_filter},
-    [EQUALIZER_METHOD_FILTER_POINTS]{
-        .method_name="FilterAtPoints",
-        .arguments=filter_points_args,
-        .n_arguments=sizeof(filter_points_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_get_filter_points},
-    [EQUALIZER_METHOD_SET_FILTER]{
-        .method_name="SetFilter",
-        .arguments=set_filter_args,
-        .n_arguments=sizeof(set_filter_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_set_filter},
-    [EQUALIZER_METHOD_GET_FILTER]{
-        .method_name="GetFilter",
-        .arguments=get_filter_args,
-        .n_arguments=sizeof(get_filter_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_get_filter},
-    [EQUALIZER_METHOD_SAVE_PROFILE]{
-        .method_name="SaveProfile",
-        .arguments=save_profile_args,
-        .n_arguments=sizeof(save_profile_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_save_profile},
-    [EQUALIZER_METHOD_LOAD_PROFILE]{
-        .method_name="LoadProfile",
-        .arguments=load_profile_args,
-        .n_arguments=sizeof(load_profile_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_load_profile},
-    [EQUALIZER_METHOD_SAVE_STATE]{
-        .method_name="SaveState",
-        .arguments=NULL,
-        .n_arguments=0,
-        .receive_cb=equalizer_handle_save_state},
-    [EQUALIZER_METHOD_GET_PROFILE_NAME]{
-        .method_name="BaseProfile",
-        .arguments=base_profile_name_args,
-        .n_arguments=sizeof(base_profile_name_args)/sizeof(pa_dbus_arg_info),
-        .receive_cb=equalizer_handle_get_profile_name}
-};
-
-static pa_dbus_property_handler equalizer_handlers[EQUALIZER_HANDLER_MAX]={
-    [EQUALIZER_HANDLER_REVISION]={.property_name="InterfaceRevision",.type="u",.get_cb=equalizer_get_revision,.set_cb=NULL},
-    [EQUALIZER_HANDLER_SAMPLERATE]{.property_name="SampleRate",.type="u",.get_cb=equalizer_get_sample_rate,.set_cb=NULL},
-    [EQUALIZER_HANDLER_FILTERSAMPLERATE]{.property_name="FilterSampleRate",.type="u",.get_cb=equalizer_get_filter_rate,.set_cb=NULL},
-    [EQUALIZER_HANDLER_N_COEFS]{.property_name="NFilterCoefficients",.type="u",.get_cb=equalizer_get_n_coefs,.set_cb=NULL},
-    [EQUALIZER_HANDLER_N_CHANNELS]{.property_name="NChannels",.type="u",.get_cb=equalizer_get_n_channels,.set_cb=NULL},
-};
-
-enum equalizer_signal_index{
-    EQUALIZER_SIGNAL_FILTER_CHANGED,
-    EQUALIZER_SIGNAL_SINK_RECONFIGURED,
-    EQUALIZER_SIGNAL_MAX
-};
-
-static pa_dbus_signal_info equalizer_signals[EQUALIZER_SIGNAL_MAX]={
-    [EQUALIZER_SIGNAL_FILTER_CHANGED]={.name="FilterChanged", .arguments=NULL, .n_arguments=0},
-    [EQUALIZER_SIGNAL_SINK_RECONFIGURED]={.name="SinkReconfigured", .arguments=NULL, .n_arguments=0},
-};
-
-static pa_dbus_interface_info equalizer_info={
-    .name=EQUALIZER_IFACE,
-    .method_handlers=equalizer_methods,
-    .n_method_handlers=EQUALIZER_METHOD_MAX,
-    .property_handlers=equalizer_handlers,
-    .n_property_handlers=EQUALIZER_HANDLER_MAX,
-    .get_all_properties_cb=equalizer_get_all,
-    .signals=equalizer_signals,
-    .n_signals=EQUALIZER_SIGNAL_MAX
-};
-
-void dbus_init(struct userdata *u){
-    uint32_t dummy;
-    DBusMessage *signal = NULL;
-    pa_idxset *sink_list = NULL;
-    u->dbus_protocol=pa_dbus_protocol_get(u->sink->core);
-    u->dbus_path=pa_sprintf_malloc("/org/pulseaudio/core1/sink%d", u->sink->index);
-
-    pa_dbus_protocol_add_interface(u->dbus_protocol, u->dbus_path, &equalizer_info, u);
-    sink_list = pa_shared_get(u->sink->core, SINKLIST);
-    u->database = pa_shared_get(u->sink->core, EQDB);
-    if(sink_list == NULL){
-        char *dbname;
-        sink_list=pa_idxset_new(&pa_idxset_trivial_hash_func, &pa_idxset_trivial_compare_func);
-        pa_shared_set(u->sink->core, SINKLIST, sink_list);
-        pa_assert_se(dbname = pa_state_path("equalizer-presets", FALSE));
-        pa_assert_se(u->database = pa_database_open(dbname, TRUE));
-        pa_xfree(dbname);
-        pa_shared_set(u->sink->core, EQDB, u->database);
-        pa_dbus_protocol_add_interface(u->dbus_protocol, MANAGER_PATH, &manager_info, u->sink->core);
-        pa_dbus_protocol_register_extension(u->dbus_protocol, EXTNAME);
-    }
-    pa_idxset_put(sink_list, u, &dummy);
-
-    pa_assert_se((signal = dbus_message_new_signal(MANAGER_PATH, MANAGER_IFACE, manager_signals[MANAGER_SIGNAL_SINK_ADDED].name)));
-    dbus_message_append_args(signal, DBUS_TYPE_OBJECT_PATH, &u->dbus_path, DBUS_TYPE_INVALID);
-    pa_dbus_protocol_send_signal(u->dbus_protocol, signal);
-    dbus_message_unref(signal);
-}
-
-void dbus_done(struct userdata *u){
-    pa_idxset *sink_list;
-    uint32_t dummy;
-
-    DBusMessage *signal = NULL;
-    pa_assert_se((signal = dbus_message_new_signal(MANAGER_PATH, MANAGER_IFACE, manager_signals[MANAGER_SIGNAL_SINK_REMOVED].name)));
-    dbus_message_append_args(signal, DBUS_TYPE_OBJECT_PATH, &u->dbus_path, DBUS_TYPE_INVALID);
-    pa_dbus_protocol_send_signal(u->dbus_protocol, signal);
-    dbus_message_unref(signal);
-
-    pa_assert_se(sink_list=pa_shared_get(u->sink->core,SINKLIST));
-    pa_idxset_remove_by_data(sink_list,u,&dummy);
-    if(pa_idxset_size(sink_list)==0){
-        pa_dbus_protocol_unregister_extension(u->dbus_protocol, EXTNAME);
-        pa_dbus_protocol_remove_interface(u->dbus_protocol, MANAGER_PATH, manager_info.name);
-        pa_shared_remove(u->sink->core, EQDB);
-        pa_database_close(u->database);
-        pa_shared_remove(u->sink->core, SINKLIST);
-        pa_xfree(sink_list);
-    }
-    pa_dbus_protocol_remove_interface(u->dbus_protocol, u->dbus_path, equalizer_info.name);
-    pa_xfree(u->dbus_path);
-    pa_dbus_protocol_unref(u->dbus_protocol);
-}
-
-void manager_handle_remove_profile(DBusConnection *conn, DBusMessage *msg, void *_u) {
-    DBusError error;
-    pa_core *c = (pa_core *)_u;
-    DBusMessage *signal = NULL;
-    pa_dbus_protocol *dbus_protocol;
-    char *name;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(c);
-    dbus_error_init(&error);
-    if(!dbus_message_get_args(msg, &error,
-                 DBUS_TYPE_STRING, &name,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    remove_profile(c,name);
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_assert_se((signal = dbus_message_new_signal(MANAGER_PATH, MANAGER_IFACE, manager_signals[MANAGER_SIGNAL_PROFILES_CHANGED].name)));
-    dbus_protocol = pa_dbus_protocol_get(c);
-    pa_dbus_protocol_send_signal(dbus_protocol, signal);
-    pa_dbus_protocol_unref(dbus_protocol);
-    dbus_message_unref(signal);
-}
-
-void manager_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u){
-    uint32_t rev=1;
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_UINT32, &rev);
-}
-
-static void get_sinks(pa_core *u, char ***names, unsigned *n_sinks){
-    void *iter = NULL;
-    struct userdata *sink_u = NULL;
-    uint32_t dummy;
-    pa_idxset *sink_list;
-    pa_assert(u);
-    pa_assert(names);
-    pa_assert(n_sinks);
-
-    pa_assert_se(sink_list = pa_shared_get(u, SINKLIST));
-    *n_sinks = (unsigned) pa_idxset_size(sink_list);
-    *names = *n_sinks > 0 ? pa_xnew0(char *,*n_sinks) : NULL;
-    for(uint32_t i = 0; i < *n_sinks; ++i){
-        sink_u = (struct userdata *) pa_idxset_iterate(sink_list, &iter, &dummy);
-        (*names)[i] = pa_xstrdup(sink_u->dbus_path);
-    }
-}
-
-void manager_get_sinks(DBusConnection *conn, DBusMessage *msg, void *_u){
-    unsigned n;
-    char **names = NULL;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(_u);
-
-    get_sinks((pa_core *) _u, &names, &n);
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, names, n);
-    for(unsigned i = 0; i < n; ++i){
-        pa_xfree(names[i]);
-    }
-    pa_xfree(names);
-}
-
-static void get_profiles(pa_core *c, char ***names, unsigned *n){
-    char *name;
-    pa_database *database;
-    pa_datum key, next_key;
-    pa_strlist *head=NULL, *iter;
-    pa_bool_t done;
-    pa_assert_se(database = pa_shared_get(c, EQDB));
-
-    pa_assert(c);
-    pa_assert(names);
-    pa_assert(n);
-    done = !pa_database_first(database, &key, NULL);
-    *n = 0;
-    while(!done){
-        done = !pa_database_next(database, &key, &next_key, NULL);
-        name=pa_xmalloc(key.size + 1);
-        memcpy(name, key.data, key.size);
-        name[key.size] = '\0';
-        pa_datum_free(&key);
-        head = pa_strlist_prepend(head, name);
-        pa_xfree(name);
-        key = next_key;
-        (*n)++;
-    }
-    (*names) = *n > 0 ? pa_xnew0(char *, *n) : NULL;
-    iter=head;
-    for(unsigned i = 0; i < *n; ++i){
-        (*names)[*n - 1 - i] = pa_xstrdup(pa_strlist_data(iter));
-        iter = pa_strlist_next(iter);
-    }
-    pa_strlist_free(head);
-}
-
-void manager_get_profiles(DBusConnection *conn, DBusMessage *msg, void *_u){
-    char **names;
-    unsigned n;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(_u);
-
-    get_profiles((pa_core *)_u, &names, &n);
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_STRING, names, n);
-    for(unsigned i = 0; i < n; ++i){
-        pa_xfree(names[i]);
-    }
-    pa_xfree(names);
-}
-
-void manager_get_all(DBusConnection *conn, DBusMessage *msg, void *_u){
-    pa_core *c;
-    char **names = NULL;
-    unsigned n;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter, dict_iter;
-    uint32_t rev;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert_se(c = _u);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    rev = 1;
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, manager_handlers[MANAGER_HANDLER_REVISION].property_name, DBUS_TYPE_UINT32, &rev);
-
-    get_sinks(c, &names, &n);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter,manager_handlers[MANAGER_HANDLER_EQUALIZED_SINKS].property_name, DBUS_TYPE_OBJECT_PATH, names, n);
-    for(unsigned i = 0; i < n; ++i){
-        pa_xfree(names[i]);
-    }
-    pa_xfree(names);
-
-    get_profiles(c, &names, &n);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, manager_handlers[MANAGER_HANDLER_PROFILES].property_name, DBUS_TYPE_STRING, names, n);
-    for(unsigned i = 0; i < n; ++i){
-        pa_xfree(names[i]);
-    }
-    pa_xfree(names);
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-void equalizer_handle_seed_filter(DBusConnection *conn, DBusMessage *msg, void *_u) {
-    struct userdata *u=(struct userdata *) _u;
-    DBusError error;
-    DBusMessage *signal = NULL;
-    float *ys;
-    uint32_t *xs, channel, r_channel;
-    double *_ys, preamp;
-    unsigned x_npoints, y_npoints, a_i;
-    float *H;
-    pa_bool_t points_good = TRUE;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    dbus_error_init(&error);
-
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &xs, &x_npoints,
-                DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE, &_ys, &y_npoints,
-                DBUS_TYPE_DOUBLE, &preamp,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-    for(size_t i = 0; i < x_npoints; ++i){
-        if(xs[i] >= FILTER_SIZE){
-            points_good = FALSE;
-            break;
-        }
-    }
-    if(!is_monotonic(xs, x_npoints) || !points_good){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs must be monotonic and 0<=x<=%ld", u->fft_size / 2);
-        dbus_error_free(&error);
-        return;
-    }else if(x_npoints != y_npoints || x_npoints < 2 || x_npoints > FILTER_SIZE  ){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs and ys must be the same length and 2<=l<=%ld!", FILTER_SIZE);
-        dbus_error_free(&error);
-        return;
-    }else if(xs[0] != 0 || xs[x_npoints - 1] != u->fft_size / 2){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs[0] must be 0 and xs[-1]=fft_size/2");
-        dbus_error_free(&error);
-        return;
-    }
-
-    ys = pa_xmalloc(x_npoints * sizeof(float));
-    for(uint32_t i = 0; i < x_npoints; ++i){
-        ys[i] = (float) _ys[i];
-    }
-    r_channel = channel == u->channels ? 0 : channel;
-    a_i = pa_aupdate_write_begin(u->a_H[r_channel]);
-    H = u->Hs[r_channel][a_i];
-    u->Xs[r_channel][a_i] = preamp;
-    interpolate(H, FILTER_SIZE, xs, ys, x_npoints);
-    fix_filter(H, u->fft_size);
-    if(channel == u->channels){
-        for(size_t c = 1; c < u->channels; ++c){
-            unsigned b_i = pa_aupdate_write_begin(u->a_H[c]);
-            float *H_p = u->Hs[c][b_i];
-            u->Xs[c][b_i] = preamp;
-            memcpy(H_p, H, FILTER_SIZE * sizeof(float));
-            pa_aupdate_write_end(u->a_H[c]);
-        }
-    }
-    pa_aupdate_write_end(u->a_H[r_channel]);
-    pa_xfree(ys);
-
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_assert_se((signal = dbus_message_new_signal(u->dbus_path, EQUALIZER_IFACE, equalizer_signals[EQUALIZER_SIGNAL_FILTER_CHANGED].name)));
-    pa_dbus_protocol_send_signal(u->dbus_protocol, signal);
-    dbus_message_unref(signal);
-}
-
-void equalizer_handle_get_filter_points(DBusConnection *conn, DBusMessage *msg, void *_u) {
-    struct userdata *u = (struct userdata *) _u;
-    uint32_t *xs, channel, r_channel;
-    double *ys, preamp;
-    unsigned x_npoints, a_i;
-    float *H;
-    pa_bool_t points_good=TRUE;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusError error;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    dbus_error_init(&error);
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &xs, &x_npoints,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-
-    for(size_t i = 0; i < x_npoints; ++i){
-        if(xs[i] >= FILTER_SIZE){
-            points_good=FALSE;
-            break;
-        }
-    }
-
-    if(x_npoints > FILTER_SIZE || !points_good){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "xs indices/length must be <= %ld!", FILTER_SIZE);
-        dbus_error_free(&error);
-        return;
-    }
-
-    r_channel = channel == u->channels ? 0 : channel;
-    ys = pa_xmalloc(x_npoints * sizeof(double));
-    a_i = pa_aupdate_read_begin(u->a_H[r_channel]);
-    H = u->Hs[r_channel][a_i];
-    preamp = u->Xs[r_channel][a_i];
-    for(uint32_t i = 0; i < x_npoints; ++i){
-        ys[i] = H[xs[i]] * u->fft_size;
-    }
-    pa_aupdate_read_end(u->a_H[r_channel]);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-
-    pa_dbus_append_basic_array(&msg_iter, DBUS_TYPE_DOUBLE, ys, x_npoints);
-    pa_dbus_append_basic_variant(&msg_iter, DBUS_TYPE_DOUBLE, &preamp);
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-    pa_xfree(ys);
-}
-
-static void get_filter(struct userdata *u, size_t channel, double **H_, double *preamp){
-    float *H;
-    unsigned a_i;
-    size_t r_channel = channel == u->channels ? 0 : channel;
-    *H_ = pa_xnew0(double, FILTER_SIZE);
-    a_i = pa_aupdate_read_begin(u->a_H[r_channel]);
-    H = u->Hs[r_channel][a_i];
-    for(size_t i = 0;i < FILTER_SIZE; ++i){
-        (*H_)[i] = H[i] * u->fft_size;
-    }
-    *preamp = u->Xs[r_channel][a_i];
-
-    pa_aupdate_read_end(u->a_H[r_channel]);
-}
-
-void equalizer_handle_get_filter(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    unsigned n_coefs;
-    uint32_t channel;
-    double *H_, preamp;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusError error;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(conn);
-    pa_assert(msg);
-
-    dbus_error_init(&error);
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-
-    n_coefs = CHANNEL_PROFILE_SIZE;
-    pa_assert(conn);
-    pa_assert(msg);
-    get_filter(u, channel, &H_, &preamp);
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-
-    pa_dbus_append_basic_array(&msg_iter, DBUS_TYPE_DOUBLE, H_, n_coefs);
-    pa_dbus_append_basic_variant(&msg_iter, DBUS_TYPE_DOUBLE, &preamp);
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-    pa_xfree(H_);
-}
-
-static void set_filter(struct userdata *u, size_t channel, double *H_, double preamp){
-    unsigned a_i;
-    size_t r_channel = channel == u->channels ? 0 : channel;
-    float *H;
-    //all channels
-    a_i = pa_aupdate_write_begin(u->a_H[r_channel]);
-    u->Xs[r_channel][a_i] = (float) preamp;
-    H = u->Hs[r_channel][a_i];
-    for(size_t i = 0; i < FILTER_SIZE; ++i){
-        H[i] = (float) H_[i];
-    }
-    fix_filter(H, u->fft_size);
-    if(channel == u->channels){
-        for(size_t c = 1; c < u->channels; ++c){
-            unsigned b_i = pa_aupdate_write_begin(u->a_H[c]);
-            u->Xs[c][b_i] = u->Xs[r_channel][a_i];
-            memcpy(u->Hs[c][b_i], u->Hs[r_channel][a_i], FILTER_SIZE * sizeof(float));
-            pa_aupdate_write_end(u->a_H[c]);
-        }
-    }
-    pa_aupdate_write_end(u->a_H[r_channel]);
-}
-
-void equalizer_handle_set_filter(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    double *H, preamp;
-    uint32_t channel;
-    unsigned _n_coefs;
-    DBusMessage *signal = NULL;
-    DBusError error;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(conn);
-    pa_assert(msg);
-
-    dbus_error_init(&error);
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_ARRAY, DBUS_TYPE_DOUBLE, &H, &_n_coefs,
-                DBUS_TYPE_DOUBLE, &preamp,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-    if(_n_coefs != FILTER_SIZE){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "This filter takes exactly %ld coefficients, you gave %d", FILTER_SIZE, _n_coefs);
-        return;
-    }
-    set_filter(u, channel, H, preamp);
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_assert_se((signal = dbus_message_new_signal(u->dbus_path, EQUALIZER_IFACE, equalizer_signals[EQUALIZER_SIGNAL_FILTER_CHANGED].name)));
-    pa_dbus_protocol_send_signal(u->dbus_protocol, signal);
-    dbus_message_unref(signal);
-}
-
-void equalizer_handle_save_profile(DBusConnection *conn, DBusMessage *msg, void *_u) {
-    struct userdata *u = (struct userdata *) _u;
-    char *name;
-    uint32_t channel, r_channel;
-    DBusMessage *signal = NULL;
-    DBusError error;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-    dbus_error_init(&error);
-
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_STRING, &name,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-    r_channel = channel == u->channels ? 0 : channel;
-    save_profile(u, r_channel, name);
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_assert_se((signal = dbus_message_new_signal(MANAGER_PATH, MANAGER_IFACE, manager_signals[MANAGER_SIGNAL_PROFILES_CHANGED].name)));
-    pa_dbus_protocol_send_signal(u->dbus_protocol, signal);
-    dbus_message_unref(signal);
-}
-
-void equalizer_handle_load_profile(DBusConnection *conn, DBusMessage *msg, void *_u) {
-    struct userdata *u = (struct userdata *) _u;
-    char *name;
-    DBusError error;
-    uint32_t channel, r_channel;
-    const char *err_msg = NULL;
-    DBusMessage *signal = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-    dbus_error_init(&error);
-
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_STRING, &name,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-    r_channel = channel == u->channels ? 0 : channel;
-
-    err_msg = load_profile(u, r_channel, name);
-    if(err_msg != NULL){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "error loading profile %s: %s", name, err_msg);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel == u->channels){
-        for(uint32_t c = 1; c < u->channels; ++c){
-            load_profile(u, c, name);
-        }
-    }
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_assert_se((signal = dbus_message_new_signal(u->dbus_path, EQUALIZER_IFACE, equalizer_signals[EQUALIZER_SIGNAL_FILTER_CHANGED].name)));
-    pa_dbus_protocol_send_signal(u->dbus_protocol, signal);
-    dbus_message_unref(signal);
-}
-
-void equalizer_handle_save_state(DBusConnection *conn, DBusMessage *msg, void *_u) {
-    struct userdata *u = (struct userdata *) _u;
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    save_state(u);
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-void equalizer_handle_get_profile_name(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u = (struct userdata *) _u;
-    DBusError error;
-    uint32_t channel, r_channel;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-    dbus_error_init(&error);
-
-    if(!dbus_message_get_args(msg, &error,
-                DBUS_TYPE_UINT32, &channel,
-                DBUS_TYPE_INVALID)){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "%s", error.message);
-        dbus_error_free(&error);
-        return;
-    }
-    if(channel > u->channels){
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "invalid channel: %d", channel);
-        dbus_error_free(&error);
-        return;
-    }
-    r_channel = channel == u->channels ? 0 : channel;
-    pa_assert(u->base_profiles[r_channel]);
-    pa_dbus_send_basic_value_reply(conn,msg, DBUS_TYPE_STRING, &u->base_profiles[r_channel]);
-}
-
-void equalizer_get_revision(DBusConnection *conn, DBusMessage *msg, void *_u){
-    uint32_t rev=1;
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_UINT32, &rev);
-}
-
-void equalizer_get_n_channels(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    uint32_t channels;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(conn);
-    pa_assert(msg);
-
-    channels = (uint32_t) u->channels;
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &channels);
-}
-
-void equalizer_get_n_coefs(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    uint32_t n_coefs;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(conn);
-    pa_assert(msg);
-
-    n_coefs = (uint32_t) CHANNEL_PROFILE_SIZE;
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &n_coefs);
-}
-
-void equalizer_get_sample_rate(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    uint32_t rate;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(conn);
-    pa_assert(msg);
-
-    rate = (uint32_t) u->sink->sample_spec.rate;
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &rate);
-}
-
-void equalizer_get_filter_rate(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    uint32_t fft_size;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(conn);
-    pa_assert(msg);
-
-    fft_size = (uint32_t) u->fft_size;
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &fft_size);
-}
-
-void equalizer_get_all(DBusConnection *conn, DBusMessage *msg, void *_u){
-    struct userdata *u;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter, dict_iter;
-    uint32_t rev, n_coefs, rate, fft_size, channels;
-    pa_assert_se(u = (struct userdata *) _u);
-    pa_assert(msg);
-
-    rev = 1;
-    n_coefs = (uint32_t) CHANNEL_PROFILE_SIZE;
-    rate = (uint32_t) u->sink->sample_spec.rate;
-    fft_size = (uint32_t) u->fft_size;
-    channels = (uint32_t) u->channels;
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, equalizer_handlers[EQUALIZER_HANDLER_REVISION].property_name, DBUS_TYPE_UINT32, &rev);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, equalizer_handlers[EQUALIZER_HANDLER_SAMPLERATE].property_name, DBUS_TYPE_UINT32, &rate);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, equalizer_handlers[EQUALIZER_HANDLER_FILTERSAMPLERATE].property_name, DBUS_TYPE_UINT32, &fft_size);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, equalizer_handlers[EQUALIZER_HANDLER_N_COEFS].property_name, DBUS_TYPE_UINT32, &n_coefs);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, equalizer_handlers[EQUALIZER_HANDLER_N_CHANNELS].property_name, DBUS_TYPE_UINT32, &channels);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-    dbus_message_unref(reply);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-hal-detect.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-hal-detect.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-hal-detect.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-hal-detect.c	2010-01-15 23:21:18.000000000 +0000
@@ -87,6 +87,7 @@
 #ifdef HAVE_OSS_OUTPUT
     pa_bool_t init_subdevs;
 #endif
+    pa_bool_t filter_added:1;
 };
 
 #define CAPABILITY_ALSA "alsa"
@@ -733,12 +734,9 @@
         goto fail;
     }
 
-    m->userdata = u = pa_xnew(struct userdata, 1);
+    m->userdata = u = pa_xnew0(struct userdata, 1);
     u->core = m->core;
-    u->context = NULL;
-    u->connection = NULL;
     u->devices = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    u->capability = NULL;
 
 #ifdef HAVE_ALSA
     u->use_tsched = TRUE;
@@ -800,6 +798,7 @@
         pa_log_error("Failed to add filter function");
         goto fail;
     }
+    u->filter_added = TRUE;
 
     if (pa_dbus_add_matches(
                 pa_dbus_connection_get(u->connection), &error,
@@ -856,7 +855,8 @@
                 "type='signal',sender='org.freedesktop.Hal',interface='org.freedesktop.Hal.Device.AccessControl',member='ACLRemoved'",
                 "type='signal',interface='org.pulseaudio.Server',member='DirtyGiveUpMessage'", NULL);
 
-        dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
+        if (u->filter_added)
+            dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
         pa_dbus_connection_unref(u->connection);
     }
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-ladspa-sink.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-ladspa-sink.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-ladspa-sink.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-ladspa-sink.c	2010-01-15 23:21:18.000000000 +0000
@@ -476,6 +476,7 @@
     unsigned long input_port, output_port, p, j, n_control;
     unsigned c;
     pa_bool_t *use_default = NULL;
+    pa_memchunk silence;
 
     pa_assert(m);
 
@@ -514,7 +515,10 @@
     u = pa_xnew0(struct userdata, 1);
     u->module = m;
     m->userdata = u;
-    u->memblockq = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, pa_frame_size(&ss), 1, 1, 0, NULL);
+
+    pa_silence_memchunk_get(&m->core->silence_cache, m->core->mempool, &silence, &ss, 0);
+    u->memblockq = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, pa_frame_size(&ss), 1, 1, 0, &silence);
+    pa_memblock_unref(silence.memblock);
 
     if (!(e = getenv("LADSPA_PATH")))
         e = LADSPA_PATH;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-lirc.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-lirc.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-lirc.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-lirc.c	2010-01-15 23:21:18.000000000 +0000
@@ -45,14 +45,12 @@
 PA_MODULE_DESCRIPTION("LIRC volume control");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(TRUE);
-PA_MODULE_USAGE("config=<config file> sink=<sink name> appname=<lirc application name> volume_limit=<volume limit> volume_step=<volume change step>");
+PA_MODULE_USAGE("config=<config file> sink=<sink name> appname=<lirc application name>");
 
 static const char* const valid_modargs[] = {
     "config",
     "sink",
     "appname",
-    "volume_limit",
-    "volume_step",
     NULL,
 };
 
@@ -63,10 +61,10 @@
     char *sink_name;
     pa_module *module;
     float mute_toggle_save;
-    pa_volume_t volume_limit;
-    pa_volume_t volume_step;
 };
 
+#define DELTA (PA_VOLUME_NORM/20)
+
 static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event_flags_t events, void*userdata) {
     struct userdata *u = userdata;
     char *name = NULL, *code = NULL;
@@ -127,12 +125,12 @@
 
                     switch (volchange) {
                         case UP:
-                            pa_cvolume_inc_clamp(&cv, u->volume_step, u->volume_limit);
+                            pa_cvolume_inc(&cv, DELTA);
                             pa_sink_set_volume(s, &cv, TRUE, TRUE);
                             break;
 
                         case DOWN:
-                            pa_cvolume_dec(&cv, u->volume_step);
+                            pa_cvolume_dec(&cv, DELTA);
                             pa_sink_set_volume(s, &cv, TRUE, TRUE);
                             break;
 
@@ -172,8 +170,6 @@
 int pa__init(pa_module*m) {
     pa_modargs *ma = NULL;
     struct userdata *u;
-    pa_volume_t volume_limit = PA_VOLUME_NORM*3/2;
-    pa_volume_t volume_step = PA_VOLUME_NORM/20;
 
     pa_assert(m);
 
@@ -182,16 +178,6 @@
         goto fail;
     }
 
-    if (pa_modargs_get_value_u32(ma, "volume_limit", &volume_limit) < 0) {
-        pa_log("Failed to parse volume limit");
-        goto fail;
-    }
-
-    if (pa_modargs_get_value_u32(ma, "volume_step", &volume_step) < 0) {
-        pa_log("Failed to parse volume step");
-        goto fail;
-    }
-
     m->userdata = u = pa_xnew(struct userdata, 1);
     u->module = m;
     u->io = NULL;
@@ -199,8 +185,6 @@
     u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
     u->lirc_fd = -1;
     u->mute_toggle_save = 0;
-    u->volume_limit = volume_limit;
-    u->volume_step = volume_step;
 
     if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "pulseaudio"), 1)) < 0) {
         pa_log("lirc_init() failed.");
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-match.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-match.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-match.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-match.c	2010-01-15 23:21:18.000000000 +0000
@@ -85,7 +85,7 @@
     pa_assert(u);
 
     if (filename)
-        f = pa_fopen_cloexec(fn = pa_xstrdup(filename), "r");
+        f = fopen(fn = pa_xstrdup(filename), "r");
     else
         f = pa_open_config_file(DEFAULT_MATCH_TABLE_FILE, DEFAULT_MATCH_TABLE_FILE_USER, NULL, &fn);
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-mmkbd-evdev.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-mmkbd-evdev.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-mmkbd-evdev.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-mmkbd-evdev.c	2010-01-15 23:21:18.000000000 +0000
@@ -48,15 +48,13 @@
 PA_MODULE_DESCRIPTION("Multimedia keyboard support via Linux evdev");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(FALSE);
-PA_MODULE_USAGE("device=<evdev device> sink=<sink name> volume_limit=<volume limit> volume_step=<volume change step>");
+PA_MODULE_USAGE("device=<evdev device> sink=<sink name>");
 
 #define DEFAULT_DEVICE "/dev/input/event0"
 
 static const char* const valid_modargs[] = {
     "device",
     "sink",
-    "volume_limit",
-    "volume_step",
     NULL,
 };
 
@@ -65,10 +63,10 @@
     pa_io_event *io;
     char *sink_name;
     pa_module *module;
-    pa_volume_t volume_limit;
-    pa_volume_t volume_step;
 };
 
+#define DELTA (PA_VOLUME_NORM/20)
+
 static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event_flags_t events, void*userdata) {
     struct userdata *u = userdata;
 
@@ -122,12 +120,12 @@
 
                     switch (volchange) {
                         case UP:
-                            pa_cvolume_inc_clamp(&cv, u->volume_step, u->volume_limit);
+                            pa_cvolume_inc(&cv, DELTA);
                             pa_sink_set_volume(s, &cv, TRUE, TRUE);
                             break;
 
                         case DOWN:
-                            pa_cvolume_dec(&cv, u->volume_step);
+                            pa_cvolume_dec(&cv, DELTA);
                             pa_sink_set_volume(s, &cv, TRUE, TRUE);
                             break;
 
@@ -162,8 +160,6 @@
     struct input_id input_id;
     char name[256];
     uint8_t evtype_bitmask[EV_MAX/8 + 1];
-    pa_volume_t volume_limit = PA_VOLUME_NORM*3/2;
-    pa_volume_t volume_step = PA_VOLUME_NORM/20;
 
     pa_assert(m);
 
@@ -172,26 +168,14 @@
         goto fail;
     }
 
-    if (pa_modargs_get_value_u32(ma, "volume_limit", &volume_limit) < 0) {
-        pa_log("Failed to parse volume limit");
-        goto fail;
-    }
-
-    if (pa_modargs_get_value_u32(ma, "volume_step", &volume_step) < 0) {
-        pa_log("Failed to parse volume step");
-        goto fail;
-    }
-
     m->userdata = u = pa_xnew(struct userdata, 1);
     u->module = m;
     u->io = NULL;
     u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
     u->fd = -1;
     u->fd_type = 0;
-    u->volume_limit = volume_limit;
-    u->volume_step = volume_step;
 
-    if ((u->fd = pa_open_cloexec(pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), O_RDONLY, 0)) < 0) {
+    if ((u->fd = open(pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), O_RDONLY|O_NOCTTY)) < 0) {
         pa_log("Failed to open evdev device: %s", pa_cstrerror(errno));
         goto fail;
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-pipe-sink.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-pipe-sink.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-pipe-sink.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-pipe-sink.c	2010-01-15 23:21:18.000000000 +0000
@@ -34,10 +34,6 @@
 #include <sys/ioctl.h>
 #include <poll.h>
 
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-error.h>
@@ -105,10 +101,9 @@
 
         case PA_SINK_MESSAGE_GET_LATENCY: {
             size_t n = 0;
-
-#ifdef FIONREAD
             int l;
 
+#ifdef FIONREAD
             if (ioctl(u->fd, FIONREAD, &l) >= 0 && l > 0)
                 n = (size_t) l;
 #endif
@@ -258,11 +253,12 @@
     u->filename = pa_runtime_path(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
 
     mkfifo(u->filename, 0666);
-    if ((u->fd = pa_open_cloexec(u->filename, O_RDWR, 0)) < 0) {
+    if ((u->fd = open(u->filename, O_RDWR|O_NOCTTY)) < 0) {
         pa_log("open('%s'): %s", u->filename, pa_cstrerror(errno));
         goto fail;
     }
 
+    pa_make_fd_cloexec(u->fd);
     pa_make_fd_nonblock(u->fd);
 
     if (fstat(u->fd, &st) < 0) {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-pipe-source.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-pipe-source.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-pipe-source.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-pipe-source.c	2010-01-15 23:21:18.000000000 +0000
@@ -34,10 +34,6 @@
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-error.h>
@@ -109,10 +105,9 @@
 
         case PA_SOURCE_MESSAGE_GET_LATENCY: {
             size_t n = 0;
-
-#ifdef FIONREAD
             int l;
 
+#ifdef FIONREAD
             if (ioctl(u->fd, FIONREAD, &l) >= 0 && l > 0)
                 n = (size_t) l;
 #endif
@@ -243,11 +238,12 @@
     u->filename = pa_runtime_path(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
 
     mkfifo(u->filename, 0666);
-    if ((u->fd = pa_open_cloexec(u->filename, O_RDWR, 0)) < 0) {
+    if ((u->fd = open(u->filename, O_RDWR|O_NOCTTY)) < 0) {
         pa_log("open('%s'): %s", u->filename, pa_cstrerror(errno));
         goto fail;
     }
 
+    pa_make_fd_cloexec(u->fd);
     pa_make_fd_nonblock(u->fd);
 
     if (fstat(u->fd, &st) < 0) {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-protocol-stub.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-protocol-stub.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-protocol-stub.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-protocol-stub.c	2010-01-15 23:21:18.000000000 +0000
@@ -246,7 +246,6 @@
 
 #if defined(USE_TCP_SOCKETS)
     uint32_t port = IPV4_PORT;
-    pa_bool_t port_fallback = TRUE;
     const char *listen_on;
 #else
     int r;
@@ -294,10 +293,6 @@
 #endif
 
 #if defined(USE_TCP_SOCKETS)
-
-    if (pa_in_system_mode() || pa_modargs_get_value(ma, "port", NULL))
-        port_fallback = FALSE;
-
     if (pa_modargs_get_value_u32(ma, "port", &port) < 0 || port < 1 || port > 0xFFFF) {
         pa_log("port= expects a numerical argument between 1 and 65535.");
         goto fail;
@@ -307,14 +302,14 @@
 
     if (listen_on) {
 #  ifdef HAVE_IPV6
-        u->socket_server_ipv6 = pa_socket_server_new_ipv6_string(m->core->mainloop, listen_on, (uint16_t) port, port_fallback, TCPWRAP_SERVICE);
+        u->socket_server_ipv6 = pa_socket_server_new_ipv6_string(m->core->mainloop, listen_on, (uint16_t) port, TCPWRAP_SERVICE);
 #  endif
-        u->socket_server_ipv4 = pa_socket_server_new_ipv4_string(m->core->mainloop, listen_on, (uint16_t) port, port_fallback, TCPWRAP_SERVICE);
+        u->socket_server_ipv4 = pa_socket_server_new_ipv4_string(m->core->mainloop, listen_on, (uint16_t) port, TCPWRAP_SERVICE);
     } else {
 #  ifdef HAVE_IPV6
-        u->socket_server_ipv6 = pa_socket_server_new_ipv6_any(m->core->mainloop, (uint16_t) port, port_fallback, TCPWRAP_SERVICE);
+        u->socket_server_ipv6 = pa_socket_server_new_ipv6_any(m->core->mainloop, (uint16_t) port, TCPWRAP_SERVICE);
 #  endif
-        u->socket_server_ipv4 = pa_socket_server_new_ipv4_any(m->core->mainloop, (uint16_t) port, port_fallback, TCPWRAP_SERVICE);
+        u->socket_server_ipv4 = pa_socket_server_new_ipv4_any(m->core->mainloop, (uint16_t) port, TCPWRAP_SERVICE);
     }
 
 #  ifdef HAVE_IPV6
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-sine-source.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-sine-source.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-sine-source.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-sine-source.c	2010-01-15 23:21:18.000000000 +0000
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <sys/ioctl.h>
+#include <sys/poll.h>
 
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
@@ -47,7 +48,6 @@
 #include <pulsecore/thread.h>
 #include <pulsecore/thread-mq.h>
 #include <pulsecore/rtpoll.h>
-#include <pulsecore/poll.h>
 
 #include "module-sine-source-symdef.h"
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-solaris.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-solaris.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-solaris.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-solaris.c	2010-01-15 23:21:18.000000000 +0000
@@ -327,7 +327,7 @@
     pa_assert(u);
     pa_assert(ss);
 
-    if ((u->fd = pa_open_cloexec(u->device_name, u->mode | O_NONBLOCK, 0)) < 0) {
+    if ((u->fd = open(u->device_name, u->mode | O_NONBLOCK)) < 0) {
         pa_log_warn("open %s failed (%s)", u->device_name, pa_cstrerror(errno));
         return -1;
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-stream-restore.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-stream-restore.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-stream-restore.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-stream-restore.c	2010-01-15 23:21:18.000000000 +0000
@@ -2,7 +2,6 @@
   This file is part of PulseAudio.
 
   Copyright 2008 Lennart Poettering
-  Copyright 2009 Tanu Kaskinen
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
@@ -52,11 +51,6 @@
 #include <pulsecore/pstream-util.h>
 #include <pulsecore/database.h>
 
-#ifdef HAVE_DBUS
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/protocol-dbus.h>
-#endif
-
 #include "module-stream-restore-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");
@@ -106,12 +100,6 @@
 
     pa_native_protocol *protocol;
     pa_idxset *subscribed;
-
-#ifdef HAVE_DBUS
-    pa_dbus_protocol *dbus_protocol;
-    pa_hashmap *dbus_entries;
-    uint32_t next_index; /* For generating object paths for entries. */
-#endif
 };
 
 #define ENTRY_VERSION 3
@@ -135,836 +123,6 @@
     SUBCOMMAND_EVENT
 };
 
-static struct entry *read_entry(struct userdata *u, const char *name);
-static void apply_entry(struct userdata *u, const char *name, struct entry *e);
-static void trigger_save(struct userdata *u);
-
-#ifdef HAVE_DBUS
-
-#define OBJECT_PATH "/org/pulseaudio/stream_restore1"
-#define ENTRY_OBJECT_NAME "entry"
-#define INTERFACE_STREAM_RESTORE "org.PulseAudio.Ext.StreamRestore1"
-#define INTERFACE_ENTRY INTERFACE_STREAM_RESTORE ".RestoreEntry"
-
-#define DBUS_INTERFACE_REVISION 0
-
-struct dbus_entry {
-    struct userdata *userdata;
-
-    char *entry_name;
-    uint32_t index;
-    char *object_path;
-};
-
-static void handle_get_interface_revision(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_entries(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_add_entry(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_get_entry_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_entry_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_entry_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_entry_get_device(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_entry_set_device(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_entry_get_volume(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_entry_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-static void handle_entry_get_mute(DBusConnection *conn, DBusMessage *msg, void *userdata);
-static void handle_entry_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-
-static void handle_entry_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-static void handle_entry_remove(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-enum property_handler_index {
-    PROPERTY_HANDLER_INTERFACE_REVISION,
-    PROPERTY_HANDLER_ENTRIES,
-    PROPERTY_HANDLER_MAX
-};
-
-enum entry_property_handler_index {
-    ENTRY_PROPERTY_HANDLER_INDEX,
-    ENTRY_PROPERTY_HANDLER_NAME,
-    ENTRY_PROPERTY_HANDLER_DEVICE,
-    ENTRY_PROPERTY_HANDLER_VOLUME,
-    ENTRY_PROPERTY_HANDLER_MUTE,
-    ENTRY_PROPERTY_HANDLER_MAX
-};
-
-static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
-    [PROPERTY_HANDLER_INTERFACE_REVISION] = { .property_name = "InterfaceRevision", .type = "u",  .get_cb = handle_get_interface_revision, .set_cb = NULL },
-    [PROPERTY_HANDLER_ENTRIES]            = { .property_name = "Entries",           .type = "ao", .get_cb = handle_get_entries,            .set_cb = NULL }
-};
-
-static pa_dbus_property_handler entry_property_handlers[ENTRY_PROPERTY_HANDLER_MAX] = {
-    [ENTRY_PROPERTY_HANDLER_INDEX]    = { .property_name = "Index",   .type = "u",     .get_cb = handle_entry_get_index,    .set_cb = NULL },
-    [ENTRY_PROPERTY_HANDLER_NAME]     = { .property_name = "Name",    .type = "s",     .get_cb = handle_entry_get_name,     .set_cb = NULL },
-    [ENTRY_PROPERTY_HANDLER_DEVICE]   = { .property_name = "Device",  .type = "s",     .get_cb = handle_entry_get_device,   .set_cb = handle_entry_set_device },
-    [ENTRY_PROPERTY_HANDLER_VOLUME]   = { .property_name = "Volume",  .type = "a(uu)", .get_cb = handle_entry_get_volume,   .set_cb = handle_entry_set_volume },
-    [ENTRY_PROPERTY_HANDLER_MUTE]     = { .property_name = "Mute",    .type = "b",     .get_cb = handle_entry_get_mute,     .set_cb = handle_entry_set_mute }
-};
-
-enum method_handler_index {
-    METHOD_HANDLER_ADD_ENTRY,
-    METHOD_HANDLER_GET_ENTRY_BY_NAME,
-    METHOD_HANDLER_MAX
-};
-
-enum entry_method_handler_index {
-    ENTRY_METHOD_HANDLER_REMOVE,
-    ENTRY_METHOD_HANDLER_MAX
-};
-
-static pa_dbus_arg_info add_entry_args[] = { { "name",   "s",     "in" },
-                                             { "device", "s",     "in" },
-                                             { "volume", "a(uu)", "in" },
-                                             { "mute",   "b",     "in" },
-                                             { "entry",  "o",     "out" } };
-static pa_dbus_arg_info get_entry_by_name_args[] = { { "name", "s", "in" }, { "entry", "o", "out" } };
-
-static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
-    [METHOD_HANDLER_ADD_ENTRY] = {
-        .method_name = "AddEntry",
-        .arguments = add_entry_args,
-        .n_arguments = sizeof(add_entry_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_add_entry },
-    [METHOD_HANDLER_GET_ENTRY_BY_NAME] = {
-        .method_name = "GetEntryByName",
-        .arguments = get_entry_by_name_args,
-        .n_arguments = sizeof(get_entry_by_name_args) / sizeof(pa_dbus_arg_info),
-        .receive_cb = handle_get_entry_by_name }
-};
-
-static pa_dbus_method_handler entry_method_handlers[ENTRY_METHOD_HANDLER_MAX] = {
-    [ENTRY_METHOD_HANDLER_REMOVE] = {
-        .method_name = "Remove",
-        .arguments = NULL,
-        .n_arguments = 0,
-        .receive_cb = handle_entry_remove }
-};
-
-enum signal_index {
-    SIGNAL_NEW_ENTRY,
-    SIGNAL_ENTRY_REMOVED,
-    SIGNAL_MAX
-};
-
-enum entry_signal_index {
-    ENTRY_SIGNAL_DEVICE_UPDATED,
-    ENTRY_SIGNAL_VOLUME_UPDATED,
-    ENTRY_SIGNAL_MUTE_UPDATED,
-    ENTRY_SIGNAL_MAX
-};
-
-static pa_dbus_arg_info new_entry_args[]     = { { "entry", "o", NULL } };
-static pa_dbus_arg_info entry_removed_args[] = { { "entry", "o", NULL } };
-
-static pa_dbus_arg_info entry_device_updated_args[] = { { "device", "s",     NULL } };
-static pa_dbus_arg_info entry_volume_updated_args[] = { { "volume", "a(uu)", NULL } };
-static pa_dbus_arg_info entry_mute_updated_args[]   = { { "muted",  "b",     NULL } };
-
-static pa_dbus_signal_info signals[SIGNAL_MAX] = {
-    [SIGNAL_NEW_ENTRY]     = { .name = "NewEntry",     .arguments = new_entry_args,     .n_arguments = 1 },
-    [SIGNAL_ENTRY_REMOVED] = { .name = "EntryRemoved", .arguments = entry_removed_args, .n_arguments = 1 }
-};
-
-static pa_dbus_signal_info entry_signals[ENTRY_SIGNAL_MAX] = {
-    [ENTRY_SIGNAL_DEVICE_UPDATED] = { .name = "DeviceUpdated", .arguments = entry_device_updated_args, .n_arguments = 1 },
-    [ENTRY_SIGNAL_VOLUME_UPDATED] = { .name = "VolumeUpdated", .arguments = entry_volume_updated_args, .n_arguments = 1 },
-    [ENTRY_SIGNAL_MUTE_UPDATED]   = { .name = "MuteUpdated",   .arguments = entry_mute_updated_args,   .n_arguments = 1 }
-};
-
-static pa_dbus_interface_info stream_restore_interface_info = {
-    .name = INTERFACE_STREAM_RESTORE,
-    .method_handlers = method_handlers,
-    .n_method_handlers = METHOD_HANDLER_MAX,
-    .property_handlers = property_handlers,
-    .n_property_handlers = PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_get_all,
-    .signals = signals,
-    .n_signals = SIGNAL_MAX
-};
-
-static pa_dbus_interface_info entry_interface_info = {
-    .name = INTERFACE_ENTRY,
-    .method_handlers = entry_method_handlers,
-    .n_method_handlers = ENTRY_METHOD_HANDLER_MAX,
-    .property_handlers = entry_property_handlers,
-    .n_property_handlers = ENTRY_PROPERTY_HANDLER_MAX,
-    .get_all_properties_cb = handle_entry_get_all,
-    .signals = entry_signals,
-    .n_signals = ENTRY_SIGNAL_MAX
-};
-
-static struct dbus_entry *dbus_entry_new(struct userdata *u, const char *entry_name) {
-    struct dbus_entry *de;
-
-    pa_assert(u);
-    pa_assert(entry_name);
-    pa_assert(*entry_name);
-
-    de = pa_xnew(struct dbus_entry, 1);
-    de->userdata = u;
-    de->entry_name = pa_xstrdup(entry_name);
-    de->index = u->next_index++;
-    de->object_path = pa_sprintf_malloc("%s/%s%u", OBJECT_PATH, ENTRY_OBJECT_NAME, de->index);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(u->dbus_protocol, de->object_path, &entry_interface_info, u) >= 0);
-
-    return de;
-}
-
-static void dbus_entry_free(struct dbus_entry *de) {
-    pa_assert(de);
-
-    pa_assert_se(pa_dbus_protocol_remove_interface(de->userdata->dbus_protocol, de->object_path, entry_interface_info.name) >= 0);
-
-    pa_xfree(de->entry_name);
-    pa_xfree(de->object_path);
-}
-
-/* Reads an array [(UInt32, UInt32)] from the iterator. The struct items are
- * are a channel position and a volume value, respectively. The result is
- * stored in the map and vol arguments. The iterator must point to a "a(uu)"
- * element. If the data is invalid, an error reply is sent and a negative
- * number is returned. In case of a failure we make no guarantees about the
- * state of map and vol. In case of an empty array the channels field of both
- * map and vol are set to 0. This function calls dbus_message_iter_next(iter)
- * before returning. */
-static int get_volume_arg(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, pa_channel_map *map, pa_cvolume *vol) {
-    DBusMessageIter array_iter;
-    DBusMessageIter struct_iter;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(pa_streq(dbus_message_iter_get_signature(iter), "a(uu)"));
-    pa_assert(map);
-    pa_assert(vol);
-
-    pa_channel_map_init(map);
-    pa_cvolume_init(vol);
-
-    map->channels = 0;
-    vol->channels = 0;
-
-    dbus_message_iter_recurse(iter, &array_iter);
-
-    while (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_INVALID) {
-        dbus_uint32_t chan_pos;
-        dbus_uint32_t chan_vol;
-
-        dbus_message_iter_recurse(&array_iter, &struct_iter);
-
-        dbus_message_iter_get_basic(&struct_iter, &chan_pos);
-
-        if (chan_pos >= PA_CHANNEL_POSITION_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid channel position: %u", chan_pos);
-            return -1;
-        }
-
-        pa_assert_se(dbus_message_iter_next(&struct_iter));
-        dbus_message_iter_get_basic(&struct_iter, &chan_vol);
-
-        if (chan_vol > PA_VOLUME_MAX) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume: %u", chan_vol);
-            return -1;
-        }
-
-        if (map->channels < PA_CHANNELS_MAX) {
-            map->map[map->channels] = chan_pos;
-            vol->values[map->channels] = chan_vol;
-        }
-        ++map->channels;
-        ++vol->channels;
-
-        dbus_message_iter_next(&array_iter);
-    }
-
-    if (map->channels > PA_CHANNELS_MAX) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Too many channels: %u. The maximum is %u.", map->channels, PA_CHANNELS_MAX);
-        return -1;
-    }
-
-    dbus_message_iter_next(iter);
-
-    return 0;
-}
-
-static void append_volume(DBusMessageIter *iter, struct entry *e) {
-    DBusMessageIter array_iter;
-    DBusMessageIter struct_iter;
-    unsigned i;
-
-    pa_assert(iter);
-    pa_assert(e);
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "(uu)", &array_iter));
-
-    if (!e->volume_valid) {
-        pa_assert_se(dbus_message_iter_close_container(iter, &array_iter));
-        return;
-    }
-
-    for (i = 0; i < e->channel_map.channels; ++i) {
-        pa_assert_se(dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &struct_iter));
-
-        pa_assert_se(dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_UINT32, &e->channel_map.map[i]));
-        pa_assert_se(dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_UINT32, &e->volume.values[i]));
-
-        pa_assert_se(dbus_message_iter_close_container(&array_iter, &struct_iter));
-    }
-
-    pa_assert_se(dbus_message_iter_close_container(iter, &array_iter));
-}
-
-static void append_volume_variant(DBusMessageIter *iter, struct entry *e) {
-    DBusMessageIter variant_iter;
-
-    pa_assert(iter);
-    pa_assert(e);
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "a(uu)", &variant_iter));
-
-    append_volume(&variant_iter, e);
-
-    pa_assert_se(dbus_message_iter_close_container(iter, &variant_iter));
-}
-
-static void send_new_entry_signal(struct dbus_entry *entry) {
-    DBusMessage *signal_msg;
-
-    pa_assert(entry);
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(OBJECT_PATH, INTERFACE_STREAM_RESTORE, signals[SIGNAL_NEW_ENTRY].name));
-    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &entry->object_path, DBUS_TYPE_INVALID));
-    pa_dbus_protocol_send_signal(entry->userdata->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-}
-
-static void send_entry_removed_signal(struct dbus_entry *entry) {
-    DBusMessage *signal_msg;
-
-    pa_assert(entry);
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(OBJECT_PATH, INTERFACE_STREAM_RESTORE, signals[SIGNAL_ENTRY_REMOVED].name));
-    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &entry->object_path, DBUS_TYPE_INVALID));
-    pa_dbus_protocol_send_signal(entry->userdata->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-}
-
-static void send_device_updated_signal(struct dbus_entry *de, struct entry *e) {
-    DBusMessage *signal_msg;
-    const char *device;
-
-    pa_assert(de);
-    pa_assert(e);
-
-    device = e->device_valid ? e->device : "";
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(de->object_path, INTERFACE_ENTRY, entry_signals[ENTRY_SIGNAL_DEVICE_UPDATED].name));
-    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &device, DBUS_TYPE_INVALID));
-    pa_dbus_protocol_send_signal(de->userdata->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-}
-
-static void send_volume_updated_signal(struct dbus_entry *de, struct entry *e) {
-    DBusMessage *signal_msg;
-    DBusMessageIter msg_iter;
-
-    pa_assert(de);
-    pa_assert(e);
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(de->object_path, INTERFACE_ENTRY, entry_signals[ENTRY_SIGNAL_VOLUME_UPDATED].name));
-    dbus_message_iter_init_append(signal_msg, &msg_iter);
-    append_volume(&msg_iter, e);
-    pa_dbus_protocol_send_signal(de->userdata->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-}
-
-static void send_mute_updated_signal(struct dbus_entry *de, struct entry *e) {
-    DBusMessage *signal_msg;
-    dbus_bool_t muted;
-
-    pa_assert(de);
-    pa_assert(e);
-
-    pa_assert(e->muted_valid);
-
-    muted = e->muted;
-
-    pa_assert_se(signal_msg = dbus_message_new_signal(de->object_path, INTERFACE_ENTRY, entry_signals[ENTRY_SIGNAL_MUTE_UPDATED].name));
-    pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &muted, DBUS_TYPE_INVALID));
-    pa_dbus_protocol_send_signal(de->userdata->dbus_protocol, signal_msg);
-    dbus_message_unref(signal_msg);
-}
-
-static void handle_get_interface_revision(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    dbus_uint32_t interface_revision = DBUS_INTERFACE_REVISION;
-
-    pa_assert(conn);
-    pa_assert(msg);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &interface_revision);
-}
-
-/* The caller frees the array, but not the strings. */
-static const char **get_entries(struct userdata *u, unsigned *n) {
-    const char **entries;
-    unsigned i = 0;
-    void *state = NULL;
-    struct dbus_entry *de;
-
-    pa_assert(u);
-    pa_assert(n);
-
-    *n = pa_hashmap_size(u->dbus_entries);
-
-    if (*n == 0)
-        return NULL;
-
-    entries = pa_xnew(const char *, *n);
-
-    PA_HASHMAP_FOREACH(de, u->dbus_entries, state)
-        entries[i++] = de->object_path;
-
-    return entries;
-}
-
-static void handle_get_entries(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct userdata *u = userdata;
-    const char **entries;
-    unsigned n;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    entries = get_entries(u, &n);
-
-    pa_dbus_send_basic_array_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, entries, n);
-
-    pa_xfree(entries);
-}
-
-static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct userdata *u = userdata;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    dbus_uint32_t interface_revision;
-    const char **entries;
-    unsigned n_entries;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    interface_revision = DBUS_INTERFACE_REVISION;
-    entries = get_entries(u, &n_entries);
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_INTERFACE_REVISION].property_name, DBUS_TYPE_UINT32, &interface_revision);
-    pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ENTRIES].property_name, DBUS_TYPE_OBJECT_PATH, entries, n_entries);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(entries);
-}
-
-static void handle_add_entry(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct userdata *u = userdata;
-    DBusMessageIter msg_iter;
-    const char *name = NULL;
-    const char *device = NULL;
-    pa_channel_map map;
-    pa_cvolume vol;
-    dbus_bool_t muted = FALSE;
-    dbus_bool_t apply_immediately = FALSE;
-    pa_datum key;
-    pa_datum value;
-    struct dbus_entry *dbus_entry = NULL;
-    struct entry *e = NULL;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    pa_assert_se(dbus_message_iter_init(msg, &msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &name);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &device);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    if (get_volume_arg(conn, msg, &msg_iter, &map, &vol) < 0)
-        return;
-
-    dbus_message_iter_get_basic(&msg_iter, &muted);
-
-    pa_assert_se(dbus_message_iter_next(&msg_iter));
-    dbus_message_iter_get_basic(&msg_iter, &apply_immediately);
-
-    if (!*name) {
-        pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "An empty string was given as the entry name.");
-        return;
-    }
-
-    if ((dbus_entry = pa_hashmap_get(u->dbus_entries, name))) {
-        pa_bool_t mute_updated = FALSE;
-        pa_bool_t volume_updated = FALSE;
-        pa_bool_t device_updated = FALSE;
-
-        pa_assert_se(e = read_entry(u, name));
-        mute_updated = e->muted != muted;
-        e->muted = muted;
-        e->muted_valid = TRUE;
-
-        volume_updated = (e->volume_valid != !!map.channels) || !pa_cvolume_equal(&e->volume, &vol);
-        e->volume = vol;
-        e->channel_map = map;
-        e->volume_valid = !!map.channels;
-
-        device_updated = (e->device_valid != !!device[0]) || !pa_streq(e->device, device);
-        pa_strlcpy(e->device, device, sizeof(e->device));
-        e->device_valid = !!device[0];
-
-        if (mute_updated)
-            send_mute_updated_signal(dbus_entry, e);
-        if (volume_updated)
-            send_volume_updated_signal(dbus_entry, e);
-        if (device_updated)
-            send_device_updated_signal(dbus_entry, e);
-
-    } else {
-        dbus_entry = dbus_entry_new(u, name);
-        pa_assert_se(pa_hashmap_put(u->dbus_entries, dbus_entry->entry_name, dbus_entry) == 0);
-
-        e = pa_xnew0(struct entry, 1);
-        e->muted_valid = TRUE;
-        e->volume_valid = !!map.channels;
-        e->device_valid = !!device[0];
-        e->muted = muted;
-        e->volume = vol;
-        e->channel_map = map;
-        pa_strlcpy(e->device, device, sizeof(e->device));
-
-        send_new_entry_signal(dbus_entry);
-    }
-
-    key.data = (char *) name;
-    key.size = strlen(name);
-
-    value.data = e;
-    value.size = sizeof(struct entry);
-
-    pa_assert_se(pa_database_set(u->database, &key, &value, TRUE) == 0);
-    if (apply_immediately)
-        apply_entry(u, name, e);
-
-    trigger_save(u);
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_xfree(e);
-}
-
-static void handle_get_entry_by_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct userdata *u = userdata;
-    const char *name;
-    struct dbus_entry *de;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(u);
-
-    pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID));
-
-    if (!(de = pa_hashmap_get(u->dbus_entries, name))) {
-        pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "No such stream restore entry.");
-        return;
-    }
-
-    pa_dbus_send_basic_value_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &de->object_path);
-}
-
-static void handle_entry_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &de->index);
-}
-
-static void handle_entry_get_name(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &de->entry_name);
-}
-
-static void handle_entry_get_device(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-    struct entry *e;
-    const char *device;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    device = e->device_valid ? e->device : "";
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &device);
-
-    pa_xfree(e);
-}
-
-static void handle_entry_set_device(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    struct dbus_entry *de = userdata;
-    const char *device;
-    struct entry *e;
-    pa_bool_t updated;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(de);
-
-    dbus_message_iter_get_basic(iter, &device);
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    updated = (e->device_valid != !!device[0]) || !pa_streq(e->device, device);
-
-    if (updated) {
-        pa_datum key;
-        pa_datum value;
-
-        pa_strlcpy(e->device, device, sizeof(e->device));
-        e->device_valid = !!device[0];
-
-        key.data = de->entry_name;
-        key.size = strlen(de->entry_name);
-        value.data = e;
-        value.size = sizeof(struct entry);
-        pa_assert_se(pa_database_set(de->userdata->database, &key, &value, TRUE) == 0);
-
-        send_device_updated_signal(de, e);
-        trigger_save(de->userdata);
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_xfree(e);
-}
-
-static void handle_entry_get_volume(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-    DBusMessage *reply;
-    DBusMessageIter msg_iter;
-    struct entry *e;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    pa_assert_se(reply = dbus_message_new_method_return(msg));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    append_volume_variant(&msg_iter, e);
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    pa_xfree(e);
-}
-
-static void handle_entry_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    struct dbus_entry *de = userdata;
-    pa_channel_map map;
-    pa_cvolume vol;
-    struct entry *e = NULL;
-    pa_bool_t updated = FALSE;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(de);
-
-    if (get_volume_arg(conn, msg, iter, &map, &vol) < 0)
-        return;
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    updated = (e->volume_valid != !!map.channels) || !pa_cvolume_equal(&e->volume, &vol);
-
-    if (updated) {
-        pa_datum key;
-        pa_datum value;
-
-        e->volume = vol;
-        e->channel_map = map;
-        e->volume_valid = !!map.channels;
-
-        key.data = de->entry_name;
-        key.size = strlen(de->entry_name);
-        value.data = e;
-        value.size = sizeof(struct entry);
-        pa_assert_se(pa_database_set(de->userdata->database, &key, &value, TRUE) == 0);
-
-        send_volume_updated_signal(de, e);
-        trigger_save(de->userdata);
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_xfree(e);
-}
-
-static void handle_entry_get_mute(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-    struct entry *e;
-    dbus_bool_t mute;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    mute = e->muted_valid ? e->muted : FALSE;
-
-    pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &mute);
-
-    pa_xfree(e);
-}
-
-static void handle_entry_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
-    struct dbus_entry *de = userdata;
-    dbus_bool_t mute;
-    struct entry *e;
-    pa_bool_t updated;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(de);
-
-    dbus_message_iter_get_basic(iter, &mute);
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    updated = !e->muted_valid || e->muted != mute;
-
-    if (updated) {
-        pa_datum key;
-        pa_datum value;
-
-        e->muted = mute;
-        e->muted_valid = TRUE;
-
-        key.data = de->entry_name;
-        key.size = strlen(de->entry_name);
-        value.data = e;
-        value.size = sizeof(struct entry);
-        pa_assert_se(pa_database_set(de->userdata->database, &key, &value, TRUE) == 0);
-
-        send_mute_updated_signal(de, e);
-        trigger_save(de->userdata);
-    }
-
-    pa_dbus_send_empty_reply(conn, msg);
-
-    pa_xfree(e);
-}
-
-static void handle_entry_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-    struct entry *e;
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    const char *device;
-    dbus_bool_t mute;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    pa_assert_se(e = read_entry(de->userdata, de->entry_name));
-
-    device = e->device_valid ? e->device : "";
-    mute = e->muted_valid ? e->muted : FALSE;
-
-    pa_assert_se((reply = dbus_message_new_method_return(msg)));
-
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, entry_property_handlers[ENTRY_PROPERTY_HANDLER_INDEX].property_name, DBUS_TYPE_UINT32, &de->index);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, entry_property_handlers[ENTRY_PROPERTY_HANDLER_NAME].property_name, DBUS_TYPE_STRING, &de->entry_name);
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, entry_property_handlers[ENTRY_PROPERTY_HANDLER_DEVICE].property_name, DBUS_TYPE_STRING, &device);
-
-    pa_assert_se(dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-
-    pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &entry_property_handlers[ENTRY_PROPERTY_HANDLER_VOLUME].property_name));
-    append_volume_variant(&dict_entry_iter, e);
-
-    pa_assert_se(dbus_message_iter_close_container(&dict_iter, &dict_entry_iter));
-
-    pa_dbus_append_basic_variant_dict_entry(&dict_iter, entry_property_handlers[ENTRY_PROPERTY_HANDLER_MUTE].property_name, DBUS_TYPE_BOOLEAN, &mute);
-
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-
-    pa_assert_se(dbus_connection_send(conn, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(e);
-}
-
-static void handle_entry_remove(DBusConnection *conn, DBusMessage *msg, void *userdata) {
-    struct dbus_entry *de = userdata;
-    pa_datum key;
-
-    pa_assert(conn);
-    pa_assert(msg);
-    pa_assert(de);
-
-    key.data = de->entry_name;
-    key.size = strlen(de->entry_name);
-
-    pa_assert_se(pa_database_unset(de->userdata->database, &key) == 0);
-
-    send_entry_removed_signal(de);
-    trigger_save(de->userdata);
-
-    pa_assert_se(pa_hashmap_remove(de->userdata->dbus_entries, de->entry_name));
-    dbus_entry_free(de);
-
-    pa_dbus_send_empty_reply(conn, msg);
-}
-
-#endif /* HAVE_DBUS */
-
 static void save_time_callback(pa_mainloop_api*a, pa_time_event* e, const struct timeval *t, void *userdata) {
     struct userdata *u = userdata;
 
@@ -1005,7 +163,7 @@
     return t;
 }
 
-static struct entry *read_entry(struct userdata *u, const char *name) {
+static struct entry* read_entry(struct userdata *u, const char *name) {
     pa_datum key, data;
     struct entry *e;
 
@@ -1123,21 +281,10 @@
 
 static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
     struct userdata *u = userdata;
-    struct entry entry, *old = NULL;
-    char *name = NULL;
+    struct entry entry, *old;
+    char *name;
     pa_datum key, data;
 
-    /* These are only used when D-Bus is enabled, but in order to reduce ifdef
-     * clutter these are defined here unconditionally. */
-    pa_bool_t created_new_entry = TRUE;
-    pa_bool_t device_updated = FALSE;
-    pa_bool_t volume_updated = FALSE;
-    pa_bool_t mute_updated = FALSE;
-
-#ifdef HAVE_DBUS
-    struct dbus_entry *de = NULL;
-#endif
-
     pa_assert(c);
     pa_assert(u);
 
@@ -1159,34 +306,24 @@
         if (!(name = get_name(sink_input->proplist, "sink-input")))
             return;
 
-        if ((old = read_entry(u, name))) {
+        if ((old = read_entry(u, name)))
             entry = *old;
-            created_new_entry = FALSE;
-        }
 
         if (sink_input->save_volume) {
             entry.channel_map = sink_input->channel_map;
             pa_sink_input_get_volume(sink_input, &entry.volume, FALSE);
             entry.volume_valid = TRUE;
-
-            volume_updated = !created_new_entry
-                             && (!old->volume_valid
-                                 || !pa_channel_map_equal(&entry.channel_map, &old->channel_map)
-                                 || !pa_cvolume_equal(&entry.volume, &old->volume));
         }
 
         if (sink_input->save_muted) {
             entry.muted = pa_sink_input_get_mute(sink_input);
             entry.muted_valid = TRUE;
-
-            mute_updated = !created_new_entry && (!old->muted_valid || entry.muted != old->muted);
         }
 
         if (sink_input->save_sink) {
             pa_strlcpy(entry.device, sink_input->sink->name, sizeof(entry.device));
             entry.device_valid = TRUE;
 
-            device_updated = !created_new_entry && (!old->device_valid || !pa_streq(entry.device, old->device));
             if (sink_input->sink->card) {
                 pa_strlcpy(entry.card, sink_input->sink->card->name, sizeof(entry.card));
                 entry.card_valid = TRUE;
@@ -1204,17 +341,13 @@
         if (!(name = get_name(source_output->proplist, "source-output")))
             return;
 
-        if ((old = read_entry(u, name))) {
+        if ((old = read_entry(u, name)))
             entry = *old;
-            created_new_entry = FALSE;
-        }
 
         if (source_output->save_source) {
             pa_strlcpy(entry.device, source_output->source->name, sizeof(entry.device));
             entry.device_valid = source_output->save_source;
 
-            device_updated = !created_new_entry && (!old->device_valid || !pa_streq(entry.device, old->device));
-
             if (source_output->source->card) {
                 pa_strlcpy(entry.card, source_output->source->card->name, sizeof(entry.card));
                 entry.card_valid = TRUE;
@@ -1243,23 +376,6 @@
 
     pa_database_set(u->database, &key, &data, TRUE);
 
-#ifdef HAVE_DBUS
-    if (created_new_entry) {
-        de = dbus_entry_new(u, name);
-        pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
-        send_new_entry_signal(de);
-    } else {
-        pa_assert_se(de = pa_hashmap_get(u->dbus_entries, name));
-
-        if (device_updated)
-            send_device_updated_signal(de, &entry);
-        if (volume_updated)
-            send_volume_updated_signal(de, &entry);
-        if (mute_updated)
-            send_mute_updated_signal(de, &entry);
-    }
-#endif
-
     pa_xfree(name);
 
     trigger_save(u);
@@ -1773,27 +889,14 @@
                 mode != PA_UPDATE_SET)
                 goto fail;
 
-            if (mode == PA_UPDATE_SET) {
-#ifdef HAVE_DBUS
-                struct dbus_entry *de;
-                void *state = NULL;
-
-                PA_HASHMAP_FOREACH(de, u->dbus_entries, state) {
-                    send_entry_removed_signal(de);
-                    dbus_entry_free(pa_hashmap_remove(u->dbus_entries, de->entry_name));
-                }
-#endif
+            if (mode == PA_UPDATE_SET)
                 pa_database_clear(u->database);
-            }
 
             while (!pa_tagstruct_eof(t)) {
                 const char *name, *device;
                 pa_bool_t muted;
                 struct entry entry;
                 pa_datum key, data;
-#ifdef HAVE_DBUS
-                struct entry *old;
-#endif
 
                 pa_zero(entry);
                 entry.version = ENTRY_VERSION;
@@ -1825,10 +928,6 @@
                     !pa_namereg_is_valid_name(entry.device))
                     goto fail;
 
-#ifdef HAVE_DBUS
-                old = read_entry(u, name);
-#endif
-
                 key.data = (char*) name;
                 key.size = strlen(name);
 
@@ -1839,40 +938,9 @@
                              pa_strnull(pa_proplist_gets(pa_native_connection_get_client(c)->proplist, PA_PROP_APPLICATION_PROCESS_BINARY)),
                              name);
 
-                if (pa_database_set(u->database, &key, &data, mode == PA_UPDATE_REPLACE) == 0) {
-#ifdef HAVE_DBUS
-                    struct dbus_entry *de;
-
-                    if (old) {
-                        pa_assert_se((de = pa_hashmap_get(u->dbus_entries, name)));
-
-                        if ((old->device_valid != entry.device_valid)
-                            || (entry.device_valid && !pa_streq(entry.device, old->device)))
-                            send_device_updated_signal(de, &entry);
-
-                        if ((old->volume_valid != entry.volume_valid)
-                            || (entry.volume_valid && (!pa_cvolume_equal(&entry.volume, &old->volume)
-                                                       || !pa_channel_map_equal(&entry.channel_map, &old->channel_map))))
-                            send_volume_updated_signal(de, &entry);
-
-                        if (!old->muted_valid || (entry.muted != old->muted))
-                            send_mute_updated_signal(de, &entry);
-
-                    } else {
-                        de = dbus_entry_new(u, name);
-                        pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
-                        send_new_entry_signal(de);
-                    }
-#endif
-
+                if (pa_database_set(u->database, &key, &data, mode == PA_UPDATE_REPLACE) == 0)
                     if (apply_immediately)
                         apply_entry(u, name, &entry);
-                }
-
-#ifdef HAVE_DBUS
-                if (old)
-                    pa_xfree(old);
-#endif
             }
 
             trigger_save(u);
@@ -1885,20 +953,10 @@
             while (!pa_tagstruct_eof(t)) {
                 const char *name;
                 pa_datum key;
-#ifdef HAVE_DBUS
-                struct dbus_entry *de;
-#endif
 
                 if (pa_tagstruct_gets(t, &name) < 0)
                     goto fail;
 
-#ifdef HAVE_DBUS
-                if ((de = pa_hashmap_get(u->dbus_entries, name))) {
-                    send_entry_removed_signal(de);
-                    dbus_entry_free(pa_hashmap_remove(u->dbus_entries, name));
-                }
-#endif
-
                 key.data = (char*) name;
                 key.size = strlen(name);
 
@@ -1957,10 +1015,6 @@
     pa_source_output *so;
     uint32_t idx;
     pa_bool_t restore_device = TRUE, restore_volume = TRUE, restore_muted = TRUE, on_hotplug = TRUE, on_rescue = TRUE;
-#ifdef HAVE_DBUS
-    pa_datum key;
-    pa_bool_t done;
-#endif
 
     pa_assert(m);
 
@@ -2031,39 +1085,6 @@
     pa_log_info("Sucessfully opened database file '%s'.", fname);
     pa_xfree(fname);
 
-#ifdef HAVE_DBUS
-    u->dbus_protocol = pa_dbus_protocol_get(u->core);
-    u->dbus_entries = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    pa_assert_se(pa_dbus_protocol_add_interface(u->dbus_protocol, OBJECT_PATH, &stream_restore_interface_info, u) >= 0);
-    pa_assert_se(pa_dbus_protocol_register_extension(u->dbus_protocol, INTERFACE_STREAM_RESTORE) >= 0);
-
-    /* Create the initial dbus entries. */
-    done = !pa_database_first(u->database, &key, NULL);
-    while (!done) {
-        pa_datum next_key;
-        char *name;
-        struct dbus_entry *de;
-        struct entry *e;
-
-        done = !pa_database_next(u->database, &key, &next_key, NULL);
-
-        name = pa_xstrndup(key.data, key.size);
-        pa_datum_free(&key);
-
-        /* Use read_entry() for checking that the entry is valid. */
-        if ((e = read_entry(u, name))) {
-            de = dbus_entry_new(u, name);
-            pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de) == 0);
-            pa_xfree(e);
-        }
-
-        pa_xfree(name);
-
-        key = next_key;
-    }
-#endif
-
     PA_IDXSET_FOREACH(si, m->core->sink_inputs, idx)
         subscribe_callback(m->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, si->index, u);
 
@@ -2082,16 +1103,6 @@
     return  -1;
 }
 
-#ifdef HAVE_DBUS
-static void free_dbus_entry_cb(void *p, void *userdata) {
-    struct dbus_entry *de = p;
-
-    pa_assert(de);
-
-    dbus_entry_free(de);
-}
-#endif
-
 void pa__done(pa_module*m) {
     struct userdata* u;
 
@@ -2100,19 +1111,6 @@
     if (!(u = m->userdata))
         return;
 
-#ifdef HAVE_DBUS
-    if (u->dbus_protocol) {
-        pa_assert(u->dbus_entries);
-
-        pa_assert_se(pa_dbus_protocol_unregister_extension(u->dbus_protocol, INTERFACE_STREAM_RESTORE) >= 0);
-        pa_assert_se(pa_dbus_protocol_remove_interface(u->dbus_protocol, OBJECT_PATH, stream_restore_interface_info.name) >= 0);
-
-        pa_hashmap_free(u->dbus_entries, free_dbus_entry_cb, NULL);
-
-        pa_dbus_protocol_unref(u->dbus_protocol);
-    }
-#endif
-
     if (u->subscription)
         pa_subscription_free(u->subscription);
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-udev-detect.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-udev-detect.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/module-udev-detect.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/module-udev-detect.c	2010-01-15 23:21:18.000000000 +0000
@@ -103,6 +103,63 @@
     return e + 5;
 }
 
+static char *card_get_sysattr(const char *card_idx, const char *name) {
+    struct udev *udev;
+    struct udev_device *card = NULL;
+    char *t, *r = NULL;
+    const char *v;
+
+    pa_assert(card_idx);
+    pa_assert(name);
+
+    if (!(udev = udev_new())) {
+        pa_log_error("Failed to allocate udev context.");
+        goto finish;
+    }
+
+    t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
+    card = udev_device_new_from_syspath(udev, t);
+    pa_xfree(t);
+
+    if (!card) {
+        pa_log_error("Failed to get card object.");
+        goto finish;
+    }
+
+    if ((v = udev_device_get_sysattr_value(card, name)) && *v)
+        r = pa_xstrdup(v);
+
+finish:
+
+    if (card)
+        udev_device_unref(card);
+
+    if (udev)
+        udev_unref(udev);
+
+    return r;
+}
+
+static pa_bool_t pcm_is_modem(const char *card_idx, const char *pcm) {
+    char *sysfs_path, *pcm_class;
+    pa_bool_t is_modem;
+
+    pa_assert(card_idx);
+    pa_assert(pcm);
+
+    /* Check /sys/class/sound/card.../pcmC...../pcm_class. An HDA
+     * modem can be used simultaneously with generic
+     * playback/record. */
+
+    sysfs_path = pa_sprintf_malloc("pcmC%sD%s/pcm_class", card_idx, pcm);
+    pcm_class = card_get_sysattr(card_idx, sysfs_path);
+    is_modem = pcm_class && pa_streq(pcm_class, "modem");
+    pa_xfree(pcm_class);
+    pa_xfree(sysfs_path);
+
+    return is_modem;
+}
+
 static pa_bool_t is_card_busy(const char *id) {
     char *card_path = NULL, *pcm_path = NULL, *sub_status = NULL;
     DIR *card_dir = NULL, *pcm_dir = NULL;
@@ -141,6 +198,9 @@
         if (!pa_startswith(de->d_name, "pcm"))
             continue;
 
+        if (pcm_is_modem(id, de->d_name + 3))
+            continue;
+
         pa_xfree(pcm_path);
         pcm_path = pa_sprintf_malloc("%s/%s", card_path, de->d_name);
 
@@ -172,7 +232,7 @@
             if (status_file)
                 fclose(status_file);
 
-            if (!(status_file = pa_fopen_cloexec(sub_status, "r"))) {
+            if (!(status_file = fopen(sub_status, "r"))) {
                 pa_log_warn("Failed to open %s: %s", sub_status, pa_cstrerror(errno));
                 continue;
             }
@@ -366,7 +426,7 @@
         return;
     }
 
-    if ((ff = udev_device_get_property_value(dev, "SOUND_CLASS")) &&
+    if ((ff = udev_device_get_property_value(dev, "SOUND_FORM_FACTOR")) &&
         pa_streq(ff, "modem")) {
         pa_log_debug("Ignoring %s, because it is a modem.", udev_device_get_devpath(dev));
         return;
@@ -416,8 +476,10 @@
         goto fail;
     }
 
-    if (!path_get_card_id(udev_device_get_devpath(dev)))
+    if (!path_get_card_id(udev_device_get_devpath(dev))) {
+        udev_device_unref(dev);
         return;
+    }
 
     process_device(u, dev);
     udev_device_unref(dev);
@@ -637,6 +699,11 @@
         goto fail;
     }
 
+    if (udev_monitor_filter_add_match_subsystem_devtype(u->monitor, "sound", NULL) < 0) {
+        pa_log("Failed to subscribe to sound devices.");
+        goto fail;
+    }
+
     errno = 0;
     if (udev_monitor_enable_receiving(u->monitor) < 0) {
         pa_log("Failed to enable monitor: %s", pa_cstrerror(errno));
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/oss/oss-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/oss/oss-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/oss/oss-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/oss/oss-util.c	2010-01-15 23:21:18.000000000 +0000
@@ -55,7 +55,7 @@
         pcaps = &caps;
 
     if (*mode == O_RDWR) {
-        if ((fd = pa_open_cloexec(device, O_RDWR|O_NDELAY, 0)) >= 0) {
+        if ((fd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) >= 0) {
             ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
 
             if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {
@@ -71,14 +71,14 @@
             pa_close(fd);
         }
 
-        if ((fd = pa_open_cloexec(device, (*mode = O_WRONLY)|O_NDELAY, 0)) < 0) {
-            if ((fd = pa_open_cloexec(device, (*mode = O_RDONLY)|O_NDELAY, 0)) < 0) {
+        if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY|O_NOCTTY)) < 0) {
+            if ((fd = open(device, (*mode = O_RDONLY)|O_NDELAY|O_NOCTTY)) < 0) {
                 pa_log("open('%s'): %s", device, pa_cstrerror(errno));
                 goto fail;
             }
         }
     } else {
-        if ((fd = pa_open_cloexec(device, *mode|O_NDELAY, 0)) < 0) {
+        if ((fd = open(device, *mode|O_NDELAY|O_NOCTTY)) < 0) {
             pa_log("open('%s'): %s", device, pa_cstrerror(errno));
             goto fail;
         }
@@ -145,6 +145,8 @@
     pa_log_debug("capabilities:%s", t);
     pa_xfree(t);
 
+    pa_make_fd_cloexec(fd);
+
     return fd;
 
 fail:
@@ -349,9 +351,9 @@
     if ((n = get_device_number(dev)) < 0)
         return -1;
 
-    if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
-        !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
-        !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {
+    if (!(f = fopen("/dev/sndstat", "r")) &&
+        !(f = fopen("/proc/sndstat", "r")) &&
+        !(f = fopen("/proc/asound/oss/sndstat", "r"))) {
 
         if (errno != ENOENT)
             pa_log_warn("failed to open OSS sndstat device: %s", pa_cstrerror(errno));
@@ -401,7 +403,7 @@
 static int open_mixer(const char *mixer) {
     int fd;
 
-    if ((fd = pa_open_cloexec(mixer, O_RDWR|O_NDELAY, 0)) >= 0)
+    if ((fd = open(mixer, O_RDWR|O_NDELAY|O_NOCTTY)) >= 0)
         return fd;
 
     return -1;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/raop/module-raop-sink.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/raop/module-raop-sink.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/raop/module-raop-sink.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/raop/module-raop-sink.c	2010-01-15 23:21:18.000000000 +0000
@@ -32,6 +32,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <limits.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -59,7 +60,6 @@
 #include <pulsecore/thread.h>
 #include <pulsecore/time-smoother.h>
 #include <pulsecore/socket-util.h>
-#include <pulsecore/poll.h>
 
 #include "module-raop-sink-symdef.h"
 #include "rtp.h"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/raop/raop_client.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/raop/raop_client.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/raop/raop_client.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/raop/raop_client.c	2010-01-15 23:21:18.000000000 +0000
@@ -51,7 +51,12 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/strbuf.h>
 #include <pulsecore/random.h>
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
 #include <pulsecore/poll.h>
+#endif
 
 #include "raop_client.h"
 #include "rtsp_client.h"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/rtp/module-rtp-recv.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/rtp/module-rtp-recv.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/rtp/module-rtp-recv.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/rtp/module-rtp-recv.c	2010-01-15 23:21:18.000000000 +0000
@@ -390,7 +390,7 @@
     pa_assert(salen > 0);
 
     af = sa->sa_family;
-    if ((fd = pa_socket_cloexec(af, SOCK_DGRAM, 0)) < 0) {
+    if ((fd = socket(af, SOCK_DGRAM, 0)) < 0) {
         pa_log("Failed to create socket: %s", pa_cstrerror(errno));
         goto fail;
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/rtp/module-rtp-send.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/rtp/module-rtp-send.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/rtp/module-rtp-send.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/rtp/module-rtp-send.c	2010-01-15 23:21:18.000000000 +0000
@@ -262,7 +262,7 @@
         goto fail;
     }
 
-    if ((fd = pa_socket_cloexec(af, SOCK_DGRAM, 0)) < 0) {
+    if ((fd = socket(af, SOCK_DGRAM, 0)) < 0) {
         pa_log("socket() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
@@ -277,7 +277,7 @@
 #endif
     }
 
-    if ((sap_fd = pa_socket_cloexec(af, SOCK_DGRAM, 0)) < 0) {
+    if ((sap_fd = socket(af, SOCK_DGRAM, 0)) < 0) {
         pa_log("socket() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
@@ -316,6 +316,8 @@
     /* If the socket queue is full, let's drop packets */
     pa_make_fd_nonblock(fd);
     pa_make_udp_socket_low_delay(fd);
+    pa_make_fd_cloexec(fd);
+    pa_make_fd_cloexec(sap_fd);
 
     pa_source_output_new_data_init(&data);
     pa_proplist_sets(data.proplist, PA_PROP_MEDIA_NAME, "RTP Monitor Stream");
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/rtp/rtsp_client.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/rtp/rtsp_client.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/rtp/rtsp_client.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/rtp/rtsp_client.c	2010-01-15 23:21:18.000000000 +0000
@@ -45,7 +45,12 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/strbuf.h>
 #include <pulsecore/ioline.h>
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
 #include <pulsecore/poll.h>
+#endif
 
 #include "rtsp_client.h"
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/udev-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/udev-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/udev-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/udev-util.c	2010-01-15 23:21:18.000000000 +0000
@@ -58,6 +58,112 @@
     return u;
 }
 
+static int dehex(char x) {
+    if (x >= '0' && x <= '9')
+        return x - '0';
+
+    if (x >= 'A' && x <= 'F')
+        return x - 'A';
+
+    if (x >= 'a' && x <= 'f')
+        return x - 'a';
+
+    return -1;
+}
+
+static void proplist_sets_unescape(pa_proplist *p, const char *prop, const char *s) {
+    const char *f;
+    char *t, *r;
+    int c;
+
+    enum {
+        TEXT,
+        BACKSLASH,
+        EX,
+        FIRST
+    } state = TEXT;
+
+    /* The resulting string is definitely shorter than the source string */
+    r = pa_xnew(char, strlen(s)+1);
+
+    for (f = s, t = r; *f; f++) {
+
+        switch (state) {
+
+            case TEXT:
+                if (*f == '\\')
+                    state = BACKSLASH;
+                else
+                    *(t++) = *f;
+                break;
+
+            case BACKSLASH:
+                if (*f == 'x')
+                    state = EX;
+                else {
+                    *(t++) = '\\';
+                    *(t++) = *f;
+                    state = TEXT;
+                }
+                break;
+
+            case EX:
+                c = dehex(*f);
+
+                if (c < 0) {
+                    *(t++) = '\\';
+                    *(t++) = 'x';
+                    *(t++) = *f;
+                    state = TEXT;
+                } else
+                    state = FIRST;
+
+                break;
+
+            case FIRST: {
+                int d = dehex(*f);
+
+                if (d < 0) {
+                    *(t++) = '\\';
+                    *(t++) = 'x';
+                    *(t++) = *(f-1);
+                    *(t++) = *f;
+                } else
+                    *(t++) = (char) (c << 4) | d;
+
+                state = TEXT;
+                break;
+            }
+        }
+    }
+
+    switch (state) {
+
+        case TEXT:
+            break;
+
+        case BACKSLASH:
+            *(t++) = '\\';
+            break;
+
+        case EX:
+            *(t++) = '\\';
+            *(t++) = 'x';
+            break;
+
+        case FIRST:
+            *(t++) = '\\';
+            *(t++) = 'x';
+            *(t++) = *(f-1);
+            break;
+    }
+
+    *t = 0;
+
+    pa_proplist_sets(p, prop, r);
+    pa_xfree(r);
+}
+
 int pa_udev_get_info(int card_idx, pa_proplist *p) {
     int r = -1;
     struct udev *udev;
@@ -107,6 +213,8 @@
     if (!pa_proplist_contains(p, PA_PROP_DEVICE_VENDOR_NAME)) {
         if ((v = udev_device_get_property_value(card, "ID_VENDOR_FROM_DATABASE")) && *v)
             pa_proplist_sets(p, PA_PROP_DEVICE_VENDOR_NAME, v);
+        else if ((v = udev_device_get_property_value(card, "ID_VENDOR_ENC")) && *v)
+            proplist_sets_unescape(p, PA_PROP_DEVICE_VENDOR_NAME, v);
         else if ((v = udev_device_get_property_value(card, "ID_VENDOR")) && *v)
             pa_proplist_sets(p, PA_PROP_DEVICE_VENDOR_NAME, v);
     }
@@ -118,6 +226,8 @@
     if (!pa_proplist_contains(p, PA_PROP_DEVICE_PRODUCT_NAME)) {
         if ((v = udev_device_get_property_value(card, "ID_MODEL_FROM_DATABASE")) && *v)
             pa_proplist_sets(p, PA_PROP_DEVICE_PRODUCT_NAME, v);
+        else if ((v = udev_device_get_property_value(card, "ID_MODEL_ENC")) && *v)
+            proplist_sets_unescape(p, PA_PROP_DEVICE_PRODUCT_NAME, v);
         else if ((v = udev_device_get_property_value(card, "ID_MODEL")) && *v)
             pa_proplist_sets(p, PA_PROP_DEVICE_PRODUCT_NAME, v);
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/x11/module-x11-xsmp.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/x11/module-x11-xsmp.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/modules/x11/module-x11-xsmp.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/modules/x11/module-x11-xsmp.c	2010-01-15 23:21:18.000000000 +0000
@@ -129,7 +129,7 @@
     pa_assert(m);
 
     if (ice_in_use) {
-        pa_log("module-x11-xsmp may not be loaded twice.");
+        pa_log("module-x11-xsmp may no be loaded twice.");
         return -1;
     }
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/channelmap.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/channelmap.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/channelmap.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/channelmap.h	2010-01-15 23:21:18.000000000 +0000
@@ -74,9 +74,9 @@
     PA_CHANNEL_POSITION_INVALID = -1,
     PA_CHANNEL_POSITION_MONO = 0,
 
-    PA_CHANNEL_POSITION_FRONT_LEFT,               /* Apple, Dolby call this 'Left' */
-    PA_CHANNEL_POSITION_FRONT_RIGHT,              /* Apple, Dolby call this 'Right' */
-    PA_CHANNEL_POSITION_FRONT_CENTER,             /* Apple, Dolby call this 'Center' */
+    PA_CHANNEL_POSITION_FRONT_LEFT,               /* Apple calls this 'Left' */
+    PA_CHANNEL_POSITION_FRONT_RIGHT,              /* Apple calls this 'Right' */
+    PA_CHANNEL_POSITION_FRONT_CENTER,             /* Apple calls this 'Center' */
 
 /** \cond fulldocs */
     PA_CHANNEL_POSITION_LEFT = PA_CHANNEL_POSITION_FRONT_LEFT,
@@ -84,20 +84,20 @@
     PA_CHANNEL_POSITION_CENTER = PA_CHANNEL_POSITION_FRONT_CENTER,
 /** \endcond */
 
-    PA_CHANNEL_POSITION_REAR_CENTER,              /* Microsoft calls this 'Back Center', Apple calls this 'Center Surround', Dolby calls this 'Surround Rear Center' */
-    PA_CHANNEL_POSITION_REAR_LEFT,                /* Microsoft calls this 'Back Left', Apple calls this 'Left Surround' (!), Dolby calls this 'Surround Rear Left'  */
-    PA_CHANNEL_POSITION_REAR_RIGHT,               /* Microsoft calls this 'Back Right', Apple calls this 'Right Surround' (!), Dolby calls this 'Surround Rear Right'  */
+    PA_CHANNEL_POSITION_REAR_CENTER,              /* Microsoft calls this 'Back Center', Apple calls this 'Center Surround' */
+    PA_CHANNEL_POSITION_REAR_LEFT,                /* Microsoft calls this 'Back Left', Apple calls this 'Left Surround' */
+    PA_CHANNEL_POSITION_REAR_RIGHT,               /* Microsoft calls this 'Back Right', Apple calls this 'Right Surround' */
 
     PA_CHANNEL_POSITION_LFE,                      /* Microsoft calls this 'Low Frequency', Apple calls this 'LFEScreen' */
 /** \cond fulldocs */
     PA_CHANNEL_POSITION_SUBWOOFER = PA_CHANNEL_POSITION_LFE,
 /** \endcond */
 
-    PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,     /* Apple, Dolby call this 'Left Center' */
-    PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,    /* Apple, Dolby call this 'Right Center */
+    PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,     /* Apple calls this 'Left Center' */
+    PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,    /* Apple calls this 'Right Center */
 
-    PA_CHANNEL_POSITION_SIDE_LEFT,                /* Apple calls this 'Left Surround Direct', Dolby calls this 'Surround Left' (!) */
-    PA_CHANNEL_POSITION_SIDE_RIGHT,               /* Apple calls this 'Right Surround Direct', Dolby calls this 'Surround Right' (!) */
+    PA_CHANNEL_POSITION_SIDE_LEFT,                /* Apple calls this 'Left Surround Direct' */
+    PA_CHANNEL_POSITION_SIDE_RIGHT,               /* Apple calls this 'Right Surround Direct' */
 
     PA_CHANNEL_POSITION_AUX0,
     PA_CHANNEL_POSITION_AUX1,
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/client-conf.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/client-conf.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/client-conf.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/client-conf.c	2010-01-15 23:21:18.000000000 +0000
@@ -57,14 +57,11 @@
     .default_sink = NULL,
     .default_source = NULL,
     .default_server = NULL,
-    .default_dbus_server = NULL,
     .autospawn = TRUE,
     .disable_shm = FALSE,
     .cookie_file = NULL,
     .cookie_valid = FALSE,
-    .shm_size = 0,
-    .auto_connect_localhost = FALSE,
-    .auto_connect_display = FALSE
+    .shm_size = 0
 };
 
 pa_client_conf *pa_client_conf_new(void) {
@@ -84,7 +81,6 @@
     pa_xfree(c->default_sink);
     pa_xfree(c->default_source);
     pa_xfree(c->default_server);
-    pa_xfree(c->default_dbus_server);
     pa_xfree(c->cookie_file);
     pa_xfree(c);
 }
@@ -101,20 +97,17 @@
         { "default-sink",           pa_config_parse_string,   &c->default_sink, NULL },
         { "default-source",         pa_config_parse_string,   &c->default_source, NULL },
         { "default-server",         pa_config_parse_string,   &c->default_server, NULL },
-        { "default-dbus-server",    pa_config_parse_string,   &c->default_dbus_server, NULL },
         { "autospawn",              pa_config_parse_bool,     &c->autospawn, NULL },
         { "cookie-file",            pa_config_parse_string,   &c->cookie_file, NULL },
         { "disable-shm",            pa_config_parse_bool,     &c->disable_shm, NULL },
         { "enable-shm",             pa_config_parse_not_bool, &c->disable_shm, NULL },
         { "shm-size-bytes",         pa_config_parse_size,     &c->shm_size, NULL },
-        { "auto-connect-localhost", pa_config_parse_bool,     &c->auto_connect_localhost, NULL },
-        { "auto-connect-display",   pa_config_parse_bool,     &c->auto_connect_display, NULL },
         { NULL,                     NULL,                     NULL, NULL },
     };
 
     if (filename) {
 
-        if (!(f = pa_fopen_cloexec(filename, "r"))) {
+        if (!(f = fopen(filename, "r"))) {
             pa_log(_("Failed to open configuration file '%s': %s"), fn, pa_cstrerror(errno));
             goto finish;
         }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/client-conf.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/client-conf.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/client-conf.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/client-conf.h	2010-01-15 23:21:18.000000000 +0000
@@ -22,14 +22,13 @@
   USA.
 ***/
 
-#include <pulsecore/macro.h>
 #include <pulsecore/native-common.h>
 
 /* A structure containing configuration data for PulseAudio clients. */
 
 typedef struct pa_client_conf {
-    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *default_dbus_server, *cookie_file;
-    pa_bool_t autospawn, disable_shm, auto_connect_localhost, auto_connect_display;
+    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
+    pa_bool_t autospawn, disable_shm;
     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
     pa_bool_t cookie_valid; /* non-zero, when cookie is valid */
     size_t shm_size;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/client.conf.in pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/client.conf.in
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/client.conf.in	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/client.conf.in	2010-01-15 23:21:18.000000000 +0000
@@ -22,7 +22,6 @@
 ; default-sink =
 ; default-source =
 ; default-server =
-; default-dbus-server =
 
 ; autospawn = yes
 ; daemon-binary = @PA_BINARY@
@@ -32,6 +31,3 @@
 
 ; enable-shm = yes
 ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
-
-; auto-connect-localhost = no
-; auto-connect-display = no
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/context.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/context.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/context.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/context.c	2010-01-15 23:21:18.000000000 +0000
@@ -63,7 +63,7 @@
 #include <pulsecore/native-common.h>
 #include <pulsecore/pdispatch.h>
 #include <pulsecore/pstream.h>
-#include <pulsecore/hashmap.h>
+#include <pulsecore/dynarray.h>
 #include <pulsecore/socket-client.h>
 #include <pulsecore/pstream-util.h>
 #include <pulsecore/core-rtclock.h>
@@ -145,7 +145,7 @@
 
     pa_init_i18n();
 
-    c = pa_xnew(pa_context, 1);
+    c = pa_xnew0(pa_context, 1);
     PA_REFCNT_INIT(c);
 
     c->proplist = p ? pa_proplist_copy(p) : pa_proplist_new();
@@ -157,11 +157,8 @@
     c->system_bus = c->session_bus = NULL;
 #endif
     c->mainloop = mainloop;
-    c->client = NULL;
-    c->pstream = NULL;
-    c->pdispatch = NULL;
-    c->playback_streams = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    c->record_streams = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    c->playback_streams = pa_dynarray_new();
+    c->record_streams = pa_dynarray_new();
     c->client_index = PA_INVALID_INDEX;
     c->use_rtclock = pa_mainloop_is_our_api(mainloop);
 
@@ -170,22 +167,9 @@
 
     c->error = PA_OK;
     c->state = PA_CONTEXT_UNCONNECTED;
-    c->ctag = 0;
-    c->csyncid = 0;
 
     reset_callbacks(c);
 
-    c->is_local = FALSE;
-    c->server_list = NULL;
-    c->server = NULL;
-
-    c->do_shm = FALSE;
-
-    c->server_specified = FALSE;
-    c->no_fail = FALSE;
-    c->do_autospawn = FALSE;
-    memset(&c->spawn_api, 0, sizeof(c->spawn_api));
-
 #ifndef MSG_NOSIGNAL
 #ifdef SIGPIPE
     pa_check_signal_is_blocked(SIGPIPE);
@@ -255,20 +239,22 @@
 
 #ifdef HAVE_DBUS
     if (c->system_bus) {
-        dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->system_bus), filter_cb, c);
+        if (c->filter_added)
+            dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->system_bus), filter_cb, c);
         pa_dbus_wrap_connection_free(c->system_bus);
     }
 
     if (c->session_bus) {
-        dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->session_bus), filter_cb, c);
+        if (c->filter_added)
+            dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->session_bus), filter_cb, c);
         pa_dbus_wrap_connection_free(c->session_bus);
     }
 #endif
 
     if (c->record_streams)
-        pa_hashmap_free(c->record_streams, NULL, NULL);
+        pa_dynarray_free(c->record_streams, NULL, NULL);
     if (c->playback_streams)
-        pa_hashmap_free(c->playback_streams, NULL, NULL);
+        pa_dynarray_free(c->playback_streams, NULL, NULL);
 
     if (c->mempool)
         pa_mempool_free(c->mempool);
@@ -375,7 +361,7 @@
 
     pa_context_ref(c);
 
-    if ((s = pa_hashmap_get(c->record_streams, PA_UINT32_TO_PTR(channel)))) {
+    if ((s = pa_dynarray_get(c->record_streams, channel))) {
 
         if (chunk->memblock) {
             pa_memblockq_seek(s->record_memblockq, offset, seek, TRUE);
@@ -794,6 +780,7 @@
         pa_log_warn("Failed to add filter function");
         goto fail;
     }
+    c->filter_added = TRUE;
 
     if (pa_dbus_add_matches(
                 pa_dbus_wrap_connection_get(*conn), &error,
@@ -987,22 +974,18 @@
         /* Prepend in reverse order */
 
         /* Follow the X display */
-        if (c->conf->auto_connect_display) {
-            if ((d = getenv("DISPLAY"))) {
-                d = pa_xstrndup(d, strcspn(d, ":"));
+        if ((d = getenv("DISPLAY"))) {
+            d = pa_xstrndup(d, strcspn(d, ":"));
 
-                if (*d)
-                    c->server_list = pa_strlist_prepend(c->server_list, d);
+            if (*d)
+                c->server_list = pa_strlist_prepend(c->server_list, d);
 
-                pa_xfree(d);
-            }
+            pa_xfree(d);
         }
 
         /* Add TCP/IP on the localhost */
-        if (c->conf->auto_connect_localhost) {
-            c->server_list = pa_strlist_prepend(c->server_list, "tcp6:[::1]");
-            c->server_list = pa_strlist_prepend(c->server_list, "tcp4:127.0.0.1");
-        }
+        c->server_list = pa_strlist_prepend(c->server_list, "tcp6:[::1]");
+        c->server_list = pa_strlist_prepend(c->server_list, "tcp4:127.0.0.1");
 
         /* The system wide instance via PF_LOCAL */
         c->server_list = pa_strlist_prepend(c->server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET);
@@ -1492,7 +1475,6 @@
     struct timeval tv;
 
     pa_assert(c);
-    pa_assert(PA_REFCNT_VALUE(c) >= 1);
     pa_assert(c->mainloop);
 
     if (usec == PA_USEC_INVALID)
@@ -1507,10 +1489,8 @@
     struct timeval tv;
 
     pa_assert(c);
-    pa_assert(PA_REFCNT_VALUE(c) >= 1);
     pa_assert(c->mainloop);
 
-
     if (usec == PA_USEC_INVALID)
         c->mainloop->time_restart(e, NULL);
     else {
@@ -1518,17 +1498,3 @@
         c->mainloop->time_restart(e, &tv);
     }
 }
-
-size_t pa_context_get_tile_size(pa_context *c, const pa_sample_spec *ss) {
-    size_t fs, mbs;
-
-    pa_assert(c);
-    pa_assert(PA_REFCNT_VALUE(c) >= 1);
-
-    PA_CHECK_VALIDITY_RETURN_ANY(c, !pa_detect_fork(), PA_ERR_FORKED, (size_t) -1);
-    PA_CHECK_VALIDITY_RETURN_ANY(c, !ss || pa_sample_spec_valid(ss), PA_ERR_INVALID, (size_t) -1);
-
-    fs = ss ? pa_frame_size(ss) : 1;
-    mbs = PA_ROUND_DOWN(pa_mempool_block_size_max(c->mempool), fs);
-    return PA_MAX(mbs, fs);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/context.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/context.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/context.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/context.h	2010-01-15 23:21:18.000000000 +0000
@@ -255,28 +255,12 @@
 uint32_t pa_context_get_index(pa_context *s);
 
 /** Create a new timer event source for the specified time (wrapper
- * for mainloop->time_new). \since 0.9.16 */
+    for mainloop->time_new). \since 0.9.16 */
 pa_time_event* pa_context_rttime_new(pa_context *c, pa_usec_t usec, pa_time_event_cb_t cb, void *userdata);
-
-/** Restart a running or expired timer event source (wrapper for
- * mainloop->time_restart). \since 0.9.16 */
+/** Restart a running or expired timer event source (wrapper
+    for mainloop->time_restart). \since 0.9.16 */
 void pa_context_rttime_restart(pa_context *c, pa_time_event *e, pa_usec_t usec);
 
-/* Return the optimal block size for passing around audio buffers. It
- * is recommended to allocate buffers of the size returned here when
- * writing audio data to playback streams, if the latency constraints
- * permit this. It is not recommended writing larger blocks than this
- * because usually they will then be split up internally into chunks
- * of this size. It is not recommended writing smaller blocks than
- * this (unless required due to latency demands) because this
- * increases CPU usage. If ss is NULL you will be returned the
- * byte-exact tile size. If you pass a valid ss, then the tile size
- * will be rounded down to multiple of the frame size. This is
- * supposed to be used in a construct such as
- * pa_context_get_tile_size(pa_stream_get_context(s),
- * pa_stream_get_sample_spec(ss)); \since 0.9.20 */
-size_t pa_context_get_tile_size(pa_context *c, const pa_sample_spec *ss);
-
 PA_C_DECL_END
 
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/def.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/def.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/def.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/def.h	2010-01-15 23:21:18.000000000 +0000
@@ -63,7 +63,6 @@
 #define PA_CONTEXT_SETTING_NAME PA_CONTEXT_SETTING_NAME
 #define PA_CONTEXT_READY PA_CONTEXT_READY
 #define PA_CONTEXT_FAILED PA_CONTEXT_FAILED
-#define PA_CONTEXT_TERMINATED PA_CONTEXT_TERMINATED
 #define PA_CONTEXT_IS_GOOD PA_CONTEXT_IS_GOOD
 /** \endcond */
 
@@ -277,18 +276,11 @@
      * whether to create the stream in muted or in unmuted
      * state. \since 0.9.15 */
 
-    PA_STREAM_FAIL_ON_SUSPEND = 0x20000U,
+    PA_STREAM_FAIL_ON_SUSPEND = 0x20000U
     /**< If the sink/source this stream is connected to is suspended
      * during the creation of this stream, cause it to fail. If the
      * sink/source is being suspended during creation of this stream,
      * make sure this stream is terminated. \since 0.9.15 */
-
-    PA_STREAM_RELATIVE_VOLUME = 0x40000U,
-    /**< If a volume is passed when this stream is created, consider
-     * it relative to the sink's current volume, never as absolute
-     * device volume. If this is not specified the volume will be
-     * consider absolute when the sink is in flat volume mode,
-     * relative otherwise. \since 0.9.20 */
 } pa_stream_flags_t;
 
 /** \cond fulldocs */
@@ -315,7 +307,6 @@
 #define PA_STREAM_DONT_INHIBIT_AUTO_SUSPEND PA_STREAM_DONT_INHIBIT_AUTO_SUSPEND
 #define PA_STREAM_START_UNMUTED PA_STREAM_START_UNMUTED
 #define PA_STREAM_FAIL_ON_SUSPEND PA_STREAM_FAIL_ON_SUSPEND
-#define PA_STREAM_RELATIVE_VOLUME PA_STREAM_RELATIVE_VOLUME
 
 /** \endcond */
 
@@ -352,7 +343,7 @@
      * that may be. Initialize to 0 to enable manual start/stop
      * control of the stream. This means that playback will not stop
      * on underrun and playback will not start automatically. Instead
-     * pa_stream_cork() needs to be called explicitly. If you set
+     * pa_stream_corked() needs to be called explicitly. If you set
      * this value to 0 you should also set PA_STREAM_START_CORKED. */
 
     uint32_t minreq;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/internal.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/internal.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/internal.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/internal.h	2010-01-15 23:21:18.000000000 +0000
@@ -34,6 +34,7 @@
 #include <pulsecore/socket-client.h>
 #include <pulsecore/pstream.h>
 #include <pulsecore/pdispatch.h>
+#include <pulsecore/dynarray.h>
 #include <pulsecore/llist.h>
 #include <pulsecore/native-common.h>
 #include <pulsecore/strlist.h>
@@ -65,7 +66,7 @@
     pa_pstream *pstream;
     pa_pdispatch *pdispatch;
 
-    pa_hashmap *record_streams, *playback_streams;
+    pa_dynarray *record_streams, *playback_streams;
     PA_LLIST_HEAD(pa_stream, streams);
     PA_LLIST_HEAD(pa_operation, operations);
 
@@ -90,6 +91,7 @@
     pa_bool_t no_fail:1;
     pa_bool_t do_autospawn:1;
     pa_bool_t use_rtclock:1;
+    pa_bool_t filter_added:1;
     pa_spawn_api spawn_api;
 
     pa_strlist *server_list;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/introspect.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/introspect.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/introspect.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/introspect.h	2010-01-15 23:21:18.000000000 +0000
@@ -460,7 +460,7 @@
     pa_proplist *proplist;               /**< Property list */
 } pa_card_info;
 
-/** Callback prototype for pa_context_get_card_info_...() \since 0.9.15 */
+/** Callback prototype for pa_context_get_card_info() and friends \since 0.9.15 */
 typedef void (*pa_card_info_cb_t) (pa_context *c, const pa_card_info*i, int eol, void *userdata);
 
 /** Get information about a card by its index \since 0.9.15 */
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/mainloop.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/mainloop.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/mainloop.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/mainloop.c	2010-01-15 23:21:18.000000000 +0000
@@ -32,6 +32,12 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+#include <pulsecore/poll.h>
+#endif
+
 #ifndef HAVE_PIPE
 #include <pulsecore/pipe.h>
 #endif
@@ -41,7 +47,6 @@
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
 
-#include <pulsecore/poll.h>
 #include <pulsecore/core-rtclock.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/llist.h>
@@ -477,7 +482,7 @@
 
     m = pa_xnew0(pa_mainloop, 1);
 
-    if (pa_pipe_cloexec(m->wakeup_pipe) < 0) {
+    if (pipe(m->wakeup_pipe) < 0) {
         pa_log_error("ERROR: cannot create wakeup pipe");
         pa_xfree(m);
         return NULL;
@@ -485,6 +490,8 @@
 
     pa_make_fd_nonblock(m->wakeup_pipe[0]);
     pa_make_fd_nonblock(m->wakeup_pipe[1]);
+    pa_make_fd_cloexec(m->wakeup_pipe[0]);
+    pa_make_fd_cloexec(m->wakeup_pipe[1]);
 
     m->rebuild_pollfds = TRUE;
 
@@ -882,7 +889,7 @@
                     m->prepared_timeout == PA_USEC_INVALID ? NULL : pa_timespec_store(&ts, m->prepared_timeout),
                     NULL);
 #else
-            m->poll_func_ret = pa_poll(
+            m->poll_func_ret = poll(
                     m->pollfds, m->n_pollfds,
                     usec_to_timeout(m->prepared_timeout));
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/mainloop-signal.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/mainloop-signal.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/mainloop-signal.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/mainloop-signal.c	2010-01-15 23:21:18.000000000 +0000
@@ -124,13 +124,15 @@
     pa_assert(signal_pipe[1] == -1);
     pa_assert(!io_event);
 
-    if (pa_pipe_cloexec(signal_pipe) < 0) {
+    if (pipe(signal_pipe) < 0) {
         pa_log("pipe(): %s", pa_cstrerror(errno));
         return -1;
     }
 
     pa_make_fd_nonblock(signal_pipe[0]);
     pa_make_fd_nonblock(signal_pipe[1]);
+    pa_make_fd_cloexec(signal_pipe[0]);
+    pa_make_fd_cloexec(signal_pipe[1]);
 
     api = a;
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/proplist.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/proplist.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/proplist.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/proplist.c	2010-01-15 23:21:18.000000000 +0000
@@ -681,32 +681,3 @@
 
     return pa_hashmap_isempty(MAKE_HASHMAP(p));
 }
-
-int pa_proplist_equal(pa_proplist *a, pa_proplist *b) {
-    const void *key = NULL;
-    struct property *a_prop = NULL;
-    struct property *b_prop = NULL;
-    void *state = NULL;
-
-    pa_assert(a);
-    pa_assert(b);
-
-    if (a == b)
-        return 1;
-
-    if (pa_proplist_size(a) != pa_proplist_size(b))
-        return 0;
-
-    while ((a_prop = pa_hashmap_iterate(MAKE_HASHMAP(a), &state, &key))) {
-        if (!(b_prop = pa_hashmap_get(MAKE_HASHMAP(b), key)))
-            return 0;
-
-        if (a_prop->nbytes != b_prop->nbytes)
-            return 0;
-
-        if (memcmp(a_prop->value, b_prop->value, a_prop->nbytes) != 0)
-            return 0;
-    }
-
-    return 1;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/proplist.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/proplist.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/proplist.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/proplist.h	2010-01-15 23:21:18.000000000 +0000
@@ -325,7 +325,7 @@
  * specified key name. \since 0.9.11 */
 int pa_proplist_unset(pa_proplist *p, const char *key);
 
-/** Similar to pa_proplist_unset() but takes an array of keys to
+/** Similar to pa_proplist_remove() but takes an array of keys to
  * remove. The array should be terminated by a NULL pointer. Return -1
  * on failure, otherwise the number of entries actually removed (which
  * might even be 0, if there where no matching entries to
@@ -358,7 +358,7 @@
  * readable string. \since 0.9.15 */
 pa_proplist *pa_proplist_from_string(const char *str);
 
-/** Returns 1 if an entry for the specified key is existant in the
+  /** Returns 1 if an entry for the specified key is existant in the
  * property list. \since 0.9.11 */
 int pa_proplist_contains(pa_proplist *p, const char *key);
 
@@ -375,10 +375,6 @@
 /** Returns 0 when the proplist is empty, positive otherwise \since 0.9.15 */
 int pa_proplist_isempty(pa_proplist *t);
 
-/** Return non-zero when a and b have the same keys and values.
- * \since 0.9.16 */
-int pa_proplist_equal(pa_proplist *a, pa_proplist *b);
-
 PA_C_DECL_END
 
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/scache.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/scache.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/scache.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/scache.c	2010-01-15 23:21:18.000000000 +0000
@@ -28,15 +28,15 @@
 #include <string.h>
 
 #include <pulse/utf8.h>
+#include <pulse/scache.h>
 
 #include <pulsecore/pstream-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/proplist-util.h>
 
+#include "fork-detect.h"
 #include "internal.h"
 
-#include "scache.h"
-
 int pa_stream_connect_upload(pa_stream *s, size_t length) {
     pa_tagstruct *t;
     uint32_t tag;
@@ -45,9 +45,11 @@
     pa_assert(s);
     pa_assert(PA_REFCNT_VALUE(s) >= 1);
 
+    PA_CHECK_VALIDITY(s->context, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY(s->context, s->state == PA_STREAM_UNCONNECTED, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY(s->context, length > 0, PA_ERR_INVALID);
     PA_CHECK_VALIDITY(s->context, length == (size_t) (uint32_t) length, PA_ERR_INVALID);
+    PA_CHECK_VALIDITY(s->context, s->context->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
 
     if (!(name = pa_proplist_gets(s->proplist, PA_PROP_EVENT_ID)))
         name = pa_proplist_gets(s->proplist, PA_PROP_MEDIA_NAME);
@@ -85,6 +87,7 @@
     pa_assert(s);
     pa_assert(PA_REFCNT_VALUE(s) >= 1);
 
+    PA_CHECK_VALIDITY(s->context, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY(s->context, s->channel_valid, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY(s->context, s->context->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
 
@@ -174,6 +177,7 @@
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
 
+    PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
     PA_CHECK_VALIDITY_RETURN_NULL(c, !dev || *dev, PA_ERR_INVALID);
@@ -213,6 +217,7 @@
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
 
+    PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
     PA_CHECK_VALIDITY_RETURN_NULL(c, !dev || *dev, PA_ERR_INVALID);
@@ -255,6 +260,7 @@
     pa_assert(c);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
 
+    PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/simple.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/simple.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/simple.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/simple.h	2010-01-15 23:21:18.000000000 +0000
@@ -82,8 +82,8 @@
  *
  * \li pa_simple_drain() - Will wait for all sent data to finish playing.
  * \li pa_simple_flush() - Will throw away all data currently in buffers.
- * \li pa_simple_get_latency() - Will return the total latency of
- *                               the playback pipeline.
+ * \li pa_simple_get_playback_latency() - Will return the total latency of
+ *                                        the playback pipeline.
  *
  * \section cleanup_sec Cleanup
  *
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/stream.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/stream.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/stream.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/stream.c	2010-01-15 23:21:18.000000000 +0000
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include <pulse/def.h>
+#include <pulse/stream.h>
 #include <pulse/timeval.h>
 #include <pulse/rtclock.h>
 #include <pulse/xmalloc.h>
@@ -38,6 +39,7 @@
 #include <pulsecore/hashmap.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-rtclock.h>
+#include <pulsecore/core-util.h>
 
 #include "fork-detect.h"
 #include "internal.h"
@@ -199,7 +201,7 @@
         pa_pdispatch_unregister_reply(s->context->pdispatch, s);
 
     if (s->channel_valid) {
-        pa_hashmap_remove((s->direction == PA_STREAM_PLAYBACK) ? s->context->playback_streams : s->context->record_streams, PA_UINT32_TO_PTR(s->channel));
+        pa_dynarray_put((s->direction == PA_STREAM_PLAYBACK) ? s->context->playback_streams : s->context->record_streams, s->channel, NULL);
         s->channel = 0;
         s->channel_valid = FALSE;
     }
@@ -354,7 +356,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(command == PA_COMMAND_PLAYBACK_STREAM_KILLED ? c->playback_streams : c->record_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(command == PA_COMMAND_PLAYBACK_STREAM_KILLED ? c->playback_streams : c->record_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -474,7 +476,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(command == PA_COMMAND_PLAYBACK_STREAM_MOVED ? c->playback_streams : c->record_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(command == PA_COMMAND_PLAYBACK_STREAM_MOVED ? c->playback_streams : c->record_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -557,7 +559,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(command == PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED ? c->playback_streams : c->record_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(command == PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED ? c->playback_streams : c->record_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -609,7 +611,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(command == PA_COMMAND_PLAYBACK_STREAM_SUSPENDED ? c->playback_streams : c->record_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(command == PA_COMMAND_PLAYBACK_STREAM_SUSPENDED ? c->playback_streams : c->record_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -651,7 +653,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(c->playback_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(c->playback_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -697,7 +699,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(command == PA_COMMAND_PLAYBACK_STREAM_EVENT ? c->playback_streams : c->record_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(command == PA_COMMAND_PLAYBACK_STREAM_EVENT ? c->playback_streams : c->record_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -733,7 +735,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(c->playback_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(c->playback_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -741,6 +743,8 @@
 
     s->requested_bytes += bytes;
 
+    /* pa_log("got request for %lli, now at %lli", (long long) bytes, (long long) s->requested_bytes); */
+
     if (s->requested_bytes > 0 && s->write_callback)
         s->write_callback(s, (size_t) s->requested_bytes, s->write_userdata);
 
@@ -767,7 +771,7 @@
         goto finish;
     }
 
-    if (!(s = pa_hashmap_get(c->playback_streams, PA_UINT32_TO_PTR(channel))))
+    if (!(s = pa_dynarray_get(c->playback_streams, channel)))
         goto finish;
 
     if (s->state != PA_STREAM_READY)
@@ -852,10 +856,28 @@
     check_smoother_status(s, TRUE, FALSE, FALSE);
 }
 
-static void automatic_buffer_attr(pa_stream *s, pa_buffer_attr *attr, const pa_sample_spec *ss) {
+static void patch_buffer_attr(pa_stream *s, pa_buffer_attr *attr, pa_stream_flags_t *flags) {
+    const char *e;
+
     pa_assert(s);
     pa_assert(attr);
-    pa_assert(ss);
+
+    if ((e = getenv("PULSE_LATENCY_MSEC"))) {
+        uint32_t ms;
+
+        if (pa_atou(e, &ms) < 0 || ms <= 0)
+            pa_log_debug("Failed to parse $PULSE_LATENCY_MSEC: %s", e);
+        else {
+            attr->maxlength = (uint32_t) -1;
+            attr->tlength = pa_usec_to_bytes(ms * PA_USEC_PER_MSEC, &s->sample_spec);
+            attr->minreq = (uint32_t) -1;
+            attr->prebuf = (uint32_t) -1;
+            attr->fragsize = attr->tlength;
+        }
+
+        if (flags)
+            *flags |= PA_STREAM_ADJUST_LATENCY;
+    }
 
     if (s->context->version >= 13)
         return;
@@ -870,7 +892,7 @@
         attr->maxlength = 4*1024*1024; /* 4MB is the maximum queue length PulseAudio <= 0.9.9 supported. */
 
     if (attr->tlength == (uint32_t) -1)
-        attr->tlength = (uint32_t) pa_usec_to_bytes(250*PA_USEC_PER_MSEC, ss); /* 250ms of buffering */
+        attr->tlength = (uint32_t) pa_usec_to_bytes(250*PA_USEC_PER_MSEC, &s->sample_spec); /* 250ms of buffering */
 
     if (attr->minreq == (uint32_t) -1)
         attr->minreq = (attr->tlength)/5; /* Ask for more data when there are only 200ms left in the playback buffer */
@@ -997,7 +1019,7 @@
     }
 
     s->channel_valid = TRUE;
-    pa_hashmap_put((s->direction == PA_STREAM_RECORD) ? s->context->record_streams : s->context->playback_streams, PA_UINT32_TO_PTR(s->channel), s);
+    pa_dynarray_put((s->direction == PA_STREAM_RECORD) ? s->context->record_streams : s->context->playback_streams, s->channel, s);
 
     create_stream_complete(s);
 
@@ -1042,8 +1064,7 @@
                                               PA_STREAM_EARLY_REQUESTS|
                                               PA_STREAM_DONT_INHIBIT_AUTO_SUSPEND|
                                               PA_STREAM_START_UNMUTED|
-                                              PA_STREAM_FAIL_ON_SUSPEND|
-                                              PA_STREAM_RELATIVE_VOLUME)), PA_ERR_INVALID);
+                                              PA_STREAM_FAIL_ON_SUSPEND)), PA_ERR_INVALID);
 
     PA_CHECK_VALIDITY(s->context, s->context->version >= 12 || !(flags & PA_STREAM_VARIABLE_RATE), PA_ERR_NOTSUPPORTED);
     PA_CHECK_VALIDITY(s->context, s->context->version >= 13 || !(flags & PA_STREAM_PEAK_DETECT), PA_ERR_NOTSUPPORTED);
@@ -1062,15 +1083,16 @@
     pa_stream_ref(s);
 
     s->direction = direction;
-    s->flags = flags;
-    s->corked = !!(flags & PA_STREAM_START_CORKED);
 
     if (sync_stream)
         s->syncid = sync_stream->syncid;
 
     if (attr)
         s->buffer_attr = *attr;
-    automatic_buffer_attr(s, &s->buffer_attr, &s->sample_spec);
+    patch_buffer_attr(s, &s->buffer_attr, &flags);
+
+    s->flags = flags;
+    s->corked = !!(flags & PA_STREAM_START_CORKED);
 
     if (flags & PA_STREAM_INTERPOLATE_TIMING) {
         pa_usec_t x;
@@ -1176,13 +1198,6 @@
         pa_tagstruct_put_boolean(t, flags & PA_STREAM_FAIL_ON_SUSPEND);
     }
 
-    if (s->context->version >= 17) {
-
-        if (s->direction == PA_STREAM_PLAYBACK)
-            pa_tagstruct_put_boolean(t, flags & PA_STREAM_RELATIVE_VOLUME);
-
-    }
-
     pa_pstream_send_tagstruct(s->context->pstream, t);
     pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, pa_create_stream_callback, s, NULL);
 
@@ -1362,6 +1377,8 @@
      * that's OK, the server side applies the same error */
     s->requested_bytes -= (seek == PA_SEEK_RELATIVE ? offset : 0) + (int64_t) length;
 
+    /* pa_log("wrote %lli, now at %lli", (long long) length, (long long) s->requested_bytes); */
+
     if (s->direction == PA_STREAM_PLAYBACK) {
 
         /* Update latency request correction */
@@ -2415,6 +2432,7 @@
     pa_operation *o;
     pa_tagstruct *t;
     uint32_t tag;
+    pa_buffer_attr copy;
 
     pa_assert(s);
     pa_assert(PA_REFCNT_VALUE(s) >= 1);
@@ -2438,6 +2456,10 @@
             &tag);
     pa_tagstruct_putu32(t, s->channel);
 
+    copy = *attr;
+    patch_buffer_attr(s, &copy, NULL);
+    attr = &copy;
+
     pa_tagstruct_putu32(t, attr->maxlength);
 
     if (s->direction == PA_STREAM_PLAYBACK)
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/stream.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/stream.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/stream.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/stream.h	2010-01-15 23:21:18.000000000 +0000
@@ -289,7 +289,7 @@
  * issued on the others.
  *
  * To synchronize a stream to another, just pass the "master" stream
- * as last argument to pa_stream_connect_playback(). To make sure that
+ * as last argument to pa_stream_connect_playack(). To make sure that
  * the freshly created stream doesn't start playback right-away, make
  * sure to pass PA_STREAM_START_CORKED and - after all streams have
  * been created - uncork them all with a single call to
@@ -716,7 +716,7 @@
 
 /** Change the stream sampling rate during playback. You need to pass
  * PA_STREAM_VARIABLE_RATE in the flags parameter of
- * pa_stream_connect_...() if you plan to use this function. Only valid
+ * pa_stream_connect() if you plan to use this function. Only valid
  * after the stream has been connected successfully and if the server
  * is at least PulseAudio 0.9.8. \since 0.9.8 */
 pa_operation *pa_stream_update_sample_rate(pa_stream *s, uint32_t rate, pa_stream_success_cb_t cb, void *userdata);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/thread-mainloop.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/thread-mainloop.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/thread-mainloop.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/thread-mainloop.c	2010-01-15 23:21:18.000000000 +0000
@@ -116,7 +116,6 @@
     pa_mainloop_set_poll_func(m->real_mainloop, poll_func, m->mutex);
 
     m->n_waiting = 0;
-    m->n_waiting_for_accept = 0;
 
     return m;
 }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/util.c	2010-01-15 23:21:18.000000000 +0000
@@ -189,18 +189,7 @@
             return s;
         }
     }
-#endif
-
-#ifdef __FreeBSD__
-    {
-        char *rp;
 
-	if ((rp = pa_readlink("/proc/curproc/file"))) {
-	    pa_strlcpy(s, pa_path_get_filename(rp), l);
-	    pa_xfree(rp);
-	    return s;
-	}
-    }
 #endif
 
 #if defined(HAVE_SYS_PRCTL_H) && defined(PR_GET_NAME)
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/volume.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/volume.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/volume.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/volume.c	2010-01-15 23:21:18.000000000 +0000
@@ -885,7 +885,7 @@
     return dest;
 }
 
-pa_cvolume* pa_cvolume_inc_clamp(pa_cvolume *v, pa_volume_t inc, pa_volume_t limit) {
+pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc) {
     pa_volume_t m;
 
     pa_assert(v);
@@ -895,18 +895,14 @@
 
     m = pa_cvolume_max(v);
 
-    if (m >= limit - inc)
-        m = limit;
+    if (m >= PA_VOLUME_MAX - inc)
+        m = PA_VOLUME_MAX;
     else
         m += inc;
 
     return pa_cvolume_scale(v, m);
 }
 
-pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc){
-    return pa_cvolume_inc_clamp(v, inc, PA_VOLUME_MAX);
-}
-
 pa_cvolume* pa_cvolume_dec(pa_cvolume *v, pa_volume_t dec) {
     pa_volume_t m;
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/volume.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/volume.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulse/volume.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulse/volume.h	2010-01-15 23:21:18.000000000 +0000
@@ -149,7 +149,7 @@
 char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c);
 
 /** Maximum length of the strings returned by
- * pa_sw_cvolume_snprint_dB(). Please note that this value can change with
+ * pa_cvolume_snprint_dB(). Please note that this value can change with
  * any release without warning and without being considered API or ABI
  * breakage. You should not use this definition anywhere where it
  * might become part of an ABI. \since 0.9.13 */
@@ -169,7 +169,7 @@
 char *pa_volume_snprint(char *s, size_t l, pa_volume_t v);
 
 /** Maximum length of the strings returned by
- * pa_sw_volume_snprint_dB(). Please note that this value can change with
+ * pa_volume_snprint_dB(). Please note that this value can change with
  * any release without warning and without being considered API or ABI
  * breakage. You should not use this definition anywhere where it
  * might become part of an ABI. \since 0.9.15 */
@@ -268,7 +268,7 @@
 #ifdef INFINITY
 #define PA_DECIBEL_MININFTY ((double) -INFINITY)
 #else
-/** This floor value is used as minus infinity when using pa_sw_volume_to_dB() / pa_sw_volume_from_dB(). */
+/** This floor value is used as minus infinity when using pa_volume_{to,from}_dB(). */
 #define PA_DECIBEL_MININFTY ((double) -200.0)
 #endif
 
@@ -348,10 +348,6 @@
  * and dest may point to the same structure. \since 0.9.16 */
 pa_cvolume* pa_cvolume_merge(pa_cvolume *dest, const pa_cvolume *a, const pa_cvolume *b);
 
-/** Increase the volume passed in by 'inc', but not exceeding 'limit'.
- * The proportions between the channels are kept. \since 0.9.19 */
-pa_cvolume* pa_cvolume_inc_clamp(pa_cvolume *v, pa_volume_t inc, pa_volume_t limit);
-
 /** Increase the volume passed in by 'inc'. The proportions between
  * the channels are kept. \since 0.9.16 */
 pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/asyncq.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/asyncq.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/asyncq.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/asyncq.h	2010-01-15 23:21:18.000000000 +0000
@@ -48,9 +48,8 @@
 void* pa_asyncq_pop(pa_asyncq *q, pa_bool_t wait);
 int pa_asyncq_push(pa_asyncq *q, void *p, pa_bool_t wait);
 
-/* Similar to pa_asyncq_push(), but if the queue is full, postpone the
- * appending of the item locally and delay until
- * pa_asyncq_before_poll_post() is called. */
+/* Similar to pa_asyncq_push(), but if the queue is full, postpone it
+ * locally and delay until pa_asyncq_before_poll_post() */
 void pa_asyncq_post(pa_asyncq*l, void *p);
 
 /* For the reading side */
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/atomic.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/atomic.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/atomic.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/atomic.h	2010-01-15 23:21:19.000000000 +0000
@@ -180,110 +180,6 @@
     return r == old_p;
 }
 
-#elif defined(__FreeBSD__)
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <machine/atomic.h>
-
-#if __FreeBSD_version < 600000
-#if defined(__i386__) || defined(__amd64__)
-#if defined(__amd64__)
-#define atomic_load_acq_64      atomic_load_acq_long
-#endif
-static inline u_int atomic_fetchadd_int(volatile u_int *p, u_int v) {
-    __asm __volatile(
-            "   " __XSTRING(MPLOCKED) "         "
-            "   xaddl   %0, %1 ;        "
-            "# atomic_fetchadd_int"
-            : "+r" (v),
-            "=m" (*p)
-            : "m" (*p));
-
-    return (v);
-}
-#elif defined(__sparc64__)
-#define atomic_load_acq_64      atomic_load_acq_long
-#define atomic_fetchadd_int     atomic_add_int
-#elif defined(__ia64__)
-#define atomic_load_acq_64      atomic_load_acq_long
-static inline uint32_t
-atomic_fetchadd_int(volatile uint32_t *p, uint32_t v) {
-    uint32_t value;
-
-    do {
-        value = *p;
-    } while (!atomic_cmpset_32(p, value, value + v));
-    return (value);
-}
-#endif
-#endif
-
-typedef struct pa_atomic {
-    volatile unsigned long value;
-} pa_atomic_t;
-
-#define PA_ATOMIC_INIT(v) { .value = (v) }
-
-static inline int pa_atomic_load(const pa_atomic_t *a) {
-    return (int) atomic_load_acq_int((unsigned int *) &a->value);
-}
-
-static inline void pa_atomic_store(pa_atomic_t *a, int i) {
-    atomic_store_rel_int((unsigned int *) &a->value, i);
-}
-
-static inline int pa_atomic_add(pa_atomic_t *a, int i) {
-    return atomic_fetchadd_int((unsigned int *) &a->value, i);
-}
-
-static inline int pa_atomic_sub(pa_atomic_t *a, int i) {
-    return atomic_fetchadd_int((unsigned int *) &a->value, -(i));
-}
-
-static inline int pa_atomic_inc(pa_atomic_t *a) {
-    return atomic_fetchadd_int((unsigned int *) &a->value, 1);
-}
-
-static inline int pa_atomic_dec(pa_atomic_t *a) {
-    return atomic_fetchadd_int((unsigned int *) &a->value, -1);
-}
-
-static inline int pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i) {
-    return atomic_cmpset_int((unsigned int *) &a->value, old_i, new_i);
-}
-
-typedef struct pa_atomic_ptr {
-    volatile unsigned long value;
-} pa_atomic_ptr_t;
-
-#define PA_ATOMIC_PTR_INIT(v) { .value = (unsigned long) (v) }
-
-static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
-#ifdef atomic_load_acq_64
-    return (void*) atomic_load_acq_ptr((unsigned long *) &a->value);
-#else
-    return (void*) atomic_load_acq_ptr((unsigned int *) &a->value);
-#endif
-}
-
-static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
-#ifdef atomic_load_acq_64
-    atomic_store_rel_ptr(&a->value, (unsigned long) p);
-#else
-    atomic_store_rel_ptr((unsigned int *) &a->value, (unsigned int) p);
-#endif
-}
-
-static inline int pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* new_p) {
-#ifdef atomic_load_acq_64
-    return atomic_cmpset_ptr(&a->value, (unsigned long) old_p, (unsigned long) new_p);
-#else
-    return atomic_cmpset_ptr((unsigned int *) &a->value, (unsigned int) old_p, (unsigned int) new_p);
-#endif
-}
-
 #elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
 
 #warn "The native atomic operations implementation for AMD64 has not been tested thoroughly. libatomic_ops is known to not work properly on AMD64 and your gcc version is too old for the gcc-builtin atomic ops support. You have three options now: test the native atomic operations implementation for AMD64, fix libatomic_ops, or upgrade your GCC."
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/aupdate.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/aupdate.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/aupdate.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/aupdate.h	2010-01-15 23:21:19.000000000 +0000
@@ -39,7 +39,7 @@
 
 /* Will return 0, or 1, depending which copy of the data the caller
  * should modify. Each time called this will return the opposite of
- * the previous pa_aupdate_write_begin() / pa_aupdate_write_swap()
+ * the previous pa_aupdate_write_begin()/pa_aupdate_write_swap()
  * call. Should only be called between pa_aupdate_write_begin() and
  * pa_aupdate_write_end() */
 unsigned pa_aupdate_write_swap(pa_aupdate *a);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/authkey.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/authkey.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/authkey.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/authkey.c	2010-01-15 23:21:19.000000000 +0000
@@ -70,6 +70,10 @@
 #define O_BINARY 0
 #endif
 
+#ifndef O_NOCTTY
+#define O_NOCTTY 0
+#endif
+
 /* Load an euthorization cookie from file fn and store it in data. If
  * the cookie file doesn't exist, create it */
 static int load(const char *fn, void *data, size_t length) {
@@ -82,9 +86,9 @@
     pa_assert(data);
     pa_assert(length > 0);
 
-    if ((fd = pa_open_cloexec(fn, O_RDWR|O_CREAT|O_BINARY, S_IRUSR|S_IWUSR)) < 0) {
+    if ((fd = open(fn, O_RDWR|O_CREAT|O_BINARY|O_NOCTTY, S_IRUSR|S_IWUSR)) < 0) {
 
-        if (errno != EACCES || (fd = open(fn, O_RDONLY|O_BINARY)) < 0) {
+        if (errno != EACCES || (fd = open(fn, O_RDONLY|O_BINARY|O_NOCTTY)) < 0) {
             pa_log_warn("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
             goto finish;
         } else
@@ -200,7 +204,7 @@
     if (!(p = normalize_path(fn)))
         return -2;
 
-    if ((fd = pa_open_cloexec(p, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
+    if ((fd = open(p, O_RDWR|O_CREAT|O_NOCTTY, S_IRUSR|S_IWUSR)) < 0) {
         pa_log_warn("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
         goto finish;
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cli-command.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cli-command.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cli-command.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cli-command.c	2010-01-15 23:21:19.000000000 +0000
@@ -1804,7 +1804,7 @@
     if (!fail)
         fail = &_fail;
 
-    if (!(f = pa_fopen_cloexec(fn, "r"))) {
+    if (!(f = fopen(fn, "r"))) {
         pa_strbuf_printf(buf, "open('%s') failed: %s\n", fn, pa_cstrerror(errno));
         if (!*fail)
             ret = 0;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/conf-parser.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/conf-parser.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/conf-parser.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/conf-parser.c	2010-01-15 23:21:19.000000000 +0000
@@ -168,7 +168,7 @@
     pa_assert(filename);
     pa_assert(t);
 
-    if (!f && !(f = pa_fopen_cloexec(filename, "r"))) {
+    if (!f && !(f = fopen(filename, "r"))) {
         if (errno == ENOENT) {
             pa_log_debug("Failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
             r = 0;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core.h	2010-01-15 23:21:19.000000000 +0000
@@ -52,13 +52,6 @@
 #include <pulsecore/sink-input.h>
 #include <pulsecore/msgobject.h>
 
-typedef enum pa_server_type {
-    PA_SERVER_TYPE_UNSET,
-    PA_SERVER_TYPE_USER,
-    PA_SERVER_TYPE_SYSTEM,
-    PA_SERVER_TYPE_NONE
-} pa_server_type_t;
-
 typedef enum pa_core_state {
     PA_CORE_STARTUP,
     PA_CORE_RUNNING,
@@ -168,8 +161,6 @@
     pa_resample_method_t resample_method;
     int realtime_priority;
 
-    pa_server_type_t server_type;
-
     /* hooks */
     pa_hook hooks[PA_CORE_HOOK_MAX];
 };
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core-rtclock.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core-rtclock.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core-rtclock.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core-rtclock.c	2010-01-15 23:21:19.000000000 +0000
@@ -33,13 +33,6 @@
 #include <sys/prctl.h>
 #endif
 
-#ifdef OS_IS_DARWIN
-#include <CoreServices/CoreServices.h>
-#include <mach/mach.h>
-#include <mach/mach_time.h>
-#include <unistd.h>
-#endif
-
 #include <pulse/timeval.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-error.h>
@@ -54,20 +47,7 @@
 }
 
 struct timeval *pa_rtclock_get(struct timeval *tv) {
-
-#if defined(OS_IS_DARWIN)
-    uint64_t val, abs_time = mach_absolute_time();
-    Nanoseconds nanos;
-
-    nanos = AbsoluteToNanoseconds(*(AbsoluteTime *) &abs_time);
-    val = *(uint64_t *) &nanos;
-
-    tv->tv_sec = val / PA_NSEC_PER_SEC;
-    tv->tv_usec = (val % PA_NSEC_PER_SEC) / PA_NSEC_PER_USEC;
-
-    return tv;
-
-#elif defined(HAVE_CLOCK_GETTIME)
+#ifdef HAVE_CLOCK_GETTIME
     struct timespec ts;
 
 #ifdef CLOCK_MONOTONIC
@@ -79,7 +59,7 @@
             no_monotonic = TRUE;
 
     if (no_monotonic)
-#endif /* CLOCK_MONOTONIC */
+#endif
         pa_assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
 
     pa_assert(tv);
@@ -88,45 +68,36 @@
     tv->tv_usec = ts.tv_nsec / PA_NSEC_PER_USEC;
 
     return tv;
-#endif /* HAVE_CLOCK_GETTIME */
+
+#else /* HAVE_CLOCK_GETTIME */
 
     return pa_gettimeofday(tv);
+
+#endif
 }
 
 pa_bool_t pa_rtclock_hrtimer(void) {
-
-#if defined (OS_IS_DARWIN)
-    mach_timebase_info_data_t tbi;
-    uint64_t time_nsec;
-
-    mach_timebase_info(&tbi);
-
-    /* nsec = nticks * (N/D) - we want 1 tick == resolution !? */
-    time_nsec = tbi.numer / tbi.denom;
-    return time_nsec <= (long) (PA_HRTIMER_THRESHOLD_USEC*PA_NSEC_PER_USEC);
-
-#elif defined(HAVE_CLOCK_GETTIME)
+#ifdef HAVE_CLOCK_GETTIME
     struct timespec ts;
 
 #ifdef CLOCK_MONOTONIC
-
     if (clock_getres(CLOCK_MONOTONIC, &ts) >= 0)
         return ts.tv_sec == 0 && ts.tv_nsec <= (long) (PA_HRTIMER_THRESHOLD_USEC*PA_NSEC_PER_USEC);
-
-#endif /* CLOCK_MONOTONIC */
+#endif
 
     pa_assert_se(clock_getres(CLOCK_REALTIME, &ts) == 0);
     return ts.tv_sec == 0 && ts.tv_nsec <= (long) (PA_HRTIMER_THRESHOLD_USEC*PA_NSEC_PER_USEC);
 
-#endif /* HAVE_CLOCK_GETTIME */
+#else /* HAVE_CLOCK_GETTIME */
 
     return FALSE;
+
+#endif
 }
 
 #define TIMER_SLACK_NS (int) ((500 * PA_NSEC_PER_USEC))
 
 void pa_rtclock_hrtimer_enable(void) {
-
 #ifdef PR_SET_TIMERSLACK
     int slack_ns;
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core-util.c	2010-01-15 23:21:19.000000000 +0000
@@ -580,8 +580,8 @@
 
 static int set_scheduler(int rtprio) {
     struct sched_param sp;
-#ifdef HAVE_DBUS
     int r;
+#ifdef HAVE_DBUS
     DBusError error;
     DBusConnection *bus;
 
@@ -628,7 +628,7 @@
 
     errno = -r;
 #else
-    errno = 0;
+    errno = r;
 #endif
 
     return -1;
@@ -1201,7 +1201,10 @@
     for (;;) {
         struct stat st;
 
-        if ((fd = pa_open_cloexec(fn, O_CREAT|O_RDWR
+        if ((fd = open(fn, O_CREAT|O_RDWR
+#ifdef O_NOCTTY
+                       |O_NOCTTY
+#endif
 #ifdef O_NOFOLLOW
                        |O_NOFOLLOW
 #endif
@@ -1601,7 +1604,7 @@
         fn = buf;
 #endif
 
-        if ((f = pa_fopen_cloexec(fn, "r"))) {
+        if ((f = fopen(fn, "r"))) {
             if (result)
                 *result = pa_xstrdup(fn);
 
@@ -1635,7 +1638,7 @@
         fn = buf;
 #endif
 
-        if ((f = pa_fopen_cloexec(fn, "r"))) {
+        if ((f = fopen(fn, "r"))) {
             if (result)
                 *result = pa_xstrdup(fn);
 
@@ -1662,7 +1665,7 @@
         global = buf;
 #endif
 
-        if ((f = pa_fopen_cloexec(global, "r"))) {
+        if ((f = fopen(global, "r"))) {
 
             if (result)
                 *result = pa_xstrdup(global);
@@ -2561,7 +2564,7 @@
      * since it fits perfectly our needs and is not as volatile as the
      * hostname which might be set from dhcp. */
 
-    if ((f = pa_fopen_cloexec(PA_MACHINE_ID, "r"))) {
+    if ((f = fopen(PA_MACHINE_ID, "r"))) {
         char ln[34] = "", *r;
 
         r = fgets(ln, sizeof(ln)-1, f);
@@ -2676,28 +2679,6 @@
     return pa_strbuf_tostring_free(sb);
 }
 
-char *pa_escape(const char *p, const char *chars) {
-    const char *s;
-    const char *c;
-    pa_strbuf *buf = pa_strbuf_new();
-
-    for (s = p; *s; ++s) {
-        if (*s == '\\')
-            pa_strbuf_putc(buf, '\\');
-        else if (chars) {
-            for (c = chars; *c; ++c) {
-                if (*s == *c) {
-                    pa_strbuf_putc(buf, '\\');
-                    break;
-                }
-            }
-        }
-        pa_strbuf_putc(buf, *s);
-    }
-
-    return pa_strbuf_tostring_free(buf);
-}
-
 char *pa_unescape(char *p) {
     char *s, *d;
     pa_bool_t escaped = FALSE;
@@ -2888,142 +2869,11 @@
     return "/tmp";
 }
 
-int pa_open_cloexec(const char *fn, int flags, mode_t mode) {
-    int fd;
-
-#ifdef O_NOCTTY
-    flags |= O_NOCTTY;
-#endif
-
-#ifdef O_CLOEXEC
-    if ((fd = open(fn, flags|O_CLOEXEC, mode)) >= 0)
-        goto finish;
-
-    if (errno != EINVAL)
-        return fd;
-#endif
-
-    if ((fd = open(fn, flags, mode)) < 0)
-        return fd;
-
-finish:
-    /* Some implementations might simply ignore O_CLOEXEC if it is not
-     * understood, make sure FD_CLOEXEC is enabled anyway */
-
-    pa_make_fd_cloexec(fd);
-    return fd;
-}
-
-int pa_socket_cloexec(int domain, int type, int protocol) {
-    int fd;
-
-#ifdef SOCK_CLOEXEC
-    if ((fd = socket(domain, type | SOCK_CLOEXEC, protocol)) >= 0)
-        goto finish;
-
-    if (errno != EINVAL)
-        return fd;
-#endif
-
-    if ((fd = socket(domain, type, protocol)) < 0)
-        return fd;
-
-finish:
-    /* Some implementations might simply ignore SOCK_CLOEXEC if it is
-     * not understood, make sure FD_CLOEXEC is enabled anyway */
-
-    pa_make_fd_cloexec(fd);
-    return fd;
-}
-
-int pa_pipe_cloexec(int pipefd[2]) {
-    int r;
-
-#ifdef HAVE_PIPE2
-    if ((r = pipe2(pipefd, O_CLOEXEC)) >= 0)
-        goto finish;
-
-    if (errno != EINVAL && errno != ENOSYS)
-        return r;
-
-#endif
-
-    if ((r = pipe(pipefd)) < 0)
-        return r;
-
-finish:
-    pa_make_fd_cloexec(pipefd[0]);
-    pa_make_fd_cloexec(pipefd[1]);
-
-    return 0;
-}
-
-int pa_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
-    int fd;
-
-#ifdef HAVE_ACCEPT4
-    if ((fd = accept4(sockfd, addr, addrlen, SOCK_CLOEXEC)) >= 0)
-        goto finish;
-
-    if (errno != EINVAL && errno != ENOSYS)
-        return fd;
-
-#endif
-
-    if ((fd = accept(sockfd, addr, addrlen)) < 0)
-        return fd;
-
-finish:
-    pa_make_fd_cloexec(fd);
-    return fd;
-}
-
-FILE* pa_fopen_cloexec(const char *path, const char *mode) {
-    FILE *f;
-    char *m;
-
-    m = pa_sprintf_malloc("%se", mode);
-
-    errno = 0;
-    if ((f = fopen(path, m))) {
-        pa_xfree(m);
-        goto finish;
-    }
-
-    pa_xfree(m);
-
-    if (errno != EINVAL)
-        return NULL;
-
-    if (!(f = fopen(path, mode)))
-        return NULL;
-
-finish:
-    pa_make_fd_cloexec(fileno(f));
-    return f;
-}
-
-void pa_nullify_stdfds(void) {
-
-#ifndef OS_IS_WIN32
-        pa_close(STDIN_FILENO);
-        pa_close(STDOUT_FILENO);
-        pa_close(STDERR_FILENO);
-
-        pa_assert_se(open("/dev/null", O_RDONLY) == STDIN_FILENO);
-        pa_assert_se(open("/dev/null", O_WRONLY) == STDOUT_FILENO);
-        pa_assert_se(open("/dev/null", O_WRONLY) == STDERR_FILENO);
-#else
-        FreeConsole();
-#endif
-
-}
-
 char *pa_read_line_from_file(const char *fn) {
     FILE *f;
     char ln[256] = "", *r;
 
-    if (!(f = pa_fopen_cloexec(fn, "r")))
+    if (!(f = fopen(fn, "r")))
         return NULL;
 
     r = fgets(ln, sizeof(ln)-1, f);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core-util.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core-util.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/core-util.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/core-util.h	2010-01-15 23:21:19.000000000 +0000
@@ -28,7 +28,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
@@ -225,13 +224,6 @@
 
 char *pa_replace(const char*s, const char*a, const char *b);
 
-/* Escapes p by inserting backslashes in front of backslashes. chars is a
- * regular (ie. NULL-terminated) string containing additional characters that
- * should be escaped. chars can be NULL. The caller has to free the returned
- * string. */
-char *pa_escape(const char *p, const char *chars);
-
-/* Does regular backslash unescaping. Returns the argument p. */
 char *pa_unescape(char *p);
 
 char *pa_realpath(const char *path);
@@ -259,14 +251,6 @@
 
 const char *pa_get_temp_dir(void);
 
-int pa_open_cloexec(const char *fn, int flags, mode_t mode);
-int pa_socket_cloexec(int domain, int type, int protocol);
-int pa_pipe_cloexec(int pipefd[2]);
-int pa_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
-FILE* pa_fopen_cloexec(const char *path, const char *mode);
-
-void pa_nullify_stdfds(void);
-
 char *pa_read_line_from_file(const char *fn);
 pa_bool_t pa_running_in_vm(void);
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-arm.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-arm.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-arm.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-arm.c	2010-01-15 23:21:19.000000000 +0000
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 
 #include <pulse/xmalloc.h>
-#include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 
 #include "cpu-arm.h"
@@ -63,12 +62,12 @@
 
     cpuinfo = pa_xmalloc(MAX_BUFFER);
 
-    if ((fd = pa_open_cloexec("/proc/cpuinfo", O_RDONLY, 0)) < 0) {
+    if ((fd = open("/proc/cpuinfo", O_RDONLY)) < 0) {
         pa_xfree(cpuinfo);
         return NULL;
     }
 
-    if ((n = pa_read(fd, cpuinfo, MAX_BUFFER-1, NULL)) < 0) {
+    if ((n = pa_read(fd, cpuinfo, MAX_BUFFER-1)) < 0) {
         pa_xfree(cpuinfo);
         pa_close(fd);
         return NULL;
@@ -106,8 +105,7 @@
     }
     /* get the CPU features */
     if ((line = get_cpuinfo_line (cpuinfo, "Features"))) {
-        const char *state = NULL;
-        char *current;
+        char *state = NULL, *current;
 
         while ((current = pa_split_spaces (line, &state))) {
             if (!strcmp (current, "vfp"))
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-arm.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-arm.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-arm.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-arm.h	2010-01-15 23:21:19.000000000 +0000
@@ -5,7 +5,7 @@
   This file is part of PulseAudio.
 
   Copyright 2004-2006 Lennart Poettering
-  Copyright 2009 Wim Taymans <wim.taymans@collabora.co.uk>
+  Copyright 2009 Wim Taymans <wim.taymans@collabora.co.uk> 
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-x86.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-x86.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-x86.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-x86.c	2010-01-15 23:21:19.000000000 +0000
@@ -57,6 +57,9 @@
     if (level >= 1) {
         get_cpuid (0x00000001, &eax, &ebx, &ecx, &edx);
 
+        if (edx & (1<<15))
+          flags |= PA_CPU_X86_CMOV;
+
         if (edx & (1<<23))
           flags |= PA_CPU_X86_MMX;
 
@@ -97,7 +100,8 @@
           flags |= PA_CPU_X86_3DNOW;
     }
 
-    pa_log_info ("CPU flags: %s%s%s%s%s%s%s%s%s%s",
+    pa_log_info ("CPU flags: %s%s%s%s%s%s%s%s%s%s%s",
+    (flags & PA_CPU_X86_CMOV) ? "CMOV " : "",
     (flags & PA_CPU_X86_MMX) ? "MMX " : "",
     (flags & PA_CPU_X86_SSE) ? "SSE " : "",
     (flags & PA_CPU_X86_SSE2) ? "SSE2 " : "",
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-x86.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-x86.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/cpu-x86.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/cpu-x86.h	2010-01-15 23:21:19.000000000 +0000
@@ -35,12 +35,12 @@
     PA_CPU_X86_SSE4_1    = (1 << 6),
     PA_CPU_X86_SSE4_2    = (1 << 7),
     PA_CPU_X86_3DNOW     = (1 << 8),
-    PA_CPU_X86_3DNOWEXT  = (1 << 9)
+    PA_CPU_X86_3DNOWEXT  = (1 << 9),
+    PA_CPU_X86_CMOV      = (1 << 10)
 } pa_cpu_x86_flag_t;
 
 void pa_cpu_init_x86 (void);
 
-
 #if defined (__i386__)
 typedef int32_t pa_reg_x86;
 #define PA_REG_a "eax"
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/database-simple.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/database-simple.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/database-simple.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/database-simple.c	2010-01-15 23:21:19.000000000 +0000
@@ -237,7 +237,7 @@
     path = pa_sprintf_malloc("%s."CANONICAL_HOST".simple", fn);
     errno = 0;
 
-    f = pa_fopen_cloexec(path, "r");
+    f = fopen(path, "r");
 
     if (f || errno == ENOENT) { /* file not found is ok */
         db = pa_xnew0(simple_data, 1);
@@ -480,7 +480,7 @@
 
     errno = 0;
 
-    f = pa_fopen_cloexec(db->tmp_filename, "w");
+    f = fopen(db->tmp_filename, "w");
 
     if (!f)
         goto fail;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/database-tdb.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/database-tdb.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/database-tdb.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/database-tdb.c	2010-01-15 23:21:19.000000000 +0000
@@ -66,39 +66,6 @@
     pa_zero(d);
 }
 
-static struct tdb_context *tdb_open_cloexec(
-        const char *name,
-        int hash_size,
-        int tdb_flags,
-        int open_flags,
-        mode_t mode) {
-
-    /* Mimics pa_open_cloexec() */
-
-    struct tdb_context *c;
-
-#ifdef O_NOCTTY
-    open_flags |= O_NOCTTY;
-#endif
-
-#ifdef O_CLOEXEC
-    errno = 0;
-    if ((c = tdb_open(name, hash_size, tdb_flags, open_flags | O_CLOEXEC, mode)))
-        goto finish;
-
-    if (errno != EINVAL)
-        return NULL;
-#endif
-
-    errno = 0;
-    if (!(c = tdb_open(name, hash_size, tdb_flags, open_flags, mode)))
-        return NULL;
-
-finish:
-    pa_make_fd_cloexec(tdb_fd(c));
-    return c;
-}
-
 pa_database* pa_database_open(const char *fn, pa_bool_t for_write) {
     struct tdb_context *c;
     char *path;
@@ -106,7 +73,15 @@
     pa_assert(fn);
 
     path = pa_sprintf_malloc("%s.tdb", fn);
-    if ((c = tdb_open_cloexec(path, 0, TDB_NOSYNC|TDB_NOLOCK, (for_write ? O_RDWR|O_CREAT : O_RDONLY), 0644)))
+    errno = 0;
+    c = tdb_open(path, 0, TDB_NOSYNC|TDB_NOLOCK,
+                 (for_write ? O_RDWR|O_CREAT : O_RDONLY)|O_NOCTTY
+#ifdef O_CLOEXEC
+                 |O_CLOEXEC
+#endif
+                 , 0644);
+
+    if (c)
         pa_log_debug("Opened TDB database '%s'", path);
 
     pa_xfree(path);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/dbus-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/dbus-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/dbus-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/dbus-util.c	2010-01-15 23:21:19.000000000 +0000
@@ -28,7 +28,6 @@
 
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
-#include <pulse/utf8.h>
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-rtclock.h>
@@ -291,31 +290,6 @@
     return pconn;
 }
 
-pa_dbus_wrap_connection* pa_dbus_wrap_connection_new_from_existing(
-        pa_mainloop_api *m,
-        pa_bool_t use_rtclock,
-        DBusConnection *conn) {
-    pa_dbus_wrap_connection *pconn;
-
-    pa_assert(m);
-    pa_assert(conn);
-
-    pconn = pa_xnew(pa_dbus_wrap_connection, 1);
-    pconn->mainloop = m;
-    pconn->connection = dbus_connection_ref(conn);
-    pconn->use_rtclock = use_rtclock;
-
-    dbus_connection_set_exit_on_disconnect(conn, FALSE);
-    dbus_connection_set_dispatch_status_function(conn, dispatch_status, pconn, NULL);
-    dbus_connection_set_watch_functions(conn, add_watch, remove_watch, toggle_watch, pconn, NULL);
-    dbus_connection_set_timeout_functions(conn, add_timeout, remove_timeout, toggle_timeout, pconn, NULL);
-    dbus_connection_set_wakeup_main_function(conn, wakeup_main, pconn, NULL);
-
-    pconn->dispatch_event = pconn->mainloop->defer_new(pconn->mainloop, dispatch_cb, conn);
-
-    return pconn;
-}
-
 void pa_dbus_wrap_connection_free(pa_dbus_wrap_connection* c) {
     pa_assert(c);
 
@@ -448,329 +422,3 @@
         pa_dbus_pending_free(i);
     }
 }
-
-void pa_dbus_send_error(DBusConnection *c, DBusMessage *in_reply_to, const char *name, const char *format, ...) {
-    va_list ap;
-    char *message;
-    DBusMessage *reply = NULL;
-
-    pa_assert(c);
-    pa_assert(in_reply_to);
-    pa_assert(name);
-    pa_assert(format);
-
-    va_start(ap, format);
-    message = pa_vsprintf_malloc(format, ap);
-    va_end(ap);
-    pa_assert_se((reply = dbus_message_new_error(in_reply_to, name, message)));
-    pa_assert_se(dbus_connection_send(c, reply, NULL));
-
-    dbus_message_unref(reply);
-
-    pa_xfree(message);
-}
-
-void pa_dbus_send_empty_reply(DBusConnection *c, DBusMessage *in_reply_to) {
-    DBusMessage *reply = NULL;
-
-    pa_assert(c);
-    pa_assert(in_reply_to);
-
-    pa_assert_se((reply = dbus_message_new_method_return(in_reply_to)));
-    pa_assert_se(dbus_connection_send(c, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-void pa_dbus_send_basic_value_reply(DBusConnection *c, DBusMessage *in_reply_to, int type, void *data) {
-    DBusMessage *reply = NULL;
-
-    pa_assert(c);
-    pa_assert(in_reply_to);
-    pa_assert(dbus_type_is_basic(type));
-    pa_assert(data);
-
-    pa_assert_se((reply = dbus_message_new_method_return(in_reply_to)));
-    pa_assert_se(dbus_message_append_args(reply, type, data, DBUS_TYPE_INVALID));
-    pa_assert_se(dbus_connection_send(c, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-static const char *signature_from_basic_type(int type) {
-    switch (type) {
-        case DBUS_TYPE_BOOLEAN: return DBUS_TYPE_BOOLEAN_AS_STRING;
-        case DBUS_TYPE_BYTE: return DBUS_TYPE_BYTE_AS_STRING;
-        case DBUS_TYPE_INT16: return DBUS_TYPE_INT16_AS_STRING;
-        case DBUS_TYPE_UINT16: return DBUS_TYPE_UINT16_AS_STRING;
-        case DBUS_TYPE_INT32: return DBUS_TYPE_INT32_AS_STRING;
-        case DBUS_TYPE_UINT32: return DBUS_TYPE_UINT32_AS_STRING;
-        case DBUS_TYPE_INT64: return DBUS_TYPE_INT64_AS_STRING;
-        case DBUS_TYPE_UINT64: return DBUS_TYPE_UINT64_AS_STRING;
-        case DBUS_TYPE_DOUBLE: return DBUS_TYPE_DOUBLE_AS_STRING;
-        case DBUS_TYPE_STRING: return DBUS_TYPE_STRING_AS_STRING;
-        case DBUS_TYPE_OBJECT_PATH: return DBUS_TYPE_OBJECT_PATH_AS_STRING;
-        case DBUS_TYPE_SIGNATURE: return DBUS_TYPE_SIGNATURE_AS_STRING;
-        default: pa_assert_not_reached();
-    }
-}
-
-void pa_dbus_send_basic_variant_reply(DBusConnection *c, DBusMessage *in_reply_to, int type, void *data) {
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-    DBusMessageIter variant_iter;
-
-    pa_assert(c);
-    pa_assert(in_reply_to);
-    pa_assert(dbus_type_is_basic(type));
-    pa_assert(data);
-
-    pa_assert_se((reply = dbus_message_new_method_return(in_reply_to)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter,
-                                                  DBUS_TYPE_VARIANT,
-                                                  signature_from_basic_type(type),
-                                                  &variant_iter));
-    pa_assert_se(dbus_message_iter_append_basic(&variant_iter, type, data));
-    pa_assert_se(dbus_message_iter_close_container(&msg_iter, &variant_iter));
-    pa_assert_se(dbus_connection_send(c, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-/* Note: returns sizeof(char*) for strings, object paths and signatures. */
-static unsigned basic_type_size(int type) {
-    switch (type) {
-        case DBUS_TYPE_BOOLEAN: return sizeof(dbus_bool_t);
-        case DBUS_TYPE_BYTE: return 1;
-        case DBUS_TYPE_INT16: return sizeof(dbus_int16_t);
-        case DBUS_TYPE_UINT16: return sizeof(dbus_uint16_t);
-        case DBUS_TYPE_INT32: return sizeof(dbus_int32_t);
-        case DBUS_TYPE_UINT32: return sizeof(dbus_uint32_t);
-        case DBUS_TYPE_INT64: return sizeof(dbus_int64_t);
-        case DBUS_TYPE_UINT64: return sizeof(dbus_uint64_t);
-        case DBUS_TYPE_DOUBLE: return sizeof(double);
-        case DBUS_TYPE_STRING:
-        case DBUS_TYPE_OBJECT_PATH:
-        case DBUS_TYPE_SIGNATURE: return sizeof(char*);
-        default: pa_assert_not_reached();
-    }
-}
-
-void pa_dbus_send_basic_array_variant_reply(
-        DBusConnection *c,
-        DBusMessage *in_reply_to,
-        int item_type,
-        void *array,
-        unsigned n) {
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-
-    pa_assert(c);
-    pa_assert(in_reply_to);
-    pa_assert(dbus_type_is_basic(item_type));
-    pa_assert(array || n == 0);
-
-    pa_assert_se((reply = dbus_message_new_method_return(in_reply_to)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_dbus_append_basic_array_variant(&msg_iter, item_type, array, n);
-    pa_assert_se(dbus_connection_send(c, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-void pa_dbus_send_proplist_variant_reply(DBusConnection *c, DBusMessage *in_reply_to, pa_proplist *proplist) {
-    DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter;
-
-    pa_assert(c);
-    pa_assert(in_reply_to);
-    pa_assert(proplist);
-
-    pa_assert_se((reply = dbus_message_new_method_return(in_reply_to)));
-    dbus_message_iter_init_append(reply, &msg_iter);
-    pa_dbus_append_proplist_variant(&msg_iter, proplist);
-    pa_assert_se(dbus_connection_send(c, reply, NULL));
-    dbus_message_unref(reply);
-}
-
-void pa_dbus_append_basic_array(DBusMessageIter *iter, int item_type, const void *array, unsigned n) {
-    DBusMessageIter array_iter;
-    unsigned i;
-    unsigned item_size;
-
-    pa_assert(iter);
-    pa_assert(dbus_type_is_basic(item_type));
-    pa_assert(array || n == 0);
-
-    item_size = basic_type_size(item_type);
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, signature_from_basic_type(item_type), &array_iter));
-
-    for (i = 0; i < n; ++i)
-        pa_assert_se(dbus_message_iter_append_basic(&array_iter, item_type, &((uint8_t*) array)[i * item_size]));
-
-    pa_assert_se(dbus_message_iter_close_container(iter, &array_iter));
-};
-
-void pa_dbus_append_basic_variant(DBusMessageIter *iter, int type, void *data) {
-    DBusMessageIter variant_iter;
-
-    pa_assert(iter);
-    pa_assert(dbus_type_is_basic(type));
-    pa_assert(data);
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, signature_from_basic_type(type), &variant_iter));
-    pa_assert_se(dbus_message_iter_append_basic(&variant_iter, type, data));
-    pa_assert_se(dbus_message_iter_close_container(iter, &variant_iter));
-}
-
-void pa_dbus_append_basic_array_variant(DBusMessageIter *iter, int item_type, const void *array, unsigned n) {
-    DBusMessageIter variant_iter;
-    char *array_signature;
-
-    pa_assert(iter);
-    pa_assert(dbus_type_is_basic(item_type));
-    pa_assert(array || n == 0);
-
-    array_signature = pa_sprintf_malloc("a%c", *signature_from_basic_type(item_type));
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, array_signature, &variant_iter));
-    pa_dbus_append_basic_array(&variant_iter, item_type, array, n);
-    pa_assert_se(dbus_message_iter_close_container(iter, &variant_iter));
-
-    pa_xfree(array_signature);
-}
-
-void pa_dbus_append_basic_variant_dict_entry(DBusMessageIter *dict_iter, const char *key, int type, void *data) {
-    DBusMessageIter dict_entry_iter;
-
-    pa_assert(dict_iter);
-    pa_assert(key);
-    pa_assert(dbus_type_is_basic(type));
-    pa_assert(data);
-
-    pa_assert_se(dbus_message_iter_open_container(dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-    pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &key));
-    pa_dbus_append_basic_variant(&dict_entry_iter, type, data);
-    pa_assert_se(dbus_message_iter_close_container(dict_iter, &dict_entry_iter));
-}
-
-void pa_dbus_append_basic_array_variant_dict_entry(
-        DBusMessageIter *dict_iter,
-        const char *key,
-        int item_type,
-        const void *array,
-        unsigned n) {
-    DBusMessageIter dict_entry_iter;
-
-    pa_assert(dict_iter);
-    pa_assert(key);
-    pa_assert(dbus_type_is_basic(item_type));
-    pa_assert(array || n == 0);
-
-    pa_assert_se(dbus_message_iter_open_container(dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-    pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &key));
-    pa_dbus_append_basic_array_variant(&dict_entry_iter, item_type, array, n);
-    pa_assert_se(dbus_message_iter_close_container(dict_iter, &dict_entry_iter));
-}
-
-void pa_dbus_append_proplist(DBusMessageIter *iter, pa_proplist *proplist) {
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    DBusMessageIter array_iter;
-    void *state = NULL;
-    const char *key;
-
-    pa_assert(iter);
-    pa_assert(proplist);
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{say}", &dict_iter));
-
-    while ((key = pa_proplist_iterate(proplist, &state))) {
-        const void *value = NULL;
-        size_t nbytes;
-
-        pa_assert_se(pa_proplist_get(proplist, key, &value, &nbytes) >= 0);
-
-        pa_assert_se(dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-
-        pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &key));
-
-        pa_assert_se(dbus_message_iter_open_container(&dict_entry_iter, DBUS_TYPE_ARRAY, "y", &array_iter));
-        pa_assert_se(dbus_message_iter_append_fixed_array(&array_iter, DBUS_TYPE_BYTE, &value, nbytes));
-        pa_assert_se(dbus_message_iter_close_container(&dict_entry_iter, &array_iter));
-
-        pa_assert_se(dbus_message_iter_close_container(&dict_iter, &dict_entry_iter));
-    }
-
-    pa_assert_se(dbus_message_iter_close_container(iter, &dict_iter));
-}
-
-void pa_dbus_append_proplist_variant(DBusMessageIter *iter, pa_proplist *proplist) {
-    DBusMessageIter variant_iter;
-
-    pa_assert(iter);
-    pa_assert(proplist);
-
-    pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "a{say}", &variant_iter));
-    pa_dbus_append_proplist(&variant_iter, proplist);
-    pa_assert_se(dbus_message_iter_close_container(iter, &variant_iter));
-}
-
-void pa_dbus_append_proplist_variant_dict_entry(DBusMessageIter *dict_iter, const char *key, pa_proplist *proplist) {
-    DBusMessageIter dict_entry_iter;
-
-    pa_assert(dict_iter);
-    pa_assert(key);
-    pa_assert(proplist);
-
-    pa_assert_se(dbus_message_iter_open_container(dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &dict_entry_iter));
-    pa_assert_se(dbus_message_iter_append_basic(&dict_entry_iter, DBUS_TYPE_STRING, &key));
-    pa_dbus_append_proplist_variant(&dict_entry_iter, proplist);
-    pa_assert_se(dbus_message_iter_close_container(dict_iter, &dict_entry_iter));
-}
-
-pa_proplist *pa_dbus_get_proplist_arg(DBusConnection *c, DBusMessage *msg, DBusMessageIter *iter) {
-    DBusMessageIter dict_iter;
-    DBusMessageIter dict_entry_iter;
-    pa_proplist *proplist = NULL;
-    const char *key = NULL;
-    const uint8_t *value = NULL;
-    int value_length = 0;
-
-    pa_assert(c);
-    pa_assert(msg);
-    pa_assert(iter);
-    pa_assert(pa_streq(dbus_message_iter_get_signature(iter), "a{say}"));
-
-    proplist = pa_proplist_new();
-
-    dbus_message_iter_recurse(iter, &dict_iter);
-
-    while (dbus_message_iter_get_arg_type(&dict_iter) != DBUS_TYPE_INVALID) {
-        dbus_message_iter_recurse(&dict_iter, &dict_entry_iter);
-
-        dbus_message_iter_get_basic(&dict_entry_iter, &key);
-        dbus_message_iter_next(&dict_entry_iter);
-
-        if (strlen(key) <= 0 || !pa_ascii_valid(key)) {
-            pa_dbus_send_error(c, msg, DBUS_ERROR_INVALID_ARGS, "Invalid property list key: '%s'.", key);
-            goto fail;
-        }
-
-        dbus_message_iter_get_fixed_array(&dict_entry_iter, &value, &value_length);
-
-        pa_assert(value_length >= 0);
-
-        pa_assert_se(pa_proplist_set(proplist, key, value, value_length) >= 0);
-
-        dbus_message_iter_next(&dict_iter);
-    }
-
-    dbus_message_iter_next(iter);
-
-    return proplist;
-
-fail:
-    if (proplist)
-        pa_proplist_free(proplist);
-
-    return NULL;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/dbus-util.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/dbus-util.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/dbus-util.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/dbus-util.h	2010-01-15 23:21:19.000000000 +0000
@@ -26,16 +26,11 @@
 
 #include <pulsecore/llist.h>
 #include <pulse/mainloop-api.h>
-#include <pulse/proplist.h>
 
 /* A wrap connection is not shared or refcounted, it is available in client side */
 typedef struct pa_dbus_wrap_connection pa_dbus_wrap_connection;
 
 pa_dbus_wrap_connection* pa_dbus_wrap_connection_new(pa_mainloop_api *mainloop, pa_bool_t use_rtclock, DBusBusType type, DBusError *error);
-pa_dbus_wrap_connection* pa_dbus_wrap_connection_new_from_existing(
-        pa_mainloop_api *mainloop,
-        pa_bool_t use_rtclock,
-        DBusConnection *conn);
 void pa_dbus_wrap_connection_free(pa_dbus_wrap_connection* conn);
 
 DBusConnection* pa_dbus_wrap_connection_get(pa_dbus_wrap_connection *conn);
@@ -65,42 +60,4 @@
 /* Free up a list of pa_dbus_pending_call objects */
 void pa_dbus_free_pending_list(pa_dbus_pending **p);
 
-/* Sends an error message as the reply to the given message. */
-void pa_dbus_send_error(
-        DBusConnection *c,
-        DBusMessage *in_reply_to,
-        const char *name,
-        const char *format, ...) PA_GCC_PRINTF_ATTR(4, 5);
-
-void pa_dbus_send_empty_reply(DBusConnection *c, DBusMessage *in_reply_to);
-void pa_dbus_send_basic_value_reply(DBusConnection *c, DBusMessage *in_reply_to, int type, void *data);
-void pa_dbus_send_basic_variant_reply(DBusConnection *c, DBusMessage *in_reply_to, int type, void *data);
-void pa_dbus_send_basic_array_variant_reply(
-        DBusConnection *c,
-        DBusMessage *in_reply_to,
-        int item_type,
-        void *array,
-        unsigned n);
-void pa_dbus_send_proplist_variant_reply(DBusConnection *c, DBusMessage *in_reply_to, pa_proplist *proplist);
-
-void pa_dbus_append_basic_array(DBusMessageIter *iter, int item_type, const void *array, unsigned n);
-void pa_dbus_append_basic_array_variant(DBusMessageIter *iter, int item_type, const void *array, unsigned n);
-void pa_dbus_append_basic_variant(DBusMessageIter *iter, int type, void *data);
-void pa_dbus_append_basic_variant_dict_entry(DBusMessageIter *dict_iter, const char *key, int type, void *data);
-void pa_dbus_append_basic_array_variant_dict_entry(
-        DBusMessageIter *dict_iter,
-        const char *key,
-        int item_type,
-        const void *array,
-        unsigned n);
-void pa_dbus_append_proplist(DBusMessageIter *iter, pa_proplist *proplist);
-void pa_dbus_append_proplist_variant(DBusMessageIter *iter, pa_proplist *proplist);
-void pa_dbus_append_proplist_variant_dict_entry(DBusMessageIter *dict_iter, const char *key, pa_proplist *proplist);
-
-/* Returns a new proplist that the caller has to free. If the proplist contains
- * invalid keys, an error reply is sent and NULL is returned. The iterator must
- * point to "a{say}" element. This function calls dbus_message_iter_next(iter)
- * before returning. */
-pa_proplist *pa_dbus_get_proplist_arg(DBusConnection *c, DBusMessage *msg, DBusMessageIter *iter);
-
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/envelope.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/envelope.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/envelope.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/envelope.c	2010-01-15 23:21:19.000000000 +0000
@@ -177,7 +177,7 @@
 
     pa_assert(i->j > 0);
     pa_assert(i->def->points_x[i->j-1] <= x);
-    pa_assert(x <= i->def->points_x[i->j]);
+    pa_assert(x < i->def->points_x[i->j]);
 
     return linear_interpolate_int(i->def->points_x[i->j-1], i->def->points_y.i[i->j-1],
                                   i->def->points_x[i->j], i->def->points_y.i[i->j], x);
@@ -200,7 +200,7 @@
 
     pa_assert(i->j > 0);
     pa_assert(i->def->points_x[i->j-1] <= x);
-    pa_assert(x <= i->def->points_x[i->j]);
+    pa_assert(x < i->def->points_x[i->j]);
 
     return linear_interpolate_float(i->def->points_x[i->j-1], i->def->points_y.f[i->j-1],
                                     i->def->points_x[i->j], i->def->points_y.f[i->j], x);
@@ -550,7 +550,7 @@
         e->points[v].cached_valid = TRUE;
     }
 
-	return e->points[v].y.i[e->points[v].n_current] + ((float)e->points[v].cached_dy_i * (int32_t) (e->x - e->points[v].x[e->points[v].n_current])) / (int32_t) e->points[v].cached_dx;
+    return e->points[v].y.i[e->points[v].n_current] + (e->points[v].cached_dy_i * (int32_t) (e->x - e->points[v].x[e->points[v].n_current])) / (int32_t) e->points[v].cached_dx;
 }
 
 static float linear_get_float(pa_envelope *e, int v) {
@@ -597,60 +597,34 @@
         fs = pa_frame_size(&e->sample_spec);
         n = chunk->length;
 
-        pa_log_debug("Envelop position %zu applying factor %d=%f, sample spec is %d, chunk's length is %zu, fs is %zu\n", e->x, linear_get_int(e, v), ((float) linear_get_int(e,v))/0x10000, e->sample_spec.format, n, fs);
-
         switch (e->sample_spec.format) {
 
             case PA_SAMPLE_U8: {
-                uint8_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint8_t*) p + n;
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int32_t t, hi, lo;
-
-                    hi = factor >> 16;
-                    lo = factor & 0xFFFF;
-
-                    t = (int32_t) *d - 0x80;
-                    t = ((t * lo) >> 16) + (t * hi);
-                    t = PA_CLAMP_UNLIKELY(t, -0x80, 0x7F);
-                    *d = (uint8_t) (t + 0x80);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
-                    }
+                uint8_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++)
+                        *t = (uint8_t) (((factor * ((int16_t) *t - 0x80)) / 0x10000) + 0x80);
                 }
 
                 break;
             }
 
             case PA_SAMPLE_ULAW: {
-                uint8_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint8_t*) p + n;
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int32_t t, hi, lo;
-
-                    hi = factor >> 16;
-                    lo = factor & 0xFFFF;
-
-                    t = (int32_t) st_ulaw2linear16(*d);
-                    t = ((t * lo) >> 16) + (t * hi);
-                    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-                    *d = (uint8_t) st_14linear2ulaw((int16_t) t >> 2);
-
-                     if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
+                uint8_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++) {
+                        int16_t k = st_ulaw2linear16(*t);
+                        *t = (uint8_t) st_14linear2ulaw((int16_t) (((factor * k) / 0x10000) >> 2));
                     }
                 }
 
@@ -658,27 +632,16 @@
             }
 
             case PA_SAMPLE_ALAW: {
-                uint8_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint8_t*) p + n;
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int32_t t, hi, lo;
-
-                    hi = factor >> 16;
-                    lo = factor & 0xFFFF;
-
-                    t = (int32_t) st_alaw2linear16(*d);
-                    t = ((t * lo) >> 16) + (t * hi);
-                    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-                    *d = (uint8_t) st_13linear2alaw((int16_t) t >> 3);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
+                uint8_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++) {
+                        int16_t k = st_alaw2linear16(*t);
+                        *t = (uint8_t) st_13linear2alaw((int16_t) (((factor * k) / 0x10000) >> 3));
                     }
                 }
 
@@ -686,55 +649,31 @@
             }
 
             case PA_SAMPLE_S16NE: {
-                int16_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (int16_t*) p + n/sizeof(int16_t);
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int32_t t, hi, lo;
-
-                    hi = factor >> 16;
-                    lo = factor & 0xFFFF;
-
-                    t = (int32_t)(*d);
-                    t = ((t * lo) >> 16) + (t * hi);
-                    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-                    *d = (int16_t) t;
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
-                    }
+                int16_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++)
+                        *t = (int16_t) ((factor * *t) / 0x10000);
                 }
 
                 break;
             }
 
             case PA_SAMPLE_S16RE: {
-                int16_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (int16_t*) p + n/sizeof(int16_t);
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int32_t t, hi, lo;
-
-                    hi = factor >> 16;
-                    lo = factor & 0xFFFF;
-
-                    t = (int32_t) PA_INT16_SWAP(*d);
-                    t = ((t * lo) >> 16) + (t * hi);
-                    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-                    *d = PA_INT16_SWAP((int16_t) t);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
+                int16_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++) {
+                        int16_t r = (int16_t) ((factor * PA_INT16_SWAP(*t)) / 0x10000);
+                        *t = PA_INT16_SWAP(r);
                     }
                 }
 
@@ -742,49 +681,31 @@
             }
 
             case PA_SAMPLE_S32NE: {
-                int32_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (int32_t*) p + n/sizeof(int32_t);
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int64_t t;
-
-                    t = (int64_t)(*d);
-                    t = (t * factor) >> 16;
-                    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-                    *d = (int32_t) t;
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
-                    }
+                int32_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++)
+                        *t = (int32_t) (((int64_t) factor * (int64_t) *t) / 0x10000);
                 }
 
                 break;
             }
 
             case PA_SAMPLE_S32RE: {
-                int32_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (int32_t*) p + n/sizeof(int32_t);
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int64_t t;
-
-                    t = (int64_t) PA_INT32_SWAP(*d);
-                    t = (t * factor) >> 16;
-                    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-                    *d = PA_INT32_SWAP((int32_t) t);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                        channel = 0;
-                        e->x += fs;
-                        factor = linear_get_int(e, v);
+                int32_t *t;
+
+                for (t = p; n > 0; n -= fs) {
+                    int32_t factor = linear_get_int(e, v);
+                    unsigned c;
+                    e->x += fs;
+
+                    for (c = 0; c < e->sample_spec.channels; c++, t++) {
+                        int32_t r = (int32_t) (((int64_t) factor * (int64_t) PA_INT32_SWAP(*t)) / 0x10000);
+                        *t = PA_INT32_SWAP(r);
                     }
                 }
 
@@ -792,7 +713,6 @@
             }
 
             case PA_SAMPLE_FLOAT32NE: {
-            /*Seems the FLOAT32NE part of pa_volume_memchunk not right, do not reuse here*/
                 float *t;
 
                 for (t = p; n > 0; n -= fs) {
@@ -808,7 +728,6 @@
             }
 
             case PA_SAMPLE_FLOAT32RE: {
-            /*Seems the FLOAT32RE part of pa_volume_memchunk not right, do not reuse here*/
                 float *t;
 
                 for (t = p; n > 0; n -= fs) {
@@ -825,101 +744,10 @@
                 break;
             }
 
-            case PA_SAMPLE_S24NE: {
-                uint8_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint8_t*) p + n/3;
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int64_t t;
-
-                    t = (int64_t)((int32_t) (PA_READ24NE(d) << 8));
-                    t = (t * factor) >> 16;
-                    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-                    PA_WRITE24NE(d, ((uint32_t) (int32_t) t) >> 8);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                            channel = 0;
-                            e->x += fs;
-                            factor = linear_get_int(e, v);
-                    }
-                }
-
-                break;
-            }
-            case PA_SAMPLE_S24RE: {
-                uint8_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint8_t*) p + n/3;
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int64_t t;
-
-                    t = (int64_t)((int32_t) (PA_READ24RE(d) << 8));
-                    t = (t * factor) >> 16;
-                    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-                    PA_WRITE24RE(d, ((uint32_t) (int32_t) t) >> 8);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                            channel = 0;
-                            e->x += fs;
-                            factor = linear_get_int(e, v);
-                    }
-                }
-
-                break;
-            }
-            case PA_SAMPLE_S24_32NE: {
-                uint32_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint32_t*) p + n/sizeof(uint32_t);
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int64_t t;
-
-                    t = (int64_t) ((int32_t) (*d << 8));
-                    t = (t * factor) >> 16;
-                    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-                    *d = ((uint32_t) ((int32_t) t)) >> 8;
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                            channel = 0;
-                            e->x += fs;
-                            factor = linear_get_int(e, v);
-                    }
-                }
-
-                break;
-            }
-            case PA_SAMPLE_S24_32RE: {
-                uint32_t *d, *s;
-                unsigned channel;
-                int32_t factor = linear_get_int(e, v);
-
-                s = (uint32_t*) p + n/sizeof(uint32_t);
-
-                for (channel = 0, d = p; d < s; d++) {
-                    int64_t t;
-
-                    t = (int64_t) ((int32_t) (PA_UINT32_SWAP(*d) << 8));
-                    t = (t * factor) >> 16;
-                    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-                    *d = PA_UINT32_SWAP(((uint32_t) ((int32_t) t)) >> 8);
-
-                    if (PA_UNLIKELY(++channel >= e->sample_spec.channels)) {
-                            channel = 0;
-                            e->x += fs;
-                            factor = linear_get_int(e, v);
-                    }
-                }
-                break;
-            }
+            case PA_SAMPLE_S24LE:
+            case PA_SAMPLE_S24BE:
+            case PA_SAMPLE_S24_32LE:
+            case PA_SAMPLE_S24_32BE:
                 /* FIXME */
                 pa_assert_not_reached();
 
@@ -929,6 +757,8 @@
         }
 
         pa_memblock_release(chunk->memblock);
+
+        e->x += chunk->length;
     } else {
         /* When we have no envelope to apply we reset our origin */
         e->x = 0;
@@ -944,46 +774,13 @@
 
     envelope_begin_read(e, &v);
 
-    if (e->x - n_bytes <= e->points[v].x[0])
-        e->x = e->points[v].x[0];
-    else
+    if (n_bytes < e->x)
         e->x -= n_bytes;
+    else
+        e->x = 0;
 
     e->points[v].n_current = 0;
     e->points[v].cached_valid = FALSE;
 
     envelope_commit_read(e, v);
 }
-
-void pa_envelope_restart(pa_envelope* e) {
-    int v;
-    pa_assert(e);
-
-    envelope_begin_read(e, &v);
-    e->x = e->points[v].x[0];
-    envelope_commit_read(e, v);
-}
-
-pa_bool_t pa_envelope_is_finished(pa_envelope* e) {
-    int v;
-    pa_bool_t finished;
-
-    pa_assert(e);
-    envelope_begin_read(e, &v);
-    finished = (e->x >=  e->points[v].x[e->points[v].n_points-1]);
-    envelope_commit_read(e, v);
-
-    return finished;
-}
-
-int32_t pa_envelope_length(pa_envelope *e) {
-    int v;
-    size_t size;
-
-    pa_assert(e);
-    envelope_begin_read(e, &v);
-    size = e->points[v].x[e->points[v].n_points-1] - e->points[v].x[0];
-    envelope_commit_read(e, v);
-
-    return size;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/envelope.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/envelope.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/envelope.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/envelope.h	2010-01-15 23:21:19.000000000 +0000
@@ -49,8 +49,5 @@
 void pa_envelope_remove(pa_envelope *e, pa_envelope_item *i);
 void pa_envelope_apply(pa_envelope *e, pa_memchunk *chunk);
 void pa_envelope_rewind(pa_envelope *e, size_t n_bytes);
-void pa_envelope_restart(pa_envelope* e);
-pa_bool_t pa_envelope_is_finished(pa_envelope* e);
-int32_t pa_envelope_length(pa_envelope *e);
 
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/fdsem.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/fdsem.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/fdsem.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/fdsem.c	2010-01-15 23:21:19.000000000 +0000
@@ -62,15 +62,19 @@
     f = pa_xmalloc(PA_ALIGN(sizeof(pa_fdsem)) + PA_ALIGN(sizeof(pa_fdsem_data)));
 
 #ifdef HAVE_SYS_EVENTFD_H
-    if ((f->efd = eventfd(0, EFD_CLOEXEC)) >= 0)
+    if ((f->efd = eventfd(0, 0)) >= 0) {
+        pa_make_fd_cloexec(f->efd);
         f->fds[0] = f->fds[1] = -1;
-    else
+    } else
 #endif
     {
-        if (pa_pipe_cloexec(f->fds) < 0) {
+        if (pipe(f->fds) < 0) {
             pa_xfree(f);
             return NULL;
         }
+
+        pa_make_fd_cloexec(f->fds[0]);
+        pa_make_fd_cloexec(f->fds[1]);
     }
 
     f->data = (pa_fdsem_data*) ((uint8_t*) f + PA_ALIGN(sizeof(pa_fdsem)));
@@ -110,11 +114,12 @@
 
     f = pa_xnew(pa_fdsem, 1);
 
-    if ((f->efd = eventfd(0, EFD_CLOEXEC)) < 0) {
+    if ((f->efd = eventfd(0, 0)) < 0) {
         pa_xfree(f);
         return NULL;
     }
 
+    pa_make_fd_cloexec(f->efd);
     f->fds[0] = f->fds[1] = -1;
     f->data = data;
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/flist.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/flist.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/flist.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/flist.h	2010-01-15 23:21:19.000000000 +0000
@@ -45,7 +45,7 @@
 
 #define PA_STATIC_FLIST_DECLARE(name, size, free_cb)                    \
     static struct {                                                     \
-        pa_flist *flist;                                                \
+        pa_flist *volatile flist;                                       \
         pa_once once;                                                   \
     } name##_flist = { NULL, PA_ONCE_INIT };                            \
     static void name##_flist_init(void) {                               \
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/idxset.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/idxset.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/idxset.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/idxset.h	2010-01-15 23:21:19.000000000 +0000
@@ -65,7 +65,7 @@
 /* Get the entry by its idx */
 void* pa_idxset_get_by_index(pa_idxset*s, uint32_t idx);
 
-/* Get the entry by its data. The index is returned in *idx */
+/* Get the entry by its data. The idx is returned in *index */
 void* pa_idxset_get_by_data(pa_idxset*s, const void *p, uint32_t *idx);
 
 /* Similar to pa_idxset_get_by_index(), but removes the entry from the idxset. */
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/lock-autospawn.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/lock-autospawn.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/lock-autospawn.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/lock-autospawn.c	2010-01-15 23:21:19.000000000 +0000
@@ -33,7 +33,6 @@
 #include <pulse/i18n.h>
 #include <pulse/xmalloc.h>
 
-#include <pulsecore/poll.h>
 #include <pulsecore/mutex.h>
 #include <pulsecore/thread.h>
 #include <pulsecore/core-util.h>
@@ -88,9 +87,12 @@
     pa_assert(pipe_fd[0] < 0);
     pa_assert(pipe_fd[1] < 0);
 
-    if (pa_pipe_cloexec(pipe_fd) < 0)
+    if (pipe(pipe_fd) < 0)
         return -1;
 
+    pa_make_fd_cloexec(pipe_fd[0]);
+    pa_make_fd_cloexec(pipe_fd[1]);
+
     pa_make_fd_nonblock(pipe_fd[1]);
     pa_make_fd_nonblock(pipe_fd[0]);
 
@@ -183,7 +185,7 @@
     pfd.fd = pipe_fd[0];
     pfd.events = POLLIN;
 
-    if ((k = pa_poll(&pfd, 1, -1)) != 1) {
+    if ((k = poll(&pfd, 1, -1)) != 1) {
         pa_assert(k < 0);
         pa_assert(errno == EINTR);
     } else if ((s = read(pipe_fd[0], &x, 1)) != 1) {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/log.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/log.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/log.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/log.c	2010-01-15 23:21:19.000000000 +0000
@@ -61,6 +61,7 @@
 #define ENV_LOG_PRINT_LEVEL "PULSE_LOG_LEVEL"
 #define ENV_LOG_BACKTRACE "PULSE_LOG_BACKTRACE"
 #define ENV_LOG_BACKTRACE_SKIP "PULSE_LOG_BACKTRACE_SKIP"
+#define ENV_LOG_NO_RATELIMIT "PULSE_LOG_NO_RATE_LIMIT"
 
 static char *ident = NULL; /* in local charset format */
 static pa_log_target_t target = PA_LOG_STDERR, target_override;
@@ -68,6 +69,7 @@
 static pa_log_level_t maximum_level = PA_LOG_ERROR, maximum_level_override = PA_LOG_ERROR;
 static unsigned show_backtrace = 0, show_backtrace_override = 0, skip_backtrace = 0;
 static pa_log_flags_t flags = 0, flags_override = 0;
+static pa_bool_t no_rate_limit = FALSE;
 
 #ifdef HAVE_SYSLOG_H
 static const int level_to_syslog[] = {
@@ -195,54 +197,61 @@
 #endif
 
 static void init_defaults(void) {
-    const char *e;
+    PA_ONCE_BEGIN {
 
-    if (!ident) {
-        char binary[256];
-        if (pa_get_binary_name(binary, sizeof(binary)))
-            pa_log_set_ident(binary);
-    }
+        const char *e;
 
-    if (getenv(ENV_LOG_SYSLOG)) {
-        target_override = PA_LOG_SYSLOG;
-        target_override_set = TRUE;
-    }
+        if (!ident) {
+            char binary[256];
+            if (pa_get_binary_name(binary, sizeof(binary)))
+                pa_log_set_ident(binary);
+        }
 
-    if ((e = getenv(ENV_LOG_LEVEL))) {
-        maximum_level_override = (pa_log_level_t) atoi(e);
+        if (getenv(ENV_LOG_SYSLOG)) {
+            target_override = PA_LOG_SYSLOG;
+            target_override_set = TRUE;
+        }
 
-        if (maximum_level_override >= PA_LOG_LEVEL_MAX)
-            maximum_level_override = PA_LOG_LEVEL_MAX-1;
-    }
+        if ((e = getenv(ENV_LOG_LEVEL))) {
+            maximum_level_override = (pa_log_level_t) atoi(e);
 
-    if (getenv(ENV_LOG_COLORS))
-        flags_override |= PA_LOG_COLORS;
+            if (maximum_level_override >= PA_LOG_LEVEL_MAX)
+                maximum_level_override = PA_LOG_LEVEL_MAX-1;
+        }
 
-    if (getenv(ENV_LOG_PRINT_TIME))
-        flags_override |= PA_LOG_PRINT_TIME;
+        if (getenv(ENV_LOG_COLORS))
+            flags_override |= PA_LOG_COLORS;
 
-    if (getenv(ENV_LOG_PRINT_FILE))
-        flags_override |= PA_LOG_PRINT_FILE;
+        if (getenv(ENV_LOG_PRINT_TIME))
+            flags_override |= PA_LOG_PRINT_TIME;
 
-    if (getenv(ENV_LOG_PRINT_META))
-        flags_override |= PA_LOG_PRINT_META;
+        if (getenv(ENV_LOG_PRINT_FILE))
+            flags_override |= PA_LOG_PRINT_FILE;
 
-    if (getenv(ENV_LOG_PRINT_LEVEL))
-        flags_override |= PA_LOG_PRINT_LEVEL;
+        if (getenv(ENV_LOG_PRINT_META))
+            flags_override |= PA_LOG_PRINT_META;
 
-    if ((e = getenv(ENV_LOG_BACKTRACE))) {
-        show_backtrace_override = (unsigned) atoi(e);
+        if (getenv(ENV_LOG_PRINT_LEVEL))
+            flags_override |= PA_LOG_PRINT_LEVEL;
 
-        if (show_backtrace_override <= 0)
-            show_backtrace_override = 0;
-    }
+        if ((e = getenv(ENV_LOG_BACKTRACE))) {
+            show_backtrace_override = (unsigned) atoi(e);
 
-    if ((e = getenv(ENV_LOG_BACKTRACE_SKIP))) {
-        skip_backtrace = (unsigned) atoi(e);
+            if (show_backtrace_override <= 0)
+                show_backtrace_override = 0;
+        }
 
-        if (skip_backtrace <= 0)
-            skip_backtrace = 0;
-    }
+        if ((e = getenv(ENV_LOG_BACKTRACE_SKIP))) {
+            skip_backtrace = (unsigned) atoi(e);
+
+            if (skip_backtrace <= 0)
+                skip_backtrace = 0;
+        }
+
+        if (getenv(ENV_LOG_NO_RATELIMIT))
+            no_rate_limit = TRUE;
+
+    } PA_ONCE_END;
 }
 
 void pa_log_levelv_meta(
@@ -268,9 +277,7 @@
     pa_assert(level < PA_LOG_LEVEL_MAX);
     pa_assert(format);
 
-    PA_ONCE_BEGIN {
-        init_defaults();
-    } PA_ONCE_END;
+    init_defaults();
 
     _target = target_override_set ? target_override : target;
     _maximum_level = PA_MAX(maximum_level, maximum_level_override);
@@ -428,5 +435,10 @@
     /* Not more than 10 messages every 5s */
     static PA_DEFINE_RATELIMIT(ratelimit, 5 * PA_USEC_PER_SEC, 10);
 
+    init_defaults();
+
+    if (no_rate_limit)
+        return TRUE;
+
     return pa_ratelimit_test(&ratelimit);
 }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/memblockq.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/memblockq.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/memblockq.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/memblockq.c	2010-01-15 23:21:19.000000000 +0000
@@ -55,8 +55,7 @@
     pa_bool_t in_prebuf;
     pa_memchunk silence;
     pa_mcalign *mcalign;
-    int64_t missing;
-    size_t requested;
+    int64_t missing, requested;
 };
 
 pa_memblockq* pa_memblockq_new(
@@ -84,8 +83,8 @@
     pa_log_debug("memblockq requested: maxlength=%lu, tlength=%lu, base=%lu, prebuf=%lu, minreq=%lu maxrewind=%lu",
                  (unsigned long) maxlength, (unsigned long) tlength, (unsigned long) base, (unsigned long) prebuf, (unsigned long) minreq, (unsigned long) maxrewind);
 
-    bq->missing = 0;
-    bq->requested = bq->maxlength = bq->tlength = bq->prebuf = bq->minreq = bq->maxrewind = 0;
+    bq->missing = bq->requested = 0;
+    bq->maxlength = bq->tlength = bq->prebuf = bq->minreq = bq->maxrewind = 0;
     bq->in_prebuf = TRUE;
 
     pa_memblockq_set_maxlength(bq, maxlength);
@@ -246,10 +245,34 @@
     return TRUE;
 }
 
+static void write_index_changed(pa_memblockq *bq, int64_t old_write_index, pa_bool_t account) {
+    int64_t delta;
+
+    pa_assert(bq);
+
+    delta = bq->write_index - old_write_index;
+
+    if (account)
+        bq->requested -= delta;
+
+    /* pa_log("pushed/seeked %lli: requested counter at %lli, account=%i", (long long) delta, (long long) bq->requested, account); */
+}
+
+static void read_index_changed(pa_memblockq *bq, int64_t old_read_index) {
+    int64_t delta;
+
+    pa_assert(bq);
+
+    delta = bq->read_index - old_read_index;
+    bq->missing += delta;
+
+    /* pa_log("popped %lli: missing counter at %lli", (long long) delta, (long long) bq->missing); */
+}
+
 int pa_memblockq_push(pa_memblockq* bq, const pa_memchunk *uchunk) {
     struct list_item *q, *n;
     pa_memchunk chunk;
-    int64_t old, delta;
+    int64_t old;
 
     pa_assert(bq);
     pa_assert(uchunk);
@@ -409,18 +432,7 @@
 
 finish:
 
-    delta = bq->write_index - old;
-
-    if (delta >= (int64_t) bq->requested) {
-        delta -= (int64_t) bq->requested;
-        bq->requested = 0;
-    } else {
-        bq->requested -= (size_t) delta;
-        delta = 0;
-    }
-
-    bq->missing -= delta;
-
+    write_index_changed(bq, old, TRUE);
     return 0;
 }
 
@@ -514,7 +526,7 @@
 }
 
 void pa_memblockq_drop(pa_memblockq *bq, size_t length) {
-    int64_t old, delta;
+    int64_t old;
     pa_assert(bq);
     pa_assert(length % bq->base == 0);
 
@@ -553,19 +565,21 @@
     }
 
     drop_backlog(bq);
-
-    delta = bq->read_index - old;
-    bq->missing += delta;
+    read_index_changed(bq, old);
 }
 
 void pa_memblockq_rewind(pa_memblockq *bq, size_t length) {
+    int64_t old;
     pa_assert(bq);
     pa_assert(length % bq->base == 0);
 
+    old = bq->read_index;
+
     /* This is kind of the inverse of pa_memblockq_drop() */
 
     bq->read_index -= (int64_t) length;
-    bq->missing -= (int64_t) length;
+
+    read_index_changed(bq, old);
 }
 
 pa_bool_t pa_memblockq_is_readable(pa_memblockq *bq) {
@@ -602,7 +616,7 @@
 }
 
 void pa_memblockq_seek(pa_memblockq *bq, int64_t offset, pa_seek_mode_t seek, pa_bool_t account) {
-    int64_t old, delta;
+    int64_t old;
     pa_assert(bq);
 
     old = bq->write_index;
@@ -625,24 +639,11 @@
     }
 
     drop_backlog(bq);
-
-    delta = bq->write_index - old;
-
-    if (account) {
-        if (delta >= (int64_t) bq->requested) {
-            delta -= (int64_t) bq->requested;
-            bq->requested = 0;
-        } else if (delta >= 0) {
-            bq->requested -= (size_t) delta;
-            delta = 0;
-        }
-    }
-
-    bq->missing -= delta;
+    write_index_changed(bq, old, account);
 }
 
 void pa_memblockq_flush_write(pa_memblockq *bq) {
-    int64_t old, delta;
+    int64_t old;
     pa_assert(bq);
 
     pa_memblockq_silence(bq);
@@ -651,22 +652,11 @@
     bq->write_index = bq->read_index;
 
     pa_memblockq_prebuf_force(bq);
-
-    delta = bq->write_index - old;
-
-    if (delta >= (int64_t) bq->requested) {
-        delta -= (int64_t) bq->requested;
-        bq->requested = 0;
-    } else if (delta >= 0) {
-        bq->requested -= (size_t) delta;
-        delta = 0;
-    }
-
-    bq->missing -= delta;
+    write_index_changed(bq, old, TRUE);
 }
 
 void pa_memblockq_flush_read(pa_memblockq *bq) {
-    int64_t old, delta;
+    int64_t old;
     pa_assert(bq);
 
     pa_memblockq_silence(bq);
@@ -675,9 +665,7 @@
     bq->read_index = bq->write_index;
 
     pa_memblockq_prebuf_force(bq);
-
-    delta = bq->read_index - old;
-    bq->missing += delta;
+    read_index_changed(bq, old);
 }
 
 size_t pa_memblockq_get_tlength(pa_memblockq *bq) {
@@ -774,8 +762,11 @@
         return 0;
 
     l = (size_t) bq->missing;
+
+    bq->requested += bq->missing;
     bq->missing = 0;
-    bq->requested += l;
+
+    /* pa_log("sent %lli: request counter is at %lli", (long long) l, (long long) bq->requested); */
 
     return l;
 }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/memblockq.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/memblockq.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/memblockq.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/memblockq.h	2010-01-15 23:21:19.000000000 +0000
@@ -165,7 +165,7 @@
 void pa_memblockq_apply_attr(pa_memblockq *memblockq, const pa_buffer_attr *a);
 void pa_memblockq_get_attr(pa_memblockq *bq, pa_buffer_attr *a);
 
-/* Call pa_memchunk_will_need() for every chunk in the queue from the current read pointer to the end */
+/* Call pa_memchunk_willneed() for every chunk in the queue from the current read pointer to the end */
 void pa_memblockq_willneed(pa_memblockq *bq);
 
 /* Check whether the memblockq is completely empty, i.e. no data
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/modargs.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/modargs.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/modargs.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/modargs.c	2010-01-15 23:21:19.000000000 +0000
@@ -415,13 +415,3 @@
 
     return 0;
 }
-
-const char *pa_modargs_iterate(pa_modargs *ma, void **state) {
-    pa_hashmap *map = (pa_hashmap*) ma;
-    struct entry *e;
-
-    if (!(e = pa_hashmap_iterate(map, state, NULL)))
-        return NULL;
-
-    return e->key;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/modargs.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/modargs.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/modargs.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/modargs.h	2010-01-15 23:21:19.000000000 +0000
@@ -60,13 +60,4 @@
 
 int pa_modargs_get_proplist(pa_modargs *ma, const char *name, pa_proplist *p, pa_update_mode_t m);
 
-/* Iterate through the module argument list. The user should allocate a
- * state variable of type void* and initialize it with NULL. A pointer
- * to this variable should then be passed to pa_modargs_iterate()
- * which should be called in a loop until it returns NULL which
- * signifies EOL. On each invication this function will return the
- * key string for the next entry. The keys in the argument list do not
- * have any particular order. */
-const char *pa_modargs_iterate(pa_modargs *ma, void **state);
-
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/once.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/once.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/once.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/once.c	2010-01-15 23:21:19.000000000 +0000
@@ -29,8 +29,6 @@
 #include "once.h"
 
 pa_bool_t pa_once_begin(pa_once *control) {
-    pa_mutex *m;
-
     pa_assert(control);
 
     if (pa_atomic_load(&control->done))
@@ -43,6 +41,7 @@
      * executed by us. Hence the awkward locking. */
 
     for (;;) {
+        pa_mutex *m;
 
         if ((m = pa_atomic_ptr_load(&control->mutex))) {
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/pid.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/pid.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/pid.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/pid.c	2010-01-15 23:21:19.000000000 +0000
@@ -88,7 +88,10 @@
     for (;;) {
         struct stat st;
 
-        if ((fd = pa_open_cloexec(fn, mode
+        if ((fd = open(fn, mode
+#ifdef O_NOCTTY
+                       |O_NOCTTY
+#endif
 #ifdef O_NOFOLLOW
                        |O_NOFOLLOW
 #endif
@@ -143,7 +146,7 @@
 
     pa_snprintf(bn, sizeof(bn), "/proc/%lu/stat", (unsigned long) pid);
 
-    if (!(f = pa_fopen_cloexec(bn, "r"))) {
+    if (!(f = fopen(bn, "r"))) {
         pa_log_info("Failed to open %s: %s", bn, pa_cstrerror(errno));
         return -1;
     } else {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/play-memchunk.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/play-memchunk.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/play-memchunk.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/play-memchunk.c	2010-01-15 23:21:19.000000000 +0000
@@ -47,12 +47,16 @@
 
     pa_memblockq *q;
     int r;
+    pa_memchunk silence;
 
     pa_assert(sink);
     pa_assert(ss);
     pa_assert(chunk);
 
-    q = pa_memblockq_new(0, chunk->length, 0, pa_frame_size(ss), 1, 1, 0, NULL);
+    pa_silence_memchunk_get(&sink->core->silence_cache, sink->core->mempool, &silence, ss, 0);
+    q = pa_memblockq_new(0, chunk->length, 0, pa_frame_size(ss), 1, 1, 0, &silence);
+    pa_memblock_unref(silence.memblock);
+
     pa_assert_se(pa_memblockq_push(q, chunk) >= 0);
 
     if ((r = pa_play_memblockq(sink, ss, map, q, volume, p, sink_input_index)) < 0) {
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/poll.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/poll.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/poll.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/poll.c	2010-01-15 23:21:19.000000000 +0000
@@ -35,10 +35,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
 #include <errno.h>
 
 #ifdef HAVE_SYS_SELECT_H
@@ -47,26 +43,19 @@
 
 #include "winsock.h"
 
+#ifndef HAVE_POLL_H
+
 #include <pulsecore/core-util.h>
-#include <pulse/util.h>
 
 #include "poll.h"
 
-/* Mac OSX fails to implement poll() in a working way since 10.4. IOW, for
- * several years. We need to enable a dirty workaround and emulate that call
- * with select(), just like for Windows. sic! */
-
-#if !defined(HAVE_POLL_H) || defined(OS_IS_DARWIN)
-
-int pa_poll (struct pollfd *fds, unsigned long int nfds, int timeout) {
+int poll (struct pollfd *fds, unsigned long int nfds, int timeout) {
     struct timeval tv;
     fd_set rset, wset, xset;
     struct pollfd *f;
     int ready;
     int maxfd = 0;
-#ifdef OS_IS_WIN32
     char data[64];
-#endif
 
     FD_ZERO (&rset);
     FD_ZERO (&wset);
@@ -109,7 +98,6 @@
     ready = select ((SELECT_TYPE_ARG1) maxfd + 1, SELECT_TYPE_ARG234 &rset,
                     SELECT_TYPE_ARG234 &wset, SELECT_TYPE_ARG234 &xset,
                     SELECT_TYPE_ARG5 (timeout == -1 ? NULL : &tv));
-
     if ((ready == -1) && (errno == EBADF)) {
         ready = 0;
 
@@ -172,8 +160,6 @@
 #endif
 
     if (ready > 0) {
-        int r;
-
         ready = 0;
         for (f = fds; f < &fds[nfds]; ++f) {
             f->revents = 0;
@@ -181,18 +167,6 @@
                 if (FD_ISSET (f->fd, &rset)) {
                     /* support for POLLHUP.  An hung up descriptor does not
                        increase the return value! */
-#ifdef OS_IS_DARWIN
-                    /* There is a bug in Mac OS X that causes it to ignore MSG_PEEK
-                     * for some kinds of descriptors.  Detect if this descriptor is a
-                     * connected socket, a server socket, or something else using a
-                     * 0-byte recv, and use ioctl(2) to detect POLLHUP.  */
-                    r = recv(f->fd, NULL, 0, MSG_PEEK);
-		    if (r == 0 || (r < 0 && errno == ENOTSOCK))
-		        ioctl(f->fd, FIONREAD, &r);
-
-		    if (r == 0)
-		        f->revents |= POLLHUP;
-#else /* !OS_IS_DARWIN */
                     if (recv (f->fd, data, 64, MSG_PEEK) == -1) {
                         if (errno == ESHUTDOWN || errno == ECONNRESET ||
                             errno == ECONNABORTED || errno == ENETRESET) {
@@ -200,7 +174,6 @@
                             f->revents |= POLLHUP;
                         }
                     }
-#endif
 
                     if (f->revents == 0)
                         f->revents |= POLLIN;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/poll.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/poll.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/poll.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/poll.h	2010-01-15 23:21:19.000000000 +0000
@@ -24,10 +24,6 @@
    Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
 ***/
 
-#if defined(HAVE_POLL_H)
-#include <poll.h>
-#else
-
 /* Event types that can be polled for.  These bits may be set in `events'
    to indicate the interesting event types; they will appear in `revents'
    to indicate the status of the file descriptor.  */
@@ -42,6 +38,10 @@
 #define POLLHUP         0x010           /* Hung up.  */
 #define POLLNVAL        0x020           /* Invalid polling request.  */
 
+
+/* Type used for the number of file descriptors.  */
+typedef unsigned long int nfds_t;
+
 /* Data structure describing a polling request.  */
 struct pollfd
   {
@@ -50,17 +50,9 @@
     short int revents;          /* Types of events that actually occurred.  */
   };
 
-
 /* Poll the file descriptors described by the NFDS structures starting at
    FDS.  If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
    an event to occur; if TIMEOUT is -1, block until an event occurs.
    Returns the number of file descriptors with events, zero if timed out,
    or -1 for errors.  */
-
-#endif /* HAVE_POLL_H */
-
-#if defined(HAVE_POLL_H) && !defined(OS_IS_DARWIN)
-#define pa_poll(fds,nfds,timeout) poll((fds),(nfds),(timeout))
-#else
-int pa_poll (struct pollfd *fds, unsigned long nfds, int timeout);
-#endif
+extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-dbus.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-dbus.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-dbus.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-dbus.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,1143 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus.h>
-
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/hashmap.h>
-#include <pulsecore/idxset.h>
-#include <pulsecore/shared.h>
-#include <pulsecore/strbuf.h>
-
-#include "protocol-dbus.h"
-
-struct pa_dbus_protocol {
-    PA_REFCNT_DECLARE;
-
-    pa_core *core;
-    pa_hashmap *objects; /* Object path -> struct object_entry */
-    pa_hashmap *connections; /* DBusConnection -> struct connection_entry */
-    pa_idxset *extensions; /* Strings */
-
-    pa_hook hooks[PA_DBUS_PROTOCOL_HOOK_MAX];
-};
-
-struct object_entry {
-    char *path;
-    pa_hashmap *interfaces; /* Interface name -> struct interface_entry */
-    char *introspection;
-};
-
-struct connection_entry {
-    DBusConnection *connection;
-    pa_client *client;
-
-    pa_bool_t listening_for_all_signals;
-
-    /* Contains object paths. If this is empty, then signals from all objects
-     * are accepted. Only used when listening_for_all_signals == TRUE. */
-    pa_idxset *all_signals_objects;
-
-    /* Signal name -> idxset. The idxsets contain object paths. If an idxset is
-     * empty, then that signal is accepted from all objects. Only used when
-     * listening_for_all_signals == FALSE. */
-    pa_hashmap *listening_signals;
-};
-
-struct interface_entry {
-    char *name;
-    pa_hashmap *method_handlers;
-    pa_hashmap *method_signatures; /* Derived from method_handlers. Contains only "in" arguments. */
-    pa_hashmap *property_handlers;
-    pa_dbus_receive_cb_t get_all_properties_cb;
-    pa_dbus_signal_info *signals;
-    unsigned n_signals;
-    void *userdata;
-};
-
-char *pa_get_dbus_address_from_server_type(pa_server_type_t server_type) {
-    char *address = NULL;
-    char *runtime_path = NULL;
-    char *escaped_path = NULL;
-
-    switch (server_type) {
-        case PA_SERVER_TYPE_USER:
-            pa_assert_se((runtime_path = pa_runtime_path(PA_DBUS_SOCKET_NAME)));
-            pa_assert_se((escaped_path = dbus_address_escape_value(runtime_path)));
-            address = pa_sprintf_malloc("unix:path=%s", escaped_path);
-            break;
-
-        case PA_SERVER_TYPE_SYSTEM:
-            pa_assert_se((escaped_path = dbus_address_escape_value(PA_DBUS_SYSTEM_SOCKET_PATH)));
-            address = pa_sprintf_malloc("unix:path=%s", escaped_path);
-            break;
-
-        case PA_SERVER_TYPE_NONE:
-            address = pa_xnew0(char, 1);
-            break;
-
-        default:
-            pa_assert_not_reached();
-    }
-
-    pa_xfree(runtime_path);
-    pa_xfree(escaped_path);
-
-    return address;
-}
-
-static pa_dbus_protocol *dbus_protocol_new(pa_core *c) {
-    pa_dbus_protocol *p;
-    unsigned i;
-
-    pa_assert(c);
-
-    p = pa_xnew(pa_dbus_protocol, 1);
-    PA_REFCNT_INIT(p);
-    p->core = pa_core_ref(c);
-    p->objects = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    p->connections = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
-    p->extensions = pa_idxset_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    for (i = 0; i < PA_DBUS_PROTOCOL_HOOK_MAX; ++i)
-        pa_hook_init(&p->hooks[i], p);
-
-    pa_assert_se(pa_shared_set(c, "dbus-protocol", p) >= 0);
-
-    return p;
-}
-
-pa_dbus_protocol* pa_dbus_protocol_get(pa_core *c) {
-    pa_dbus_protocol *p;
-
-    if ((p = pa_shared_get(c, "dbus-protocol")))
-        return pa_dbus_protocol_ref(p);
-
-    return dbus_protocol_new(c);
-}
-
-pa_dbus_protocol* pa_dbus_protocol_ref(pa_dbus_protocol *p) {
-    pa_assert(p);
-    pa_assert(PA_REFCNT_VALUE(p) >= 1);
-
-    PA_REFCNT_INC(p);
-
-    return p;
-}
-
-void pa_dbus_protocol_unref(pa_dbus_protocol *p) {
-    unsigned i;
-
-    pa_assert(p);
-    pa_assert(PA_REFCNT_VALUE(p) >= 1);
-
-    if (PA_REFCNT_DEC(p) > 0)
-        return;
-
-    pa_assert(pa_hashmap_isempty(p->objects));
-    pa_assert(pa_hashmap_isempty(p->connections));
-    pa_assert(pa_idxset_isempty(p->extensions));
-
-    pa_hashmap_free(p->objects, NULL, NULL);
-    pa_hashmap_free(p->connections, NULL, NULL);
-    pa_idxset_free(p->extensions, NULL, NULL);
-
-    for (i = 0; i < PA_DBUS_PROTOCOL_HOOK_MAX; ++i)
-        pa_hook_done(&p->hooks[i]);
-
-    pa_assert_se(pa_shared_remove(p->core, "dbus-protocol") >= 0);
-
-    pa_core_unref(p->core);
-
-    pa_xfree(p);
-}
-
-static void update_introspection(struct object_entry *oe) {
-    pa_strbuf *buf;
-    void *interfaces_state = NULL;
-    struct interface_entry *iface_entry = NULL;
-
-    pa_assert(oe);
-
-    buf = pa_strbuf_new();
-    pa_strbuf_puts(buf, DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE);
-    pa_strbuf_puts(buf, "<node>\n");
-
-    PA_HASHMAP_FOREACH(iface_entry, oe->interfaces, interfaces_state) {
-        pa_dbus_method_handler *method_handler;
-        pa_dbus_property_handler *property_handler;
-        void *handlers_state = NULL;
-        unsigned i;
-        unsigned j;
-
-        pa_strbuf_printf(buf, " <interface name=\"%s\">\n", iface_entry->name);
-
-        PA_HASHMAP_FOREACH(method_handler, iface_entry->method_handlers, handlers_state) {
-            pa_strbuf_printf(buf, "  <method name=\"%s\">\n", method_handler->method_name);
-
-            for (i = 0; i < method_handler->n_arguments; ++i)
-                pa_strbuf_printf(buf, "   <arg name=\"%s\" type=\"%s\" direction=\"%s\"/>\n",
-                                 method_handler->arguments[i].name,
-                                 method_handler->arguments[i].type,
-                                 method_handler->arguments[i].direction);
-
-            pa_strbuf_puts(buf, "  </method>\n");
-        }
-
-        handlers_state = NULL;
-
-        PA_HASHMAP_FOREACH(property_handler, iface_entry->property_handlers, handlers_state)
-            pa_strbuf_printf(buf, "  <property name=\"%s\" type=\"%s\" access=\"%s\"/>\n",
-                             property_handler->property_name,
-                             property_handler->type,
-                             property_handler->get_cb ? (property_handler->set_cb ? "readwrite" : "read") : "write");
-
-        for (i = 0; i < iface_entry->n_signals; ++i) {
-            pa_strbuf_printf(buf, "  <signal name=\"%s\">\n", iface_entry->signals[i].name);
-
-            for (j = 0; j < iface_entry->signals[i].n_arguments; ++j)
-                pa_strbuf_printf(buf, "   <arg name=\"%s\" type=\"%s\"/>\n", iface_entry->signals[i].arguments[j].name,
-                                                                             iface_entry->signals[i].arguments[j].type);
-
-            pa_strbuf_puts(buf, "  </signal>\n");
-        }
-
-        pa_strbuf_puts(buf, " </interface>\n");
-    }
-
-    pa_strbuf_puts(buf, " <interface name=\"" DBUS_INTERFACE_INTROSPECTABLE "\">\n"
-                        "  <method name=\"Introspect\">\n"
-                        "   <arg name=\"data\" type=\"s\" direction=\"out\"/>\n"
-                        "  </method>\n"
-                        " </interface>\n"
-                        " <interface name=\"" DBUS_INTERFACE_PROPERTIES "\">\n"
-                        "  <method name=\"Get\">\n"
-                        "   <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n"
-                        "   <arg name=\"property_name\" type=\"s\" direction=\"in\"/>\n"
-                        "   <arg name=\"value\" type=\"v\" direction=\"out\"/>\n"
-                        "  </method>\n"
-                        "  <method name=\"Set\">\n"
-                        "   <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n"
-                        "   <arg name=\"property_name\" type=\"s\" direction=\"in\"/>\n"
-                        "   <arg name=\"value\" type=\"v\" direction=\"in\"/>\n"
-                        "  </method>\n"
-                        "  <method name=\"GetAll\">\n"
-                        "   <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n"
-                        "   <arg name=\"props\" type=\"a{sv}\" direction=\"out\"/>\n"
-                        "  </method>\n"
-                        " </interface>\n");
-
-    pa_strbuf_puts(buf, "</node>\n");
-
-    pa_xfree(oe->introspection);
-    oe->introspection = pa_strbuf_tostring_free(buf);
-}
-
-/* Return value of find_handler() and its subfunctions. */
-enum find_result_t {
-    /* The received message is a valid .Get call. */
-    FOUND_GET_PROPERTY,
-
-    /* The received message is a valid .Set call. */
-    FOUND_SET_PROPERTY,
-
-    /* The received message is a valid .GetAll call. */
-    FOUND_GET_ALL,
-
-    /* The received message is a valid method call. */
-    FOUND_METHOD,
-
-    /* The interface of the received message hasn't been registered for the
-     * destination object. */
-    NO_SUCH_INTERFACE,
-
-    /* No property handler was found for the received .Get or .Set call. */
-    NO_SUCH_PROPERTY,
-
-    /* The interface argument of a property call didn't match any registered
-     * interface. */
-    NO_SUCH_PROPERTY_INTERFACE,
-
-    /* The received message called .Get or .Set for a property whose access
-     * mode doesn't match the call. */
-    PROPERTY_ACCESS_DENIED,
-
-    /* The new value signature of a .Set call didn't match the expexted
-     * signature. */
-    INVALID_PROPERTY_SIG,
-
-    /* No method handler was found for the received message. */
-    NO_SUCH_METHOD,
-
-    /* The signature of the received message didn't match the expected
-     * signature. Despite the name, this can also be returned for a property
-     * call if its message signature is invalid. */
-    INVALID_METHOD_SIG
-};
-
-/* Data for resolving the correct reaction to a received message. */
-struct call_info {
-    DBusMessage *message; /* The received message. */
-    struct object_entry *obj_entry;
-    const char *interface; /* Destination interface name (extracted from the message). */
-    struct interface_entry *iface_entry;
-
-    const char *property; /* Property name (extracted from the message). */
-    const char *property_interface; /* The interface argument of a property call is stored here. */
-    pa_dbus_property_handler *property_handler;
-    const char *expected_property_sig; /* Property signature from the introspection data. */
-    const char *property_sig; /* The signature of the new value in the received .Set message. */
-    DBusMessageIter variant_iter; /* Iterator pointing to the beginning of the new value variant of a .Set call. */
-
-    const char *method; /* Method name (extracted from the message). */
-    pa_dbus_method_handler *method_handler;
-    const char *expected_method_sig; /* Method signature from the introspection data. */
-    const char *method_sig; /* The signature of the received message. */
-};
-
-/* Called when call_info->property has been set and the property interface has
- * not been given. In case of a Set call, call_info->property_sig is also set,
- * which is checked against the expected value in this function. */
-static enum find_result_t find_handler_by_property(struct call_info *call_info) {
-    void *state = NULL;
-
-    pa_assert(call_info);
-
-    PA_HASHMAP_FOREACH(call_info->iface_entry, call_info->obj_entry->interfaces, state) {
-        if ((call_info->property_handler = pa_hashmap_get(call_info->iface_entry->property_handlers, call_info->property))) {
-            if (pa_streq(call_info->method, "Get"))
-                return call_info->property_handler->get_cb ? FOUND_GET_PROPERTY : PROPERTY_ACCESS_DENIED;
-
-            else if (pa_streq(call_info->method, "Set")) {
-                call_info->expected_property_sig = call_info->property_handler->type;
-
-                if (pa_streq(call_info->property_sig, call_info->expected_property_sig))
-                    return call_info->property_handler->set_cb ? FOUND_SET_PROPERTY : PROPERTY_ACCESS_DENIED;
-                else
-                    return INVALID_PROPERTY_SIG;
-
-            } else
-                pa_assert_not_reached();
-        }
-    }
-
-    return NO_SUCH_PROPERTY;
-}
-
-static enum find_result_t find_handler_by_method(struct call_info *call_info) {
-    void *state = NULL;
-
-    pa_assert(call_info);
-
-    PA_HASHMAP_FOREACH(call_info->iface_entry, call_info->obj_entry->interfaces, state) {
-        if ((call_info->method_handler = pa_hashmap_get(call_info->iface_entry->method_handlers, call_info->method))) {
-            call_info->expected_method_sig = pa_hashmap_get(call_info->iface_entry->method_signatures, call_info->method);
-
-            if (pa_streq(call_info->method_sig, call_info->expected_method_sig))
-                return FOUND_METHOD;
-            else
-                return INVALID_METHOD_SIG;
-        }
-    }
-
-    return NO_SUCH_METHOD;
-}
-
-static enum find_result_t find_handler_from_properties_call(struct call_info *call_info) {
-    pa_assert(call_info);
-
-    if (pa_streq(call_info->method, "GetAll")) {
-        call_info->expected_method_sig = "s";
-        if (!pa_streq(call_info->method_sig, call_info->expected_method_sig))
-            return INVALID_METHOD_SIG;
-
-        pa_assert_se(dbus_message_get_args(call_info->message, NULL,
-                                           DBUS_TYPE_STRING, &call_info->property_interface,
-                                           DBUS_TYPE_INVALID));
-
-        if (*call_info->property_interface) {
-            if ((call_info->iface_entry = pa_hashmap_get(call_info->obj_entry->interfaces, call_info->property_interface)))
-                return FOUND_GET_ALL;
-            else
-                return NO_SUCH_PROPERTY_INTERFACE;
-
-        } else {
-            pa_assert_se(call_info->iface_entry = pa_hashmap_first(call_info->obj_entry->interfaces));
-            return FOUND_GET_ALL;
-        }
-
-    } else if (pa_streq(call_info->method, "Get")) {
-        call_info->expected_method_sig = "ss";
-        if (!pa_streq(call_info->method_sig, call_info->expected_method_sig))
-            return INVALID_METHOD_SIG;
-
-        pa_assert_se(dbus_message_get_args(call_info->message, NULL,
-                                           DBUS_TYPE_STRING, &call_info->property_interface,
-                                           DBUS_TYPE_STRING, &call_info->property,
-                                           DBUS_TYPE_INVALID));
-
-        if (*call_info->property_interface) {
-            if (!(call_info->iface_entry = pa_hashmap_get(call_info->obj_entry->interfaces, call_info->property_interface)))
-                return NO_SUCH_PROPERTY_INTERFACE;
-            else if ((call_info->property_handler =
-                        pa_hashmap_get(call_info->iface_entry->property_handlers, call_info->property)))
-                return FOUND_GET_PROPERTY;
-            else
-                return NO_SUCH_PROPERTY;
-
-        } else
-            return find_handler_by_property(call_info);
-
-    } else if (pa_streq(call_info->method, "Set")) {
-        DBusMessageIter msg_iter;
-
-        call_info->expected_method_sig = "ssv";
-        if (!pa_streq(call_info->method_sig, call_info->expected_method_sig))
-            return INVALID_METHOD_SIG;
-
-        pa_assert_se(dbus_message_iter_init(call_info->message, &msg_iter));
-
-        dbus_message_iter_get_basic(&msg_iter, &call_info->property_interface);
-        pa_assert_se(dbus_message_iter_next(&msg_iter));
-        dbus_message_iter_get_basic(&msg_iter, &call_info->property);
-        pa_assert_se(dbus_message_iter_next(&msg_iter));
-
-        dbus_message_iter_recurse(&msg_iter, &call_info->variant_iter);
-
-        call_info->property_sig = dbus_message_iter_get_signature(&call_info->variant_iter);
-
-        if (*call_info->property_interface) {
-            if (!(call_info->iface_entry = pa_hashmap_get(call_info->obj_entry->interfaces, call_info->property_interface)))
-                return NO_SUCH_PROPERTY_INTERFACE;
-
-            else if ((call_info->property_handler =
-                        pa_hashmap_get(call_info->iface_entry->property_handlers, call_info->property))) {
-                call_info->expected_property_sig = call_info->property_handler->type;
-
-                if (pa_streq(call_info->property_sig, call_info->expected_property_sig))
-                    return FOUND_SET_PROPERTY;
-                else
-                    return INVALID_PROPERTY_SIG;
-
-            } else
-                return NO_SUCH_PROPERTY;
-
-        } else
-            return find_handler_by_property(call_info);
-
-    } else
-        pa_assert_not_reached();
-}
-
-static enum find_result_t find_handler(struct call_info *call_info) {
-    pa_assert(call_info);
-
-    if (call_info->interface) {
-        if (pa_streq(call_info->interface, DBUS_INTERFACE_PROPERTIES))
-            return find_handler_from_properties_call(call_info);
-
-        else if (!(call_info->iface_entry = pa_hashmap_get(call_info->obj_entry->interfaces, call_info->interface)))
-            return NO_SUCH_INTERFACE;
-
-        else if ((call_info->method_handler = pa_hashmap_get(call_info->iface_entry->method_handlers, call_info->method)))
-            return FOUND_METHOD;
-
-        else
-            return NO_SUCH_METHOD;
-
-    } else { /* The method call doesn't contain an interface. */
-        if (pa_streq(call_info->method, "Get") || pa_streq(call_info->method, "Set") || pa_streq(call_info->method, "GetAll")) {
-            if (find_handler_by_method(call_info) == FOUND_METHOD)
-                /* The object has a method named Get, Set or GetAll in some other interface than .Properties. */
-                return FOUND_METHOD;
-            else
-                /* Assume this is a .Properties call. */
-                return find_handler_from_properties_call(call_info);
-
-        } else /* This is not a .Properties call. */
-            return find_handler_by_method(call_info);
-    }
-}
-
-static DBusHandlerResult handle_message_cb(DBusConnection *connection, DBusMessage *message, void *user_data) {
-    pa_dbus_protocol *p = user_data;
-    struct call_info call_info;
-
-    pa_assert(connection);
-    pa_assert(message);
-    pa_assert(p);
-    pa_assert(p->objects);
-
-    if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-    pa_log_debug("Received message: destination = %s, interface = %s, member = %s",
-                 dbus_message_get_path(message),
-                 dbus_message_get_interface(message),
-                 dbus_message_get_member(message));
-
-    call_info.message = message;
-    pa_assert_se(call_info.obj_entry = pa_hashmap_get(p->objects, dbus_message_get_path(message)));
-    call_info.interface = dbus_message_get_interface(message);
-    pa_assert_se(call_info.method = dbus_message_get_member(message));
-    pa_assert_se(call_info.method_sig = dbus_message_get_signature(message));
-
-    if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Introspectable", "Introspect") ||
-        (!dbus_message_get_interface(message) && dbus_message_has_member(message, "Introspect"))) {
-        pa_dbus_send_basic_value_reply(connection, message, DBUS_TYPE_STRING, &call_info.obj_entry->introspection);
-        goto finish;
-    }
-
-    switch (find_handler(&call_info)) {
-        case FOUND_GET_PROPERTY:
-            call_info.property_handler->get_cb(connection, message, call_info.iface_entry->userdata);
-            break;
-
-        case FOUND_SET_PROPERTY:
-            call_info.property_handler->set_cb(connection, message, &call_info.variant_iter, call_info.iface_entry->userdata);
-            break;
-
-        case FOUND_METHOD:
-            call_info.method_handler->receive_cb(connection, message, call_info.iface_entry->userdata);
-            break;
-
-        case FOUND_GET_ALL:
-            if (call_info.iface_entry->get_all_properties_cb)
-                call_info.iface_entry->get_all_properties_cb(connection, message, call_info.iface_entry->userdata);
-            else {
-                DBusMessage *dummy_reply = NULL;
-                DBusMessageIter msg_iter;
-                DBusMessageIter dict_iter;
-
-                pa_assert_se(dummy_reply = dbus_message_new_method_return(message));
-                dbus_message_iter_init_append(dummy_reply, &msg_iter);
-                pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter));
-                pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
-                pa_assert_se(dbus_connection_send(connection, dummy_reply, NULL));
-                dbus_message_unref(dummy_reply);
-            }
-            break;
-
-        case PROPERTY_ACCESS_DENIED:
-            pa_dbus_send_error(connection, message, DBUS_ERROR_ACCESS_DENIED,
-                               "%s access denied for property %s", call_info.method, call_info.property);
-            break;
-
-        case NO_SUCH_METHOD:
-            pa_dbus_send_error(connection, message, DBUS_ERROR_UNKNOWN_METHOD, "No such method: %s", call_info.method);
-            break;
-
-        case NO_SUCH_INTERFACE:
-            pa_dbus_send_error(connection, message, PA_DBUS_ERROR_NO_SUCH_INTERFACE, "No such interface: %s", call_info.interface);
-            break;
-
-        case NO_SUCH_PROPERTY:
-            pa_dbus_send_error(connection, message, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "No such property: %s", call_info.property);
-            break;
-
-        case NO_SUCH_PROPERTY_INTERFACE:
-            pa_dbus_send_error(connection, message, PA_DBUS_ERROR_NO_SUCH_INTERFACE, "No such property interface: %s", call_info.property_interface);
-            break;
-
-        case INVALID_METHOD_SIG:
-            pa_dbus_send_error(connection, message, DBUS_ERROR_INVALID_ARGS,
-                               "Invalid signature for method %s: '%s'. Expected '%s'.",
-                               call_info.method, call_info.method_sig, call_info.expected_method_sig);
-            break;
-
-        case INVALID_PROPERTY_SIG:
-            pa_dbus_send_error(connection, message, DBUS_ERROR_INVALID_ARGS,
-                               "Invalid signature for property %s: '%s'. Expected '%s'.",
-                               call_info.property, call_info.property_sig, call_info.expected_property_sig);
-            break;
-
-        default:
-            pa_assert_not_reached();
-    }
-
-finish:
-    return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusObjectPathVTable vtable = {
-    .unregister_function = NULL,
-    .message_function = handle_message_cb,
-    .dbus_internal_pad1 = NULL,
-    .dbus_internal_pad2 = NULL,
-    .dbus_internal_pad3 = NULL,
-    .dbus_internal_pad4 = NULL
-};
-
-static void register_object(pa_dbus_protocol *p, struct object_entry *obj_entry) {
-    struct connection_entry *conn_entry;
-    void *state = NULL;
-
-    pa_assert(p);
-    pa_assert(obj_entry);
-
-    PA_HASHMAP_FOREACH(conn_entry, p->connections, state)
-        pa_assert_se(dbus_connection_register_object_path(conn_entry->connection, obj_entry->path, &vtable, p));
-}
-
-static pa_dbus_arg_info *copy_args(const pa_dbus_arg_info *src, unsigned n) {
-    pa_dbus_arg_info *dst;
-    unsigned i;
-
-    if (n == 0)
-        return NULL;
-
-    pa_assert(src);
-
-    dst = pa_xnew0(pa_dbus_arg_info, n);
-
-    for (i = 0; i < n; ++i) {
-        dst[i].name = pa_xstrdup(src[i].name);
-        dst[i].type = pa_xstrdup(src[i].type);
-        dst[i].direction = pa_xstrdup(src[i].direction);
-    }
-
-    return dst;
-}
-
-static pa_hashmap *create_method_handlers(const pa_dbus_interface_info *info) {
-    pa_hashmap *handlers;
-    unsigned i;
-
-    pa_assert(info);
-    pa_assert(info->method_handlers || info->n_method_handlers == 0);
-
-    handlers = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    for (i = 0; i < info->n_method_handlers; ++i) {
-        pa_dbus_method_handler *h = pa_xnew(pa_dbus_method_handler, 1);
-        h->method_name = pa_xstrdup(info->method_handlers[i].method_name);
-        h->arguments = copy_args(info->method_handlers[i].arguments, info->method_handlers[i].n_arguments);
-        h->n_arguments = info->method_handlers[i].n_arguments;
-        h->receive_cb = info->method_handlers[i].receive_cb;
-
-        pa_hashmap_put(handlers, h->method_name, h);
-    }
-
-    return handlers;
-}
-
-static pa_hashmap *extract_method_signatures(pa_hashmap *method_handlers) {
-    pa_hashmap *signatures = NULL;
-    pa_dbus_method_handler *handler = NULL;
-    void *state = NULL;
-    pa_strbuf *sig_buf = NULL;
-    unsigned i = 0;
-
-    pa_assert(method_handlers);
-
-    signatures = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    PA_HASHMAP_FOREACH(handler, method_handlers, state) {
-        sig_buf = pa_strbuf_new();
-
-        for (i = 0; i < handler->n_arguments; ++i) {
-            if (pa_streq(handler->arguments[i].direction, "in"))
-                pa_strbuf_puts(sig_buf, handler->arguments[i].type);
-        }
-
-        pa_hashmap_put(signatures, handler->method_name, pa_strbuf_tostring_free(sig_buf));
-    }
-
-    return signatures;
-}
-
-static pa_hashmap *create_property_handlers(const pa_dbus_interface_info *info) {
-    pa_hashmap *handlers;
-    unsigned i = 0;
-
-    pa_assert(info);
-    pa_assert(info->property_handlers || info->n_property_handlers == 0);
-
-    handlers = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    for (i = 0; i < info->n_property_handlers; ++i) {
-        pa_dbus_property_handler *h = pa_xnew(pa_dbus_property_handler, 1);
-        h->property_name = pa_xstrdup(info->property_handlers[i].property_name);
-        h->type = pa_xstrdup(info->property_handlers[i].type);
-        h->get_cb = info->property_handlers[i].get_cb;
-        h->set_cb = info->property_handlers[i].set_cb;
-
-        pa_hashmap_put(handlers, h->property_name, h);
-    }
-
-    return handlers;
-}
-
-static pa_dbus_signal_info *copy_signals(const pa_dbus_interface_info *info) {
-    pa_dbus_signal_info *dst;
-    unsigned i;
-
-    pa_assert(info);
-
-    if (info->n_signals == 0)
-        return NULL;
-
-    pa_assert(info->signals);
-
-    dst = pa_xnew(pa_dbus_signal_info, info->n_signals);
-
-    for (i = 0; i < info->n_signals; ++i) {
-        dst[i].name = pa_xstrdup(info->signals[i].name);
-        dst[i].arguments = copy_args(info->signals[i].arguments, info->signals[i].n_arguments);
-        dst[i].n_arguments = info->signals[i].n_arguments;
-    }
-
-    return dst;
-}
-
-int pa_dbus_protocol_add_interface(pa_dbus_protocol *p,
-                                   const char *path,
-                                   const pa_dbus_interface_info *info,
-                                   void *userdata) {
-    struct object_entry *obj_entry;
-    struct interface_entry *iface_entry;
-    pa_bool_t obj_entry_created = FALSE;
-
-    pa_assert(p);
-    pa_assert(path);
-    pa_assert(info);
-    pa_assert(info->name);
-    pa_assert(info->method_handlers || info->n_method_handlers == 0);
-    pa_assert(info->property_handlers || info->n_property_handlers == 0);
-    pa_assert(info->get_all_properties_cb || info->n_property_handlers == 0);
-    pa_assert(info->signals || info->n_signals == 0);
-
-    if (!(obj_entry = pa_hashmap_get(p->objects, path))) {
-        obj_entry = pa_xnew(struct object_entry, 1);
-        obj_entry->path = pa_xstrdup(path);
-        obj_entry->interfaces = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-        obj_entry->introspection = NULL;
-
-        pa_hashmap_put(p->objects, path, obj_entry);
-        obj_entry_created = TRUE;
-    }
-
-    if (pa_hashmap_get(obj_entry->interfaces, info->name) != NULL)
-        goto fail; /* The interface was already registered. */
-
-    iface_entry = pa_xnew(struct interface_entry, 1);
-    iface_entry->name = pa_xstrdup(info->name);
-    iface_entry->method_handlers = create_method_handlers(info);
-    iface_entry->method_signatures = extract_method_signatures(iface_entry->method_handlers);
-    iface_entry->property_handlers = create_property_handlers(info);
-    iface_entry->get_all_properties_cb = info->get_all_properties_cb;
-    iface_entry->signals = copy_signals(info);
-    iface_entry->n_signals = info->n_signals;
-    iface_entry->userdata = userdata;
-    pa_hashmap_put(obj_entry->interfaces, iface_entry->name, iface_entry);
-
-    update_introspection(obj_entry);
-
-    if (obj_entry_created)
-        register_object(p, obj_entry);
-
-    pa_log_debug("Interface %s added for object %s", iface_entry->name, obj_entry->path);
-
-    return 0;
-
-fail:
-    if (obj_entry_created) {
-        pa_hashmap_remove(p->objects, path);
-        pa_xfree(obj_entry);
-    }
-
-    return -1;
-}
-
-static void unregister_object(pa_dbus_protocol *p, struct object_entry *obj_entry) {
-    struct connection_entry *conn_entry;
-    void *state = NULL;
-
-    pa_assert(p);
-    pa_assert(obj_entry);
-
-    PA_HASHMAP_FOREACH(conn_entry, p->connections, state)
-        pa_assert_se(dbus_connection_unregister_object_path(conn_entry->connection, obj_entry->path));
-}
-
-static void method_handler_free_cb(void *p, void *userdata) {
-    pa_dbus_method_handler *h = p;
-    unsigned i;
-
-    pa_assert(h);
-
-    pa_xfree((char *) h->method_name);
-
-    for (i = 0; i < h->n_arguments; ++i) {
-        pa_xfree((char *) h->arguments[i].name);
-        pa_xfree((char *) h->arguments[i].type);
-        pa_xfree((char *) h->arguments[i].direction);
-    }
-
-    pa_xfree((pa_dbus_arg_info *) h->arguments);
-}
-
-static void method_signature_free_cb(void *p, void *userdata) {
-    pa_assert(p);
-
-    pa_xfree(p);
-}
-
-static void property_handler_free_cb(void *p, void *userdata) {
-    pa_dbus_property_handler *h = p;
-
-    pa_assert(h);
-
-    pa_xfree((char *) h->property_name);
-    pa_xfree((char *) h->type);
-
-    pa_xfree(h);
-}
-
-int pa_dbus_protocol_remove_interface(pa_dbus_protocol *p, const char* path, const char* interface) {
-    struct object_entry *obj_entry;
-    struct interface_entry *iface_entry;
-    unsigned i;
-
-    pa_assert(p);
-    pa_assert(path);
-    pa_assert(interface);
-
-    if (!(obj_entry = pa_hashmap_get(p->objects, path)))
-        return -1;
-
-    if (!(iface_entry = pa_hashmap_remove(obj_entry->interfaces, interface)))
-        return -1;
-
-    update_introspection(obj_entry);
-
-    pa_log_debug("Interface %s removed from object %s", iface_entry->name, obj_entry->path);
-
-    pa_xfree(iface_entry->name);
-    pa_hashmap_free(iface_entry->method_handlers, method_handler_free_cb, NULL);
-    pa_hashmap_free(iface_entry->method_signatures, method_signature_free_cb, NULL);
-    pa_hashmap_free(iface_entry->property_handlers, property_handler_free_cb, NULL);
-
-    for (i = 0; i < iface_entry->n_signals; ++i) {
-        unsigned j;
-
-        pa_xfree((char *) iface_entry->signals[i].name);
-
-        for (j = 0; j < iface_entry->signals[i].n_arguments; ++j) {
-            pa_xfree((char *) iface_entry->signals[i].arguments[j].name);
-            pa_xfree((char *) iface_entry->signals[i].arguments[j].type);
-            pa_assert(iface_entry->signals[i].arguments[j].direction == NULL);
-        }
-
-        pa_xfree((pa_dbus_arg_info *) iface_entry->signals[i].arguments);
-    }
-
-    pa_xfree(iface_entry->signals);
-    pa_xfree(iface_entry);
-
-    if (pa_hashmap_isempty(obj_entry->interfaces)) {
-        unregister_object(p, obj_entry);
-
-        pa_hashmap_remove(p->objects, path);
-        pa_xfree(obj_entry->path);
-        pa_hashmap_free(obj_entry->interfaces, NULL, NULL);
-        pa_xfree(obj_entry->introspection);
-        pa_xfree(obj_entry);
-    }
-
-    return 0;
-}
-
-static void register_all_objects(pa_dbus_protocol *p, DBusConnection *conn) {
-    struct object_entry *obj_entry;
-    void *state = NULL;
-
-    pa_assert(p);
-    pa_assert(conn);
-
-    PA_HASHMAP_FOREACH(obj_entry, p->objects, state)
-        pa_assert_se(dbus_connection_register_object_path(conn, obj_entry->path, &vtable, p));
-}
-
-int pa_dbus_protocol_register_connection(pa_dbus_protocol *p, DBusConnection *conn, pa_client *client) {
-    struct connection_entry *conn_entry;
-
-    pa_assert(p);
-    pa_assert(conn);
-    pa_assert(client);
-
-    if (pa_hashmap_get(p->connections, conn))
-        return -1; /* The connection was already registered. */
-
-    register_all_objects(p, conn);
-
-    conn_entry = pa_xnew(struct connection_entry, 1);
-    conn_entry->connection = dbus_connection_ref(conn);
-    conn_entry->client = client;
-    conn_entry->listening_for_all_signals = FALSE;
-    conn_entry->all_signals_objects = pa_idxset_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-    conn_entry->listening_signals = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    pa_hashmap_put(p->connections, conn, conn_entry);
-
-    return 0;
-}
-
-static void unregister_all_objects(pa_dbus_protocol *p, DBusConnection *conn) {
-    struct object_entry *obj_entry;
-    void *state = NULL;
-
-    pa_assert(p);
-    pa_assert(conn);
-
-    PA_HASHMAP_FOREACH(obj_entry, p->objects, state)
-        pa_assert_se(dbus_connection_unregister_object_path(conn, obj_entry->path));
-}
-
-static void free_listened_object_name_cb(void *p, void *userdata) {
-    pa_assert(p);
-
-    pa_xfree(p);
-}
-
-static void free_listening_signals_idxset_cb(void *p, void *userdata) {
-    pa_idxset *set = p;
-
-    pa_assert(set);
-
-    pa_idxset_free(set, free_listened_object_name_cb, NULL);
-}
-
-int pa_dbus_protocol_unregister_connection(pa_dbus_protocol *p, DBusConnection *conn) {
-    struct connection_entry *conn_entry;
-
-    pa_assert(p);
-    pa_assert(conn);
-
-    if (!(conn_entry = pa_hashmap_remove(p->connections, conn)))
-        return -1;
-
-    unregister_all_objects(p, conn);
-
-    dbus_connection_unref(conn_entry->connection);
-    pa_idxset_free(conn_entry->all_signals_objects, free_listened_object_name_cb, NULL);
-    pa_hashmap_free(conn_entry->listening_signals, free_listening_signals_idxset_cb, NULL);
-    pa_xfree(conn_entry);
-
-    return 0;
-}
-
-pa_client *pa_dbus_protocol_get_client(pa_dbus_protocol *p, DBusConnection *conn) {
-    struct connection_entry *conn_entry;
-
-    pa_assert(p);
-    pa_assert(conn);
-
-    if (!(conn_entry = pa_hashmap_get(p->connections, conn)))
-        return NULL;
-
-    return conn_entry->client;
-}
-
-void pa_dbus_protocol_add_signal_listener(
-        pa_dbus_protocol *p,
-        DBusConnection *conn,
-        const char *signal_name,
-        char **objects,
-        unsigned n_objects) {
-    struct connection_entry *conn_entry;
-    pa_idxset *object_set;
-    char *object_path;
-    unsigned i;
-
-    pa_assert(p);
-    pa_assert(conn);
-    pa_assert(objects || n_objects == 0);
-
-    pa_assert_se((conn_entry = pa_hashmap_get(p->connections, conn)));
-
-    /* all_signals_objects will either be emptied or replaced with new objects,
-     * so we empty it here unconditionally. If listening_for_all_signals is
-     * currently FALSE, the idxset is empty already. */
-    while ((object_path = pa_idxset_steal_first(conn_entry->all_signals_objects, NULL)))
-        pa_xfree(object_path);
-
-    if (signal_name) {
-        conn_entry->listening_for_all_signals = FALSE;
-
-        /* Replace the old object list with a new one. */
-        if ((object_set = pa_hashmap_remove(conn_entry->listening_signals, signal_name)))
-            pa_idxset_free(object_set, free_listened_object_name_cb, NULL);
-        object_set = pa_idxset_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-        for (i = 0; i < n_objects; ++i)
-            pa_idxset_put(object_set, pa_xstrdup(objects[i]), NULL);
-
-        pa_hashmap_put(conn_entry->listening_signals, signal_name, object_set);
-
-    } else {
-        conn_entry->listening_for_all_signals = TRUE;
-
-        /* We're not interested in individual signals anymore, so let's empty
-         * listening_signals. */
-        while ((object_set = pa_hashmap_steal_first(conn_entry->listening_signals)))
-            pa_idxset_free(object_set, free_listened_object_name_cb, NULL);
-
-        for (i = 0; i < n_objects; ++i)
-            pa_idxset_put(conn_entry->all_signals_objects, pa_xstrdup(objects[i]), NULL);
-    }
-}
-
-void pa_dbus_protocol_remove_signal_listener(pa_dbus_protocol *p, DBusConnection *conn, const char *signal_name) {
-    struct connection_entry *conn_entry;
-    pa_idxset *object_set;
-
-    pa_assert(p);
-    pa_assert(conn);
-
-    pa_assert_se((conn_entry = pa_hashmap_get(p->connections, conn)));
-
-    if (signal_name) {
-        if ((object_set = pa_hashmap_get(conn_entry->listening_signals, signal_name)))
-            pa_idxset_free(object_set, free_listened_object_name_cb, NULL);
-
-    } else {
-        char *object_path;
-
-        conn_entry->listening_for_all_signals = FALSE;
-
-        while ((object_path = pa_idxset_steal_first(conn_entry->all_signals_objects, NULL)))
-            pa_xfree(object_path);
-
-        while ((object_set = pa_hashmap_steal_first(conn_entry->listening_signals)))
-            pa_idxset_free(object_set, free_listened_object_name_cb, NULL);
-    }
-}
-
-void pa_dbus_protocol_send_signal(pa_dbus_protocol *p, DBusMessage *signal_name) {
-    struct connection_entry *conn_entry;
-    void *state = NULL;
-    pa_idxset *object_set;
-    DBusMessage *signal_copy;
-    char *signal_string;
-
-    pa_assert(p);
-    pa_assert(signal_name);
-    pa_assert(dbus_message_get_type(signal_name) == DBUS_MESSAGE_TYPE_SIGNAL);
-    pa_assert_se(dbus_message_get_interface(signal_name));
-    pa_assert_se(dbus_message_get_member(signal_name));
-
-    signal_string = pa_sprintf_malloc("%s.%s", dbus_message_get_interface(signal_name), dbus_message_get_member(signal_name));
-
-    PA_HASHMAP_FOREACH(conn_entry, p->connections, state) {
-        if ((conn_entry->listening_for_all_signals /* Case 1: listening for all signals */
-             && (pa_idxset_get_by_data(conn_entry->all_signals_objects, dbus_message_get_path(signal_name), NULL)
-                 || pa_idxset_isempty(conn_entry->all_signals_objects)))
-
-            || (!conn_entry->listening_for_all_signals /* Case 2: not listening for all signals */
-                && (object_set = pa_hashmap_get(conn_entry->listening_signals, signal_string))
-                && (pa_idxset_get_by_data(object_set, dbus_message_get_path(signal_name), NULL)
-                    || pa_idxset_isempty(object_set)))) {
-
-            pa_assert_se(signal_copy = dbus_message_copy(signal_name));
-            pa_assert_se(dbus_connection_send(conn_entry->connection, signal_copy, NULL));
-            dbus_message_unref(signal_copy);
-        }
-    }
-
-    pa_xfree(signal_string);
-}
-
-const char **pa_dbus_protocol_get_extensions(pa_dbus_protocol *p, unsigned *n) {
-    const char **extensions;
-    const char *ext_name;
-    void *state = NULL;
-    unsigned i = 0;
-
-    pa_assert(p);
-    pa_assert(n);
-
-    *n = pa_idxset_size(p->extensions);
-
-    if (*n <= 0)
-        return NULL;
-
-    extensions = pa_xnew(const char *, *n);
-
-    while ((ext_name = pa_idxset_iterate(p->extensions, &state, NULL)))
-        extensions[i++] = ext_name;
-
-    return extensions;
-}
-
-int pa_dbus_protocol_register_extension(pa_dbus_protocol *p, const char *name) {
-    char *internal_name;
-
-    pa_assert(p);
-    pa_assert(name);
-
-    internal_name = pa_xstrdup(name);
-
-    if (pa_idxset_put(p->extensions, internal_name, NULL) < 0) {
-        pa_xfree(internal_name);
-        return -1;
-    }
-
-    pa_hook_fire(&p->hooks[PA_DBUS_PROTOCOL_HOOK_EXTENSION_REGISTERED], internal_name);
-
-    return 0;
-}
-
-int pa_dbus_protocol_unregister_extension(pa_dbus_protocol *p, const char *name) {
-    char *internal_name;
-
-    pa_assert(p);
-    pa_assert(name);
-
-    if (!(internal_name = pa_idxset_remove_by_data(p->extensions, name, NULL)))
-        return -1;
-
-    pa_hook_fire(&p->hooks[PA_DBUS_PROTOCOL_HOOK_EXTENSION_UNREGISTERED], internal_name);
-
-    pa_xfree(internal_name);
-
-    return 0;
-}
-
-pa_hook_slot *pa_dbus_protocol_hook_connect(
-        pa_dbus_protocol *p,
-        pa_dbus_protocol_hook_t hook,
-        pa_hook_priority_t prio,
-        pa_hook_cb_t cb,
-        void *data) {
-    pa_assert(p);
-    pa_assert(hook < PA_DBUS_PROTOCOL_HOOK_MAX);
-    pa_assert(cb);
-
-    return pa_hook_connect(&p->hooks[hook], prio, cb, data);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-dbus.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-dbus.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-dbus.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-dbus.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,218 +0,0 @@
-#ifndef fooprotocoldbushfoo
-#define fooprotocoldbushfoo
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Tanu Kaskinen
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#include <dbus/dbus.h>
-
-#include <pulsecore/core.h>
-#include <pulsecore/macro.h>
-
-#define PA_DBUS_DEFAULT_PORT 24883
-#define PA_DBUS_SOCKET_NAME "dbus-socket"
-
-#define PA_DBUS_SYSTEM_SOCKET_PATH PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_DBUS_SOCKET_NAME
-
-#define PA_DBUS_CORE_INTERFACE "org.PulseAudio.Core1"
-#define PA_DBUS_CORE_OBJECT_PATH "/org/pulseaudio/core1"
-
-#define PA_DBUS_ERROR_NO_SUCH_INTERFACE PA_DBUS_CORE_INTERFACE ".NoSuchInterfaceError"
-#define PA_DBUS_ERROR_NO_SUCH_PROPERTY PA_DBUS_CORE_INTERFACE ".NoSuchPropertyError"
-#define PA_DBUS_ERROR_NOT_FOUND PA_DBUS_CORE_INTERFACE ".NotFoundError"
-
-/* Returns the default address of the server type in the escaped form. For
- * PA_SERVER_TYPE_NONE an empty string is returned. The caller frees the
- * string. */
-char *pa_get_dbus_address_from_server_type(pa_server_type_t server_type);
-
-typedef struct pa_dbus_protocol pa_dbus_protocol;
-
-/* This function either creates a new pa_dbus_protocol object, or if one
- * already exists, increases the reference count. */
-pa_dbus_protocol* pa_dbus_protocol_get(pa_core *c);
-
-pa_dbus_protocol* pa_dbus_protocol_ref(pa_dbus_protocol *p);
-void pa_dbus_protocol_unref(pa_dbus_protocol *p);
-
-/* Called when a received message needs handling. Completely ignoring the
- * message isn't a good idea; if you can't handle the message, reply with an
- * error.
- *
- * The message signature is already checked against the introspection data, so
- * you don't have to do that yourself.
- *
- * All messages are method calls. */
-typedef void (*pa_dbus_receive_cb_t)(DBusConnection *conn, DBusMessage *msg, void *userdata);
-
-/* A specialized version of pa_dbus_receive_cb_t: the additional iterator
- * argument points to the element inside the new value variant.
- *
- * The new value signature is checked against the introspection data, so you
- * don't have to do that yourself. */
-typedef void (*pa_dbus_set_property_cb_t)(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata);
-
-typedef struct pa_dbus_arg_info {
-    const char *name;
-    const char *type;
-    const char *direction; /* NULL for signal arguments. */
-} pa_dbus_arg_info;
-
-typedef struct pa_dbus_signal_info {
-    const char *name;
-    const pa_dbus_arg_info *arguments; /* NULL, if the signal has no args. */
-    unsigned n_arguments;
-} pa_dbus_signal_info;
-
-typedef struct pa_dbus_method_handler {
-    const char *method_name;
-    const pa_dbus_arg_info *arguments; /* NULL, if the method has no args. */
-    unsigned n_arguments;
-    pa_dbus_receive_cb_t receive_cb;
-} pa_dbus_method_handler;
-
-typedef struct pa_dbus_property_handler {
-    const char *property_name;
-    const char *type;
-
-    /* The access mode for the property is determined by checking whether
-     * get_cb or set_cb is NULL. */
-    pa_dbus_receive_cb_t get_cb;
-    pa_dbus_set_property_cb_t set_cb;
-} pa_dbus_property_handler;
-
-typedef struct pa_dbus_interface_info {
-    const char* name;
-    const pa_dbus_method_handler *method_handlers; /* NULL, if the interface has no methods. */
-    unsigned n_method_handlers;
-    const pa_dbus_property_handler *property_handlers; /* NULL, if the interface has no properties. */
-    unsigned n_property_handlers;
-    const pa_dbus_receive_cb_t get_all_properties_cb; /* May be NULL, in which case GetAll returns an error. */
-    const pa_dbus_signal_info *signals; /* NULL, if the interface has no signals. */
-    unsigned n_signals;
-} pa_dbus_interface_info;
-
-
-/* The following functions may only be called from the main thread. */
-
-/* Registers the given interface to the given object path. It doesn't matter
- * whether or not the object has already been registered; if it is, then its
- * interface set is extended.
- *
- * Introspection requests are handled automatically.
- *
- * Userdata is passed to all the callbacks.
- *
- * Fails and returns a negative number if the object already has the interface
- * registered. */
-int pa_dbus_protocol_add_interface(pa_dbus_protocol *p, const char *path, const pa_dbus_interface_info *info, void *userdata);
-
-/* Returns a negative number if the given object doesn't have the given
- * interface registered. */
-int pa_dbus_protocol_remove_interface(pa_dbus_protocol *p, const char* path, const char* interface);
-
-/* Fails and returns a negative number if the connection is already
- * registered. */
-int pa_dbus_protocol_register_connection(pa_dbus_protocol *p, DBusConnection *conn, pa_client *client);
-
-/* Returns a negative number if the connection isn't registered. */
-int pa_dbus_protocol_unregister_connection(pa_dbus_protocol *p, DBusConnection *conn);
-
-/* Returns NULL if the connection isn't registered. */
-pa_client *pa_dbus_protocol_get_client(pa_dbus_protocol *p, DBusConnection *conn);
-
-/* Enables signal receiving for the given connection. The connection must have
- * been registered earlier. The signal string must contain both the signal
- * interface and the signal name, concatenated using a period as the separator.
- *
- * If the signal argument is NULL, all signals will be sent to the connection,
- * otherwise calling this function only adds the given signal to the list of
- * signals that will be delivered to the connection.
- *
- * The objects argument is a list of object paths. If the list is not empty,
- * only signals from the given objects are delivered. If this function is
- * called multiple time for the same connection and signal, the latest call
- * always replaces the previous object list. */
-void pa_dbus_protocol_add_signal_listener(
-        pa_dbus_protocol *p,
-        DBusConnection *conn,
-        const char *signal,
-        char **objects,
-        unsigned n_objects);
-
-/* Disables the delivery of the signal for the given connection. The connection
- * must have been registered. If signal is NULL, all signals are disabled. If
- * signal is non-NULL and _add_signal_listener() was previously called with
- * NULL signal (causing all signals to be enabled), this function doesn't do
- * anything. Also, if the signal wasn't enabled before, this function doesn't
- * do anything in that case either. */
-void pa_dbus_protocol_remove_signal_listener(pa_dbus_protocol *p, DBusConnection *conn, const char *signal);
-
-/* Sends the given signal to all interested clients. By default no signals are
- * sent - clients have to explicitly to request signals by calling
- * .Core1.ListenForSignal. That method's handler then calls
- * pa_dbus_protocol_add_signal_listener(). */
-void pa_dbus_protocol_send_signal(pa_dbus_protocol *p, DBusMessage *signal);
-
-/* Returns an array of extension identifier strings. The strings pointers point
- * to the internal copies, so don't free the strings. The caller must free the
- * array, however. Also, do not save the returned pointer or any of the string
- * pointers, because the contained strings may be freed at any time. If you
- * need to save the array, copy it. */
-const char **pa_dbus_protocol_get_extensions(pa_dbus_protocol *p, unsigned *n);
-
-/* Modules that want to provide a D-Bus interface for clients should register
- * an identifier that the clients can use to check whether the additional
- * functionality is available.
- *
- * This function registers the extension with the given name. It is recommended
- * that the name follows the D-Bus interface naming convention, so that the
- * names remain unique in case there will be at some point in the future
- * extensions that aren't included with the main PulseAudio source tree. For
- * in-tree extensions the convention is to use the org.PulseAudio.Ext
- * namespace.
- *
- * It is suggested that the name contains a version number, and whenever the
- * extension interface is modified in non-backwards compatible way, the version
- * number is incremented.
- *
- * Fails and returns a negative number if the extension is already registered.
- */
-int pa_dbus_protocol_register_extension(pa_dbus_protocol *p, const char *name);
-
-/* Returns a negative number if the extension isn't registered. */
-int pa_dbus_protocol_unregister_extension(pa_dbus_protocol *p, const char *name);
-
-/* All hooks have the pa_dbus_protocol object as hook data. */
-typedef enum pa_dbus_protocol_hook {
-    PA_DBUS_PROTOCOL_HOOK_EXTENSION_REGISTERED, /* Extension name as call data. */
-    PA_DBUS_PROTOCOL_HOOK_EXTENSION_UNREGISTERED, /* Extension name as call data. */
-    PA_DBUS_PROTOCOL_HOOK_MAX
-} pa_dbus_protocol_hook_t;
-
-pa_hook_slot *pa_dbus_protocol_hook_connect(
-        pa_dbus_protocol *p,
-        pa_dbus_protocol_hook_t hook,
-        pa_hook_priority_t prio,
-        pa_hook_cb_t cb,
-        void *data);
-
-#endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-esound.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-esound.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-esound.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-esound.c	2010-01-15 23:21:19.000000000 +0000
@@ -389,6 +389,7 @@
     size_t l;
     pa_sink *sink = NULL;
     pa_sink_input_new_data sdata;
+    pa_memchunk silence;
 
     connection_assert_ref(c);
     pa_assert(data);
@@ -435,6 +436,7 @@
     CHECK_VALIDITY(c->sink_input, "Failed to create sink input.");
 
     l = (size_t) ((double) pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS);
+    pa_sink_input_get_silence(c->sink_input, &silence);
     c->input_memblockq = pa_memblockq_new(
             0,
             l,
@@ -443,7 +445,8 @@
             (size_t) -1,
             l/PLAYBACK_BUFFER_FRAGMENTS,
             0,
-            NULL);
+            &silence);
+    pa_memblock_unref(silence.memblock);
     pa_iochannel_socket_set_rcvbuf(c->io, l);
 
     c->sink_input->parent.process_msg = sink_input_process_msg;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-native.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-native.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-native.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-native.c	2010-01-15 23:21:19.000000000 +0000
@@ -1002,7 +1002,6 @@
         pa_proplist *p,
         pa_bool_t adjust_latency,
         pa_bool_t early_requests,
-        pa_bool_t relative_volume,
         int *ret) {
 
     playback_stream *s, *ssync;
@@ -1053,7 +1052,7 @@
     pa_sink_input_new_data_set_channel_map(&data, map);
     if (volume) {
         pa_sink_input_new_data_set_volume(&data, volume);
-        data.volume_is_absolute = !relative_volume;
+        data.volume_is_absolute = TRUE;
         data.save_volume = TRUE;
     }
     if (muted_set) {
@@ -1114,6 +1113,8 @@
 
     *missing = (uint32_t) pa_memblockq_pop_missing(s->memblockq);
 
+    /* pa_log("missing original: %li", (long int) *missing); */
+
     *ss = s->sink_input->sample_spec;
     *map = s->sink_input->channel_map;
 
@@ -1138,11 +1139,12 @@
 
     m = pa_memblockq_pop_missing(s->memblockq);
 
-    /* pa_log("request_bytes(%lu) (tlength=%lu minreq=%lu length=%lu)", */
+    /* pa_log("request_bytes(%lu) (tlength=%lu minreq=%lu length=%lu really missing=%lli)", */
     /*        (unsigned long) m, */
     /*        pa_memblockq_get_tlength(s->memblockq), */
     /*        pa_memblockq_get_minreq(s->memblockq), */
-    /*        pa_memblockq_get_length(s->memblockq)); */
+    /*        pa_memblockq_get_length(s->memblockq), */
+    /*        (long long) pa_memblockq_get_tlength(s->memblockq) - (long long) pa_memblockq_get_length(s->memblockq)); */
 
     if (m <= 0)
         return;
@@ -1847,8 +1849,7 @@
         early_requests = FALSE,
         dont_inhibit_auto_suspend = FALSE,
         muted_set = FALSE,
-        fail_on_suspend = FALSE,
-        relative_volume = FALSE;
+        fail_on_suspend = FALSE;
     pa_sink_input_flags_t flags = 0;
     pa_proplist *p;
     pa_bool_t volume_set = TRUE;
@@ -1941,15 +1942,6 @@
         }
     }
 
-    if (c->version >= 17) {
-
-        if (pa_tagstruct_get_boolean(t, &relative_volume) < 0) {
-            protocol_error(c);
-            pa_proplist_free(p);
-            return;
-        }
-    }
-
     if (!pa_tagstruct_eof(t)) {
         protocol_error(c);
         pa_proplist_free(p);
@@ -1989,7 +1981,7 @@
      * flag. For older versions we synthesize it here */
     muted_set = muted_set || muted;
 
-    s = playback_stream_new(c, sink, &ss, &map, &attr, volume_set ? &volume : NULL, muted, muted_set, syncid, &missing, flags, p, adjust_latency, early_requests, relative_volume, &ret);
+    s = playback_stream_new(c, sink, &ss, &map, &attr, volume_set ? &volume : NULL, muted, muted_set, syncid, &missing, flags, p, adjust_latency, early_requests, &ret);
     pa_proplist_free(p);
 
     CHECK_VALIDITY(c->pstream, s, tag, ret);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-simple.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-simple.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/protocol-simple.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/protocol-simple.c	2010-01-15 23:21:19.000000000 +0000
@@ -525,6 +525,7 @@
 
     if (o->playback) {
         pa_sink_input_new_data data;
+        pa_memchunk silence;
         size_t l;
         pa_sink *sink;
 
@@ -559,6 +560,7 @@
         pa_sink_input_set_requested_latency(c->sink_input, DEFAULT_SINK_LATENCY);
 
         l = (size_t) ((double) pa_bytes_per_second(&o->sample_spec)*PLAYBACK_BUFFER_SECONDS);
+        pa_sink_input_get_silence(c->sink_input, &silence);
         c->input_memblockq = pa_memblockq_new(
                 0,
                 l,
@@ -567,7 +569,9 @@
                 (size_t) -1,
                 l/PLAYBACK_BUFFER_FRAGMENTS,
                 0,
-                NULL);
+                &silence);
+        pa_memblock_unref(silence.memblock);
+
         pa_iochannel_socket_set_rcvbuf(io, l);
 
         pa_atomic_store(&c->playback.missing, (int) pa_memblockq_missing(c->input_memblockq));
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/random.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/random.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/random.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/random.c	2010-01-15 23:21:19.000000000 +0000
@@ -62,7 +62,11 @@
     while (*device) {
         ret = 0;
 
-        if ((fd = pa_open_cloexec(*device, O_RDONLY, 0)) >= 0) {
+        if ((fd = open(*device, O_RDONLY
+#ifdef O_NOCTTY
+                       | O_NOCTTY
+#endif
+             )) >= 0) {
 
             if ((r = pa_loop_read(fd, ret_data, length, NULL)) < 0 || (size_t) r != length)
                 ret = -1;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/rtpoll.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/rtpoll.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/rtpoll.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/rtpoll.c	2010-01-15 23:21:19.000000000 +0000
@@ -30,10 +30,15 @@
 #include <string.h>
 #include <errno.h>
 
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+#include <pulsecore/poll.h>
+#endif
+
 #include <pulse/xmalloc.h>
 #include <pulse/timeval.h>
 
-#include <pulsecore/poll.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-rtclock.h>
 #include <pulsecore/macro.h>
@@ -42,7 +47,6 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/winsock.h>
 #include <pulsecore/ratelimit.h>
-#include <pulse/rtclock.h>
 
 #include "rtpoll.h"
 
@@ -213,10 +217,6 @@
     pa_assert(p);
     pa_assert(!p->running);
 
-#ifdef DEBUG_TIMING
-    pa_log("rtpoll_run");
-#endif
-
     p->running = TRUE;
     p->timer_elapsed = FALSE;
 
@@ -230,19 +230,13 @@
         if (!i->work_cb)
             continue;
 
-        if (p->quit) {
-#ifdef DEBUG_TIMING
-            pa_log("rtpoll finish");
-#endif
+        if (p->quit)
             goto finish;
-        }
 
         if ((k = i->work_cb(i)) != 0) {
             if (k < 0)
                 r = k;
-#ifdef DEBUG_TIMING
-            pa_log("rtpoll finish");
-#endif
+
             goto finish;
         }
     }
@@ -274,9 +268,7 @@
 
             if (k < 0)
                 r = k;
-#ifdef DEBUG_TIMING
-            pa_log("rtpoll finish");
-#endif
+
             goto finish;
         }
     }
@@ -300,10 +292,6 @@
         pa_usec_t now = pa_rtclock_now();
         p->awake = now - p->timestamp;
         p->timestamp = now;
-        if (!wait_op || p->quit || p->timer_enabled)
-            pa_log("poll timeout: %d ms ",(int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)));
-        else
-            pa_log("poll timeout is ZERO");
     }
 #endif
 
@@ -316,7 +304,7 @@
         r = ppoll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? &ts : NULL, NULL);
     }
 #else
-    r = pa_poll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? (int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)) : -1);
+    r = poll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? (int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)) : -1);
 #endif
 
     p->timer_elapsed = r == 0;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sample-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sample-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sample-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sample-util.c	2010-01-15 23:21:19.000000000 +0000
@@ -1007,7 +1007,7 @@
 
     /* Only for debugging purposes */
 
-    f = pa_fopen_cloexec(fn, "a");
+    f = fopen(fn, "a");
 
     if (!f) {
         pa_log_warn("Failed to open '%s': %s", fn, pa_cstrerror(errno));
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/semaphore-osx.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/semaphore-osx.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/semaphore-osx.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/semaphore-osx.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2009 Kim Lester <kim@dfusion.com.au>
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <Multiprocessing.h>
-
-#include <pulse/xmalloc.h>
-#include <pulsecore/macro.h>
-
-#include "semaphore.h"
-
-struct pa_semaphore
-{
-    MPSemaphoreID sema;
-};
-
-pa_semaphore* pa_semaphore_new(unsigned int value) {
-    /* NOTE: Can't assume boolean - ie value = 0,1, so use UINT_MAX (boolean more efficient ?) */
-    pa_semaphore *s;
-
-    s = pa_xnew(pa_semaphore, 1);
-    pa_assert_se(MPCreateSemaphore(UINT_MAX, value, &s->sema) == 0);
-
-    return s;
-}
-
-void pa_semaphore_free(pa_semaphore *s) {
-    pa_assert(s);
-    pa_assert_se(MPDeleteSemaphore(s->sema) == 0);
-    pa_xfree(s);
-}
-
-void pa_semaphore_post(pa_semaphore *s) {
-    pa_assert(s);
-    pa_assert_se(MPSignalSemaphore(s->sema) == 0);
-}
-
-void pa_semaphore_wait(pa_semaphore *s) {
-    pa_assert(s);
-    /* should probably check return value (-ve is error), noErr is ok. */
-    pa_assert_se(MPWaitOnSemaphore(s->sema, kDurationForever) == 0);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sink.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sink.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sink.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sink.c	2010-01-15 23:21:19.000000000 +0000
@@ -1340,7 +1340,7 @@
 void pa_sink_set_volume(
         pa_sink *s,
         const pa_cvolume *volume,
-        pa_bool_t send_msg,
+        pa_bool_t sendmsg,
         pa_bool_t save) {
 
     pa_cvolume old_reference_volume;
@@ -1409,7 +1409,7 @@
         s->soft_volume = s->real_volume;
 
     /* This tells the sink that soft and/or virtual volume changed */
-    if (send_msg)
+    if (sendmsg)
         pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_VOLUME, NULL, 0, NULL) == 0);
 
     if (reference_changed)
@@ -1731,14 +1731,10 @@
     pa_sink_assert_io_context(s);
 
     PA_HASHMAP_FOREACH(i, s->thread_info.inputs, state) {
-        if (pa_atomic_load(&i->before_ramping_v))
-            i->thread_info.future_soft_volume = i->soft_volume;
-
         if (pa_cvolume_equal(&i->thread_info.soft_volume, &i->soft_volume))
             continue;
 
-        if (!pa_atomic_load(&i->before_ramping_v))
-            i->thread_info.soft_volume = i->soft_volume;
+        i->thread_info.soft_volume = i->soft_volume;
         pa_sink_input_request_rewind(i, 0, TRUE, FALSE, FALSE);
     }
 }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sink-input.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sink-input.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sink-input.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sink-input.c	2010-01-15 23:21:19.000000000 +0000
@@ -38,7 +38,6 @@
 #include <pulsecore/play-memblockq.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/core-util.h>
-#include <pulse/timeval.h>
 
 #include "sink-input.h"
 
@@ -49,11 +48,6 @@
 
 static void sink_input_free(pa_object *o);
 static void set_real_ratio(pa_sink_input *i, const pa_cvolume *v);
-static void sink_input_set_ramping_info(pa_sink_input* i, pa_volume_t  pre_virtual_volume, pa_volume_t target_virtual_volume, pa_usec_t t);
-static void sink_input_set_ramping_info_for_mute(pa_sink_input* i, pa_bool_t mute, pa_usec_t t);
-static void sink_input_volume_ramping(pa_sink_input* i, pa_memchunk* chunk);
-static void sink_input_rewind_ramp_info(pa_sink_input *i, size_t nbytes);
-static void sink_input_release_envelope(pa_sink_input *i);
 
 pa_sink_input_new_data* pa_sink_input_new_data_init(pa_sink_input_new_data *data) {
     pa_assert(data);
@@ -329,16 +323,6 @@
     reset_callbacks(i);
     i->userdata = NULL;
 
-    /* Set Ramping info */
-    i->thread_info.ramp_info.is_ramping = FALSE;
-    i->thread_info.ramp_info.envelope_dead = TRUE;
-    i->thread_info.ramp_info.envelope = NULL;
-    i->thread_info.ramp_info.item = NULL;
-    i->thread_info.ramp_info.envelope_dying = 0;
-
-    pa_atomic_store(&i->before_ramping_v, 0);
-    pa_atomic_store(&i->before_ramping_m, 0);
-
     i->thread_info.state = i->state;
     i->thread_info.attached = FALSE;
     pa_atomic_store(&i->thread_info.drained, 1);
@@ -526,12 +510,6 @@
      * "half-moved" or are connected to sinks that have no asyncmsgq
      * and are hence half-destructed themselves! */
 
-    if (i->thread_info.ramp_info.envelope) {
-        pa_log_debug ("Freeing envelope\n");
-        pa_envelope_free(i->thread_info.ramp_info.envelope);
-        i->thread_info.ramp_info.envelope = NULL;
-    }
-
     if (i->thread_info.render_memblockq)
         pa_memblockq_free(i->thread_info.render_memblockq);
 
@@ -619,7 +597,6 @@
 void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink frames */, pa_memchunk *chunk, pa_cvolume *volume) {
     pa_bool_t do_volume_adj_here, need_volume_factor_sink;
     pa_bool_t volume_is_norm;
-    pa_bool_t ramping;
     size_t block_size_max_sink, block_size_max_sink_input;
     size_t ilength;
 
@@ -664,7 +641,7 @@
      * to adjust the volume *before* we resample. Otherwise we can do
      * it after and leave it for the sink code */
 
-    do_volume_adj_here = !pa_channel_map_equal(&i->channel_map, &i->sink->channel_map) || i->thread_info.ramp_info.is_ramping;
+    do_volume_adj_here = !pa_channel_map_equal(&i->channel_map, &i->sink->channel_map);
     volume_is_norm = pa_cvolume_is_norm(&i->thread_info.soft_volume) && !i->thread_info.muted;
     need_volume_factor_sink = !pa_cvolume_is_norm(&i->volume_factor_sink);
 
@@ -707,7 +684,7 @@
                 wchunk.length = block_size_max_sink_input;
 
             /* It might be necessary to adjust the volume here */
-            if (do_volume_adj_here && !volume_is_norm && !i->thread_info.ramp_info.is_ramping) {
+            if (do_volume_adj_here && !volume_is_norm) {
                 pa_memchunk_make_writable(&wchunk, 0);
 
                 if (i->thread_info.muted) {
@@ -773,23 +750,6 @@
     if (chunk->length > block_size_max_sink)
         chunk->length = block_size_max_sink;
 
-    ramping = i->thread_info.ramp_info.is_ramping;
-    if (ramping)
-        sink_input_volume_ramping(i, chunk);
-
-    if (!i->thread_info.ramp_info.envelope_dead) {
-        i->thread_info.ramp_info.envelope_dying += chunk->length;
-        pa_log_debug("Envelope dying is %d, chunk length is %zu, dead thresholder is %lu\n", i->thread_info.ramp_info.envelope_dying,
-                chunk->length,
-                i->sink->thread_info.max_rewind + pa_envelope_length(i->thread_info.ramp_info.envelope));
-
-        if (i->thread_info.ramp_info.envelope_dying >= (int32_t) (i->sink->thread_info.max_rewind + pa_envelope_length(i->thread_info.ramp_info.envelope))) {
-            pa_log_debug("RELEASE Envelop");
-            i->thread_info.ramp_info.envelope_dead = TRUE;
-            sink_input_release_envelope(i);
-        }
-    }
-
     /* Let's see if we had to apply the volume adjustment ourselves,
      * or if this can be done by the sink for us */
 
@@ -834,7 +794,6 @@
     if (nbytes > 0 && !i->thread_info.dont_rewind_render) {
         pa_log_debug("Have to rewind %lu bytes on render memblockq.", (unsigned long) nbytes);
         pa_memblockq_rewind(i->thread_info.render_memblockq, nbytes);
-        sink_input_rewind_ramp_info(i, nbytes);
     }
 
     if (i->thread_info.rewrite_nbytes == (size_t) -1) {
@@ -1020,8 +979,59 @@
 
 /* Called from main context */
 void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, pa_bool_t save, pa_bool_t absolute) {
-    /* test ramping -> return pa_sink_input_set_volume_with_ramping(i, volume, save, absolute, 2000 * PA_USEC_PER_MSEC); */
-    return pa_sink_input_set_volume_with_ramping(i, volume, save, absolute, 0);
+    pa_cvolume v;
+
+    pa_sink_input_assert_ref(i);
+    pa_assert_ctl_context();
+    pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
+    pa_assert(volume);
+    pa_assert(pa_cvolume_valid(volume));
+    pa_assert(volume->channels == 1 || pa_cvolume_compatible(volume, &i->sample_spec));
+
+    if ((i->sink->flags & PA_SINK_FLAT_VOLUME) && !absolute) {
+        v = i->sink->reference_volume;
+        pa_cvolume_remap(&v, &i->sink->channel_map, &i->channel_map);
+
+        if (pa_cvolume_compatible(volume, &i->sample_spec))
+            volume = pa_sw_cvolume_multiply(&v, &v, volume);
+        else
+            volume = pa_sw_cvolume_multiply_scalar(&v, &v, pa_cvolume_max(volume));
+    } else {
+
+        if (!pa_cvolume_compatible(volume, &i->sample_spec)) {
+            v = i->volume;
+            volume = pa_cvolume_scale(&v, pa_cvolume_max(volume));
+        }
+    }
+
+    if (pa_cvolume_equal(volume, &i->volume)) {
+        i->save_volume = i->save_volume || save;
+        return;
+    }
+
+    i->volume = *volume;
+    i->save_volume = save;
+
+    if (i->sink->flags & PA_SINK_FLAT_VOLUME)
+        /* We are in flat volume mode, so let's update all sink input
+         * volumes and update the flat volume of the sink */
+
+        pa_sink_set_volume(i->sink, NULL, TRUE, save);
+
+    else {
+        /* OK, we are in normal volume mode. The volume only affects
+         * ourselves */
+        set_real_ratio(i, volume);
+
+        /* Copy the new soft_volume to the thread_info struct */
+        pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_VOLUME, NULL, 0, NULL) == 0);
+    }
+
+    /* The volume changed, let's tell people so */
+    if (i->volume_changed)
+        i->volume_changed(i);
+
+    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
 }
 
 /* Called from main context */
@@ -1040,8 +1050,23 @@
 
 /* Called from main context */
 void pa_sink_input_set_mute(pa_sink_input *i, pa_bool_t mute, pa_bool_t save) {
-    /* test ramping -> return pa_sink_input_set_mute_with_ramping(i, mute, save, 2000 * PA_USEC_PER_MSEC); */
-    return pa_sink_input_set_mute_with_ramping(i, mute, save, 0);
+    pa_sink_input_assert_ref(i);
+    pa_assert_ctl_context();
+    pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
+
+    if (!i->muted == !mute)
+        return;
+
+    i->muted = mute;
+    i->save_muted = save;
+
+    pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_MUTE, NULL, 0, NULL) == 0);
+
+    /* The mute status changed, let's tell people so */
+    if (i->mute_changed)
+        i->mute_changed(i);
+
+    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
 }
 
 /* Called from main context */
@@ -1417,23 +1442,15 @@
     switch (code) {
 
         case PA_SINK_INPUT_MESSAGE_SET_SOFT_VOLUME:
-            if (pa_atomic_load(&i->before_ramping_v))
-                i->thread_info.future_soft_volume = i->soft_volume;
-
             if (!pa_cvolume_equal(&i->thread_info.soft_volume, &i->soft_volume)) {
-                if (!pa_atomic_load(&i->before_ramping_v))
-                    i->thread_info.soft_volume = i->soft_volume;
+                i->thread_info.soft_volume = i->soft_volume;
                 pa_sink_input_request_rewind(i, 0, TRUE, FALSE, FALSE);
             }
             return 0;
 
         case PA_SINK_INPUT_MESSAGE_SET_SOFT_MUTE:
-            if (pa_atomic_load(&i->before_ramping_m))
-                i->thread_info.future_muted = i->muted;
-
             if (i->thread_info.muted != i->muted) {
-                if (!pa_atomic_load(&i->before_ramping_m))
-                    i->thread_info.muted = i->muted;
+                i->thread_info.muted = i->muted;
                 pa_sink_input_request_rewind(i, 0, TRUE, FALSE, FALSE);
             }
             return 0;
@@ -1481,26 +1498,6 @@
             *r = i->thread_info.requested_sink_latency;
             return 0;
         }
-
-        case PA_SINK_INPUT_MESSAGE_SET_ENVELOPE: {
-            if (!i->thread_info.ramp_info.envelope)
-                i->thread_info.ramp_info.envelope = pa_envelope_new(&i->sink->sample_spec);
-
-            if (i->thread_info.ramp_info.envelope && i->thread_info.ramp_info.item) {
-                pa_envelope_remove(i->thread_info.ramp_info.envelope, i->thread_info.ramp_info.item);
-                i->thread_info.ramp_info.item = NULL;
-            }
-
-            i->thread_info.ramp_info.item = pa_envelope_add(i->thread_info.ramp_info.envelope, &i->using_def);
-            i->thread_info.ramp_info.is_ramping = TRUE;
-            i->thread_info.ramp_info.envelope_dead = FALSE;
-            i->thread_info.ramp_info.envelope_dying = 0;
-
-            if (i->thread_info.ramp_info.envelope)
-                pa_envelope_restart(i->thread_info.ramp_info.envelope);
-
-            return 0;
-        }
     }
 
     return -PA_ERR_NOTIMPLEMENTED;
@@ -1663,237 +1660,3 @@
     if (pl)
         pa_proplist_free(pl);
 }
-
-/* Called from IO context */
-static void sink_input_volume_ramping(pa_sink_input* i, pa_memchunk* chunk) {
-    pa_assert(i);
-    pa_assert(chunk);
-    pa_assert(chunk->memblock);
-    pa_assert(i->thread_info.ramp_info.is_ramping);
-
-    /* Volume is adjusted with ramping effect here */
-    pa_envelope_apply(i->thread_info.ramp_info.envelope, chunk);
-
-    if (pa_envelope_is_finished(i->thread_info.ramp_info.envelope)) {
-        i->thread_info.ramp_info.is_ramping = FALSE;
-        if (pa_atomic_load(&i->before_ramping_v)) {
-            i->thread_info.soft_volume = i->thread_info.future_soft_volume;
-            pa_atomic_store(&i->before_ramping_v, 0);
-        }
-        else if (pa_atomic_load(&i->before_ramping_m)) {
-            i->thread_info.muted = i->thread_info.future_muted;
-            pa_atomic_store(&i->before_ramping_m, 0);
-        }
-    }
-}
-
-/*
- * Called from main context
- * This function should be called inside pa_sink_input_set_volume_with_ramping
- * should be called after soft_volume of sink_input and sink are all adjusted
- */
-static void sink_input_set_ramping_info(pa_sink_input* i, pa_volume_t  pre_virtual_volume, pa_volume_t target_virtual_volume, pa_usec_t t) {
-
-    int32_t target_abs_vol, target_apply_vol, pre_apply_vol;
-    pa_assert(i);
-
-    pa_log_debug("Sink input's soft volume is %d= %f ", pa_cvolume_avg(&i->soft_volume), pa_sw_volume_to_linear(pa_cvolume_avg(&i->soft_volume)));
-
-    /* Calculation formula are target_abs_vol := i->soft_volume
-     *                                   target_apply_vol := lrint(pa_sw_volume_to_linear(target_abs_vol) * 0x10000)
-     *                                   pre_apply_vol := ( previous_virtual_volume / target_virtual_volume ) * target_apply_vol
-     *
-     * Will do volume adjustment inside pa_sink_input_peek
-     */
-    target_abs_vol = pa_cvolume_avg(&i->soft_volume);
-    target_apply_vol = (int32_t) lrint(pa_sw_volume_to_linear(target_abs_vol) * 0x10000);
-    pre_apply_vol = (int32_t) ((pa_sw_volume_to_linear(pre_virtual_volume) / pa_sw_volume_to_linear(target_virtual_volume)) * target_apply_vol);
-
-    i->using_def.n_points = 2;
-    i->using_def.points_x[0] = 0;
-    i->using_def.points_x[1] = t;
-    i->using_def.points_y.i[0] = pre_apply_vol;
-    i->using_def.points_y.i[1] = target_apply_vol;
-    i->using_def.points_y.f[0] = ((float) i->using_def.points_y.i[0]) /0x10000;
-    i->using_def.points_y.f[1] = ((float) i->using_def.points_y.i[1]) /0x10000;
-
-    pa_log_debug("Volume Ramping: Point 1 is %d=%f, Point 2 is %d=%f\n", i->using_def.points_y.i[0], i->using_def.points_y.f[0],
-                                   i->using_def.points_y.i[1], i->using_def.points_y.f[1]);
-
-    pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_ENVELOPE, NULL, 0, NULL) == 0);
-}
-
-/* Called from main context */
-static void sink_input_set_ramping_info_for_mute(pa_sink_input* i, pa_bool_t mute, pa_usec_t t) {
-
-    int32_t cur_vol;
-    pa_assert(i);
-
-    i->using_def.n_points = 2;
-    i->using_def.points_x[0] = 0;
-    i->using_def.points_x[1] = t;
-    cur_vol = (int32_t) lrint( pa_sw_volume_to_linear(pa_cvolume_avg(&i->soft_volume)) * 0x10000);
-
-    if (mute) {
-        i->using_def.points_y.i[0] = cur_vol;
-        i->using_def.points_y.i[1] = 0;
-    } else {
-        i->using_def.points_y.i[0] = 0;
-        i->using_def.points_y.i[1] = cur_vol;
-    }
-
-    i->using_def.points_y.f[0] = ((float) i->using_def.points_y.i[0]) /0x10000;
-    i->using_def.points_y.f[1] = ((float) i->using_def.points_y.i[1]) /0x10000;
-
-    pa_log_debug("Mute Ramping: Point 1 is %d=%f, Point 2 is %d=%f\n", i->using_def.points_y.i[0], i->using_def.points_y.f[0],
-                   i->using_def.points_y.i[1], i->using_def.points_y.f[1]);
-
-    pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_ENVELOPE, NULL, 0, NULL) == 0);
-}
-
-/* Called from IO context */
-static void sink_input_release_envelope(pa_sink_input *i) {
-    pa_assert(i);
-    pa_assert(!i->thread_info.ramp_info.is_ramping);
-    pa_assert(i->thread_info.ramp_info.envelope_dead);
-
-    pa_envelope_free(i->thread_info.ramp_info.envelope);
-    i->thread_info.ramp_info.envelope = NULL;
-    i->thread_info.ramp_info.item = NULL;
-}
-
-/* Called from IO context */
-static void sink_input_rewind_ramp_info(pa_sink_input *i, size_t nbytes) {
-    pa_assert(i);
-
-    if (!i->thread_info.ramp_info.envelope_dead) {
-        int32_t envelope_length;
-
-        pa_assert(i->thread_info.ramp_info.envelope);
-
-        envelope_length = pa_envelope_length(i->thread_info.ramp_info.envelope);
-
-        if (i->thread_info.ramp_info.envelope_dying > envelope_length) {
-            if ((int32_t) (i->thread_info.ramp_info.envelope_dying - nbytes) < envelope_length) {
-                pa_log_debug("Envelope Become Alive");
-                pa_envelope_rewind(i->thread_info.ramp_info.envelope, envelope_length - (i->thread_info.ramp_info.envelope_dying - nbytes));
-                i->thread_info.ramp_info.is_ramping = TRUE;
-            }
-        } else if (i->thread_info.ramp_info.envelope_dying < envelope_length) {
-            if ((i->thread_info.ramp_info.envelope_dying - (ssize_t) nbytes) <= 0) {
-                pa_log_debug("Envelope Restart");
-                pa_envelope_restart(i->thread_info.ramp_info.envelope);
-            }
-            else {
-                pa_log_debug("Envelope Simple Rewind");
-                pa_envelope_rewind(i->thread_info.ramp_info.envelope, nbytes);
-            }
-        }
-
-        i->thread_info.ramp_info.envelope_dying -= nbytes;
-        if (i->thread_info.ramp_info.envelope_dying <= 0)
-            i->thread_info.ramp_info.envelope_dying = 0;
-    }
-}
-
-void pa_sink_input_set_volume_with_ramping(pa_sink_input *i, const pa_cvolume *volume, pa_bool_t save, pa_bool_t absolute, pa_usec_t t){
-    pa_cvolume v;
-    pa_volume_t previous_virtual_volume, target_virtual_volume;
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_ctl_context();
-    pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
-    pa_assert(volume);
-    pa_assert(pa_cvolume_valid(volume));
-    pa_assert(volume->channels == 1 || pa_cvolume_compatible(volume, &i->sample_spec));
-
-    if ((i->sink->flags & PA_SINK_FLAT_VOLUME) && !absolute) {
-        v = i->sink->reference_volume;
-        pa_cvolume_remap(&v, &i->sink->channel_map, &i->channel_map);
-
-        if (pa_cvolume_compatible(volume, &i->sample_spec))
-            volume = pa_sw_cvolume_multiply(&v, &v, volume);
-        else
-            volume = pa_sw_cvolume_multiply_scalar(&v, &v, pa_cvolume_max(volume));
-    } else {
-
-        if (!pa_cvolume_compatible(volume, &i->sample_spec)) {
-            v = i->volume;
-            volume = pa_cvolume_scale(&v, pa_cvolume_max(volume));
-        }
-    }
-
-    if (pa_cvolume_equal(volume, &i->volume)) {
-        i->save_volume = i->save_volume || save;
-        return;
-    }
-
-    previous_virtual_volume = pa_cvolume_avg(&i->volume);
-    target_virtual_volume = pa_cvolume_avg(volume);
-
-    if (t > 0 && target_virtual_volume > 0)
-        pa_log_debug("SetVolumeWithRamping: Virtual Volume From %u=%f to %u=%f\n", previous_virtual_volume, pa_sw_volume_to_linear(previous_virtual_volume),
-                                             target_virtual_volume, pa_sw_volume_to_linear(target_virtual_volume));
-
-    i->volume = *volume;
-    i->save_volume = save;
-
-    /* Set this flag before the following code modify i->thread_info.soft_volume */
-    if (t > 0 && target_virtual_volume > 0)
-        pa_atomic_store(&i->before_ramping_v, 1);
-
-    if (i->sink->flags & PA_SINK_FLAT_VOLUME) {
-        /* We are in flat volume mode, so let's update all sink input
-         * volumes and update the flat volume of the sink */
-
-        pa_sink_set_volume(i->sink, NULL, TRUE, save);
-
-    } else {
-        /* OK, we are in normal volume mode. The volume only affects
-         * ourselves */
-        set_real_ratio(i, volume);
-
-        /* Copy the new soft_volume to the thread_info struct */
-        pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_VOLUME, NULL, 0, NULL) == 0);
-    }
-
-    if (t > 0 && target_virtual_volume > 0)
-        sink_input_set_ramping_info(i, previous_virtual_volume, target_virtual_volume, t);
-
-    /* The volume changed, let's tell people so */
-    if (i->volume_changed)
-        i->volume_changed(i);
-
-    /* The virtual volume changed, let's tell people so */
-    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-}
-
-void pa_sink_input_set_mute_with_ramping(pa_sink_input *i, pa_bool_t mute, pa_bool_t save, pa_usec_t t){
-
-    pa_sink_input_assert_ref(i);
-    pa_assert_ctl_context();
-    pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
-
-    if (!i->muted == !mute) {
-        i->save_muted = i->save_muted || mute;
-        return;
-    }
-
-    i->muted = mute;
-    i->save_muted = save;
-
-    /* Set this flag before the following code modify i->thread_info.muted, otherwise distortion will be heard */
-    if (t > 0)
-        pa_atomic_store(&i->before_ramping_m, 1);
-
-    pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_MUTE, NULL, 0, NULL) == 0);
-
-    if (t > 0)
-        sink_input_set_ramping_info_for_mute(i, mute, t);
-
-    /* The mute status changed, let's tell people so */
-    if (i->mute_changed)
-        i->mute_changed(i);
-
-    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sink-input.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sink-input.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sink-input.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sink-input.h	2010-01-15 23:21:19.000000000 +0000
@@ -35,7 +35,6 @@
 #include <pulsecore/client.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/core.h>
-#include <pulsecore/envelope.h>
 
 typedef enum pa_sink_input_state {
     PA_SINK_INPUT_INIT,         /*< The stream is not active yet, because pa_sink_put() has not been called yet */
@@ -233,23 +232,8 @@
         pa_usec_t requested_sink_latency;
 
         pa_hashmap *direct_outputs;
-
-        struct {
-            pa_bool_t is_ramping:1;
-            pa_bool_t envelope_dead:1;
-            int32_t envelope_dying; /* Increasing while envelop is not dead.  Reduce it while process_rewind. */
-            pa_envelope *envelope;
-            pa_envelope_item *item;
-        } ramp_info;
-        pa_cvolume future_soft_volume;
-        pa_bool_t future_muted;
-
     } thread_info;
 
-    pa_atomic_t before_ramping_v;  /* Indicates future volume */
-    pa_atomic_t before_ramping_m;  /* Indicates future mute */
-    pa_envelope_def using_def;
-
     void *userdata;
 };
 
@@ -264,7 +248,6 @@
     PA_SINK_INPUT_MESSAGE_SET_STATE,
     PA_SINK_INPUT_MESSAGE_SET_REQUESTED_LATENCY,
     PA_SINK_INPUT_MESSAGE_GET_REQUESTED_LATENCY,
-    PA_SINK_INPUT_MESSAGE_SET_ENVELOPE,
     PA_SINK_INPUT_MESSAGE_MAX
 };
 
@@ -401,8 +384,4 @@
 #define pa_sink_input_assert_io_context(s) \
     pa_assert(pa_thread_mq_get() || !PA_SINK_INPUT_IS_LINKED((s)->state))
 
-/* Volume ramping*/
-void pa_sink_input_set_volume_with_ramping(pa_sink_input *i, const pa_cvolume *volume, pa_bool_t save, pa_bool_t absolute, pa_usec_t t);
-void pa_sink_input_set_mute_with_ramping(pa_sink_input *i, pa_bool_t mute, pa_bool_t save, pa_usec_t t);
-
 #endif
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-client.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-client.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-client.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-client.c	2010-01-15 23:21:19.000000000 +0000
@@ -257,11 +257,13 @@
 
     c->local = pa_socket_address_is_local(sa);
 
-    if ((c->fd = pa_socket_cloexec(sa->sa_family, SOCK_STREAM, 0)) < 0) {
+    if ((c->fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
         pa_log("socket(): %s", pa_cstrerror(errno));
         return -1;
     }
 
+    pa_make_fd_cloexec(c->fd);
+
 #ifdef HAVE_IPV6
     if (sa->sa_family == AF_INET || sa->sa_family == AF_INET6)
 #else
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-server.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-server.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-server.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-server.c	2010-01-15 23:21:19.000000000 +0000
@@ -86,12 +86,7 @@
 
     pa_io_event *io_event;
     pa_mainloop_api *mainloop;
-    enum {
-        SOCKET_SERVER_GENERIC,
-        SOCKET_SERVER_IPV4,
-        SOCKET_SERVER_UNIX,
-        SOCKET_SERVER_IPV6
-    } type;
+    enum { SOCKET_SERVER_GENERIC, SOCKET_SERVER_IPV4, SOCKET_SERVER_UNIX, SOCKET_SERVER_IPV6 } type;
 };
 
 static void callback(pa_mainloop_api *mainloop, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
@@ -109,11 +104,13 @@
 
     pa_socket_server_ref(s);
 
-    if ((nfd = pa_accept_cloexec(fd, NULL, NULL)) < 0) {
+    if ((nfd = accept(fd, NULL, NULL)) < 0) {
         pa_log("accept(): %s", pa_cstrerror(errno));
         goto finish;
     }
 
+    pa_make_fd_cloexec(nfd);
+
     if (!s->on_connection) {
         pa_close(nfd);
         goto finish;
@@ -155,11 +152,15 @@
     pa_assert(m);
     pa_assert(fd >= 0);
 
-    s = pa_xnew0(pa_socket_server, 1);
+    s = pa_xnew(pa_socket_server, 1);
     PA_REFCNT_INIT(s);
     s->fd = fd;
-    s->mainloop = m;
+    s->filename = NULL;
+    s->on_connection = NULL;
+    s->userdata = NULL;
+    s->tcpwrap_service = NULL;
 
+    s->mainloop = m;
     pa_assert_se(s->io_event = m->io_new(m, fd, PA_IO_EVENT_INPUT, callback, s));
 
     s->type = SOCKET_SERVER_GENERIC;
@@ -185,11 +186,13 @@
     pa_assert(m);
     pa_assert(filename);
 
-    if ((fd = pa_socket_cloexec(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
         pa_log("socket(): %s", pa_cstrerror(errno));
         goto fail;
     }
 
+    pa_make_fd_cloexec(fd);
+
     memset(&sa, 0, sizeof(sa));
     sa.sun_family = AF_UNIX;
     pa_strlcpy(sa.sun_path, filename, sizeof(sa.sun_path));
@@ -234,7 +237,7 @@
 
 #endif /* HAVE_SYS_UN_H */
 
-pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port, const char *tcpwrap_service) {
     pa_socket_server *ss;
     int fd = -1;
     struct sockaddr_in sa;
@@ -243,11 +246,13 @@
     pa_assert(m);
     pa_assert(port);
 
-    if ((fd = pa_socket_cloexec(PF_INET, SOCK_STREAM, 0)) < 0) {
+    if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
         pa_log("socket(PF_INET): %s", pa_cstrerror(errno));
         goto fail;
     }
 
+    pa_make_fd_cloexec(fd);
+
 #ifdef SO_REUSEADDR
     if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
         pa_log("setsockopt(): %s", pa_cstrerror(errno));
@@ -261,19 +266,8 @@
     sa.sin_addr.s_addr = htonl(address);
 
     if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-
-        if (errno == EADDRINUSE && fallback) {
-            sa.sin_port = 0;
-
-            if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) >= 0)
-                goto good;
-        }
-
         pa_log("bind(): %s", pa_cstrerror(errno));
         goto fail;
-
-    good:
-        ;
     }
 
     if (listen(fd, 5) < 0) {
@@ -296,7 +290,7 @@
 }
 
 #ifdef HAVE_IPV6
-pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t address[16], uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t address[16], uint16_t port, const char *tcpwrap_service) {
     pa_socket_server *ss;
     int fd = -1;
     struct sockaddr_in6 sa;
@@ -305,11 +299,13 @@
     pa_assert(m);
     pa_assert(port > 0);
 
-    if ((fd = pa_socket_cloexec(PF_INET6, SOCK_STREAM, 0)) < 0) {
+    if ((fd = socket(PF_INET6, SOCK_STREAM, 0)) < 0) {
         pa_log("socket(PF_INET6): %s", pa_cstrerror(errno));
         goto fail;
     }
 
+    pa_make_fd_cloexec(fd);
+
 #ifdef IPV6_V6ONLY
     on = 1;
     if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
@@ -330,19 +326,8 @@
     memcpy(sa.sin6_addr.s6_addr, address, 16);
 
     if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-
-        if (errno == EADDRINUSE && fallback) {
-            sa.sin6_port = 0;
-
-            if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) >= 0)
-                goto good;
-        }
-
         pa_log("bind(): %s", pa_cstrerror(errno));
         goto fail;
-
-    good:
-        ;
     }
 
     if (listen(fd, 5) < 0) {
@@ -365,39 +350,39 @@
 }
 #endif
 
-pa_socket_server* pa_socket_server_new_ipv4_loopback(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv4_loopback(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service) {
     pa_assert(m);
     pa_assert(port > 0);
 
-    return pa_socket_server_new_ipv4(m, INADDR_LOOPBACK, port, fallback, tcpwrap_service);
+    return pa_socket_server_new_ipv4(m, INADDR_LOOPBACK, port, tcpwrap_service);
 }
 
 #ifdef HAVE_IPV6
-pa_socket_server* pa_socket_server_new_ipv6_loopback(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv6_loopback(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service) {
     pa_assert(m);
     pa_assert(port > 0);
 
-    return pa_socket_server_new_ipv6(m, in6addr_loopback.s6_addr, port, fallback, tcpwrap_service);
+    return pa_socket_server_new_ipv6(m, in6addr_loopback.s6_addr, port, tcpwrap_service);
 }
 #endif
 
-pa_socket_server* pa_socket_server_new_ipv4_any(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv4_any(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service) {
     pa_assert(m);
     pa_assert(port > 0);
 
-    return pa_socket_server_new_ipv4(m, INADDR_ANY, port, fallback, tcpwrap_service);
+    return pa_socket_server_new_ipv4(m, INADDR_ANY, port, tcpwrap_service);
 }
 
 #ifdef HAVE_IPV6
-pa_socket_server* pa_socket_server_new_ipv6_any(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv6_any(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service) {
     pa_assert(m);
     pa_assert(port > 0);
 
-    return pa_socket_server_new_ipv6(m, in6addr_any.s6_addr, port, fallback, tcpwrap_service);
+    return pa_socket_server_new_ipv6(m, in6addr_any.s6_addr, port, tcpwrap_service);
 }
 #endif
 
-pa_socket_server* pa_socket_server_new_ipv4_string(pa_mainloop_api *m, const char *name, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv4_string(pa_mainloop_api *m, const char *name, uint16_t port, const char *tcpwrap_service) {
     struct in_addr ipv4;
 
     pa_assert(m);
@@ -405,13 +390,13 @@
     pa_assert(port > 0);
 
     if (inet_pton(AF_INET, name, &ipv4) > 0)
-        return pa_socket_server_new_ipv4(m, ntohl(ipv4.s_addr), port, fallback, tcpwrap_service);
+        return pa_socket_server_new_ipv4(m, ntohl(ipv4.s_addr), port, tcpwrap_service);
 
     return NULL;
 }
 
 #ifdef HAVE_IPV6
-pa_socket_server* pa_socket_server_new_ipv6_string(pa_mainloop_api *m, const char *name, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service) {
+pa_socket_server* pa_socket_server_new_ipv6_string(pa_mainloop_api *m, const char *name, uint16_t port, const char *tcpwrap_service) {
     struct in6_addr ipv6;
 
     pa_assert(m);
@@ -419,7 +404,7 @@
     pa_assert(port > 0);
 
     if (inet_pton(AF_INET6, name, &ipv6) > 0)
-        return pa_socket_server_new_ipv6(m, ipv6.s6_addr, port, fallback, tcpwrap_service);
+        return pa_socket_server_new_ipv6(m, ipv6.s6_addr, port, tcpwrap_service);
 
     return NULL;
 }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-server.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-server.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-server.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-server.h	2010-01-15 23:21:19.000000000 +0000
@@ -33,15 +33,15 @@
 
 pa_socket_server* pa_socket_server_new(pa_mainloop_api *m, int fd);
 pa_socket_server* pa_socket_server_new_unix(pa_mainloop_api *m, const char *filename);
-pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
-pa_socket_server* pa_socket_server_new_ipv4_loopback(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
-pa_socket_server* pa_socket_server_new_ipv4_any(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
-pa_socket_server* pa_socket_server_new_ipv4_string(pa_mainloop_api *m, const char *name, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv4_loopback(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv4_any(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv4_string(pa_mainloop_api *m, const char *name, uint16_t port, const char *tcpwrap_service);
 #ifdef HAVE_IPV6
-pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t address[16], uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
-pa_socket_server* pa_socket_server_new_ipv6_loopback(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
-pa_socket_server* pa_socket_server_new_ipv6_any(pa_mainloop_api *m, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
-pa_socket_server* pa_socket_server_new_ipv6_string(pa_mainloop_api *m, const char *name, uint16_t port, pa_bool_t fallback, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t address[16], uint16_t port, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv6_loopback(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv6_any(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service);
+pa_socket_server* pa_socket_server_new_ipv6_string(pa_mainloop_api *m, const char *name, uint16_t port, const char *tcpwrap_service);
 #endif
 
 void pa_socket_server_unref(pa_socket_server*s);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-util.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-util.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/socket-util.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/socket-util.c	2010-01-15 23:21:19.000000000 +0000
@@ -85,11 +85,12 @@
 
 #ifndef OS_IS_WIN32
     pa_assert_se(fstat(fd, &st) == 0);
+#endif
 
+#ifndef OS_IS_WIN32
     if (S_ISSOCK(st.st_mode)) {
 #endif
         union {
-            struct sockaddr_storage storage;
             struct sockaddr sa;
             struct sockaddr_in in;
 #ifdef HAVE_IPV6
@@ -151,7 +152,7 @@
     pa_assert(fd >= 0);
 
     priority = 6;
-    if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority)) < 0)
+    if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, (void*)&priority, sizeof(priority)) < 0)
         pa_log_warn("SO_PRIORITY failed: %s", pa_cstrerror(errno));
 #endif
 }
@@ -165,9 +166,9 @@
     {
         int on = 1;
 #if defined(SOL_TCP)
-        if (setsockopt(fd, SOL_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
+        if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (void*)&on, sizeof(on)) < 0)
 #else
-        if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
+        if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void*)&on, sizeof(on)) < 0)
 #endif
             pa_log_warn("TCP_NODELAY failed: %s", pa_cstrerror(errno));
     }
@@ -177,9 +178,9 @@
     {
         int tos = IPTOS_LOWDELAY;
 #ifdef SOL_IP
-        if (setsockopt(fd, SOL_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+        if (setsockopt(fd, SOL_IP, IP_TOS, (void*)&tos, sizeof(tos)) < 0)
 #else
-        if (setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+        if (setsockopt(fd, IPPROTO_IP, IP_TOS, (void*)&tos, sizeof(tos)) < 0)
 #endif
             pa_log_warn("IP_TOS failed: %s", pa_cstrerror(errno));
     }
@@ -195,9 +196,9 @@
     {
         int tos = IPTOS_LOWDELAY;
 #ifdef SOL_IP
-        if (setsockopt(fd, SOL_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+        if (setsockopt(fd, SOL_IP, IP_TOS, (void*)&tos, sizeof(tos)) < 0)
 #else
-        if (setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+        if (setsockopt(fd, IPPROTO_IP, IP_TOS, (void*)&tos, sizeof(tos)) < 0)
 #endif
             pa_log_warn("IP_TOS failed: %s", pa_cstrerror(errno));
     }
@@ -205,11 +206,11 @@
 }
 
 int pa_socket_set_rcvbuf(int fd, size_t l) {
-    int bufsz = (int) l;
+    int bufsz = (int)l;
 
     pa_assert(fd >= 0);
 
-    if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz)) < 0) {
+    if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void*)&bufsz, sizeof(bufsz)) < 0) {
         pa_log_warn("SO_RCVBUF: %s", pa_cstrerror(errno));
         return -1;
     }
@@ -218,12 +219,12 @@
 }
 
 int pa_socket_set_sndbuf(int fd, size_t l) {
-    int bufsz = (int) l;
+    int bufsz = (int)l;
 
     pa_assert(fd >= 0);
 
-    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz)) < 0) {
-        pa_log_warn("SO_SNDBUF: %s", pa_cstrerror(errno));
+    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void*)&bufsz, sizeof(bufsz)) < 0) {
+        pa_log("SO_SNDBUF: %s", pa_cstrerror(errno));
         return -1;
     }
 
@@ -238,7 +239,7 @@
 
     pa_assert(fn);
 
-    if ((fd = pa_socket_cloexec(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
         pa_log("socket(): %s", pa_cstrerror(errno));
         goto finish;
     }
@@ -314,7 +315,6 @@
 pa_bool_t pa_socket_is_local(int fd) {
 
     union {
-        struct sockaddr_storage storage;
         struct sockaddr sa;
         struct sockaddr_in in;
 #ifdef HAVE_IPV6
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sound-file.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sound-file.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sound-file.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sound-file.c	2010-01-15 23:21:19.000000000 +0000
@@ -62,7 +62,11 @@
 
     pa_memchunk_reset(chunk);
 
-    if ((fd = pa_open_cloexec(fname, O_RDONLY, 0)) < 0) {
+    if ((fd = open(fname, O_RDONLY
+#ifdef O_NOCTTY
+                   |O_NOCTTY
+#endif
+                   )) < 0) {
         pa_log("Failed to open file %s: %s", fname, pa_cstrerror(errno));
         goto finish;
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sound-file-stream.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sound-file-stream.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/sound-file-stream.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/sound-file-stream.c	2010-01-15 23:21:19.000000000 +0000
@@ -239,6 +239,7 @@
     pa_sink_input_new_data data;
     int fd;
     SF_INFO sfi;
+    pa_memchunk silence;
 
     pa_assert(sink);
     pa_assert(fname);
@@ -252,7 +253,11 @@
     u->readf_function = NULL;
     u->memblockq = NULL;
 
-    if ((fd = pa_open_cloexec(fname, O_RDONLY, 0)) < 0) {
+    if ((fd = open(fname, O_RDONLY
+#ifdef O_NOCTTY
+                   |O_NOCTTY
+#endif
+                   )) < 0) {
         pa_log("Failed to open file %s: %s", fname, pa_cstrerror(errno));
         goto fail;
     }
@@ -320,7 +325,9 @@
     u->sink_input->state_change = sink_input_state_change_cb;
     u->sink_input->userdata = u;
 
-    u->memblockq = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, pa_frame_size(&ss), 1, 1, 0, NULL);
+    pa_sink_input_get_silence(u->sink_input, &silence);
+    u->memblockq = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, pa_frame_size(&ss), 1, 1, 0, &silence);
+    pa_memblock_unref(silence.memblock);
 
     pa_sink_input_put(u->sink_input);
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/svolume_mmx.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/svolume_mmx.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/svolume_mmx.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/svolume_mmx.c	2010-01-15 23:21:19.000000000 +0000
@@ -25,8 +25,6 @@
 #endif
 
 #include <pulse/timeval.h>
-#include <pulse/rtclock.h>
-
 #include <pulsecore/random.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
@@ -294,8 +292,6 @@
     }
     stop = pa_rtclock_now();
     pa_log_info("ref: %llu usec.", (long long unsigned int)(stop - start));
-
-    pa_assert_se(memcmp(samples_ref, samples, sizeof(samples)) == 0);
 }
 #endif
 
@@ -309,7 +305,7 @@
     run_test ();
 #endif
 
-    if (flags & PA_CPU_X86_MMX) {
+    if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
         pa_log_info("Initialising MMX optimized functions.");
 
         pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_mmx);
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/svolume_sse.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/svolume_sse.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/svolume_sse.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/svolume_sse.c	2010-01-15 23:21:19.000000000 +0000
@@ -25,8 +25,6 @@
 #endif
 
 #include <pulse/timeval.h>
-#include <pulse/rtclock.h>
-
 #include <pulsecore/random.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
@@ -263,7 +261,7 @@
 
     func = pa_get_volume_func (PA_SAMPLE_S16NE);
 
-    printf ("checking SSE2 %zd\n", sizeof (samples));
+    printf ("checking SSE %zd\n", sizeof (samples));
 
     pa_random (samples, sizeof (samples));
     memcpy (samples_ref, samples, sizeof (samples));
@@ -275,7 +273,7 @@
         volumes[i] = volumes[padding];
 
     func (samples_ref, volumes, CHANNELS, sizeof (samples));
-    pa_volume_s16ne_sse2 (samples, volumes, CHANNELS, sizeof (samples));
+    pa_volume_s16ne_sse (samples, volumes, CHANNELS, sizeof (samples));
     for (i = 0; i < SAMPLES; i++) {
         if (samples[i] != samples_ref[i]) {
             printf ("%d: %04x != %04x (%04x * %04x)\n", i, samples[i], samples_ref[i],
@@ -286,7 +284,7 @@
     start = pa_rtclock_now();
     for (j = 0; j < TIMES; j++) {
         memcpy (samples, samples_orig, sizeof (samples));
-        pa_volume_s16ne_sse2 (samples, volumes, CHANNELS, sizeof (samples));
+        pa_volume_s16ne_sse (samples, volumes, CHANNELS, sizeof (samples));
     }
     stop = pa_rtclock_now();
     pa_log_info("SSE: %llu usec.", (long long unsigned int)(stop - start));
@@ -298,8 +296,6 @@
     }
     stop = pa_rtclock_now();
     pa_log_info("ref: %llu usec.", (long long unsigned int)(stop - start));
-
-    pa_assert_se(memcmp(samples_ref, samples, sizeof(samples)) == 0);
 }
 #endif
 #endif /* defined (__i386__) || defined (__amd64__) */
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/thread.h pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/thread.h
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/thread.h	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/thread.h	2010-01-15 23:21:19.000000000 +0000
@@ -55,7 +55,7 @@
 #define PA_STATIC_TLS_DECLARE(name, free_cb)                            \
     static struct {                                                     \
         pa_once once;                                                   \
-        pa_tls *tls;                                                    \
+        pa_tls *volatile tls;                                           \
     } name##_tls = {                                                    \
         .once = PA_ONCE_INIT,                                           \
         .tls = NULL                                                     \
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/thread-posix.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/thread-posix.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/thread-posix.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/thread-posix.c	2010-01-15 23:21:19.000000000 +0000
@@ -80,11 +80,9 @@
 
     pa_assert(thread_func);
 
-    t = pa_xnew(pa_thread, 1);
+    t = pa_xnew0(pa_thread, 1);
     t->thread_func = thread_func;
     t->userdata = userdata;
-    t->joined = FALSE;
-    pa_atomic_store(&t->running, 0);
 
     if (pthread_create(&t->id, NULL, internal_thread_func, t) < 0) {
         pa_xfree(t);
@@ -135,10 +133,8 @@
     /* This is a foreign thread, let's create a pthread structure to
      * make sure that we can always return a sensible pointer */
 
-    t = pa_xnew(pa_thread, 1);
+    t = pa_xnew0(pa_thread, 1);
     t->id = pthread_self();
-    t->thread_func = NULL;
-    t->userdata = NULL;
     t->joined = TRUE;
     pa_atomic_store(&t->running, 2);
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/time-smoother.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/time-smoother.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/time-smoother.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/time-smoother.c	2010-01-15 23:21:19.000000000 +0000
@@ -196,13 +196,6 @@
     int64_t ax = 0, ay = 0, k, t;
     double r;
 
-    /* FIXME: Optimization: Jason Newton suggested that instead of
-     * going through the history on each iteration we could calculated
-     * avg_gradient() as we go.
-     *
-     * Second idea: it might make sense to weight history entries:
-     * more recent entries should matter more than old ones. */
-
     /* Too few measurements, assume gradient of 1 */
     if (s->n_history < s->min_history)
         return 1;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/x11prop.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/x11prop.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/pulsecore/x11prop.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/pulsecore/x11prop.c	2010-01-15 23:21:19.000000000 +0000
@@ -32,12 +32,12 @@
 
 void pa_x11_set_prop(Display *d, const char *name, const char *data) {
     Atom a = XInternAtom(d, name, False);
-    XChangeProperty(d, DefaultRootWindow(d), a, XA_STRING, 8, PropModeReplace, (const unsigned char*) data, (int) (strlen(data)+1));
+    XChangeProperty(d, RootWindow(d, 0), a, XA_STRING, 8, PropModeReplace, (const unsigned char*) data, (int) (strlen(data)+1));
 }
 
 void pa_x11_del_prop(Display *d, const char *name) {
     Atom a = XInternAtom(d, name, False);
-    XDeleteProperty(d, DefaultRootWindow(d), a);
+    XDeleteProperty(d, RootWindow(d, 0), a);
 }
 
 char* pa_x11_get_prop(Display *d, const char *name, char *p, size_t l) {
@@ -47,21 +47,13 @@
     unsigned long nbytes_after;
     unsigned char *prop = NULL;
     char *ret = NULL;
-    int window_ret;
 
     Atom a = XInternAtom(d, name, False);
+    if (XGetWindowProperty(d, RootWindow(d, 0), a, 0, (long) ((l+2)/4), False, XA_STRING, &actual_type, &actual_format, &nitems, &nbytes_after, &prop) != Success)
+        goto finish;
 
-    window_ret = XGetWindowProperty(d, DefaultRootWindow(d), a, 0, (long) ((l+2)/4), False, XA_STRING, &actual_type, &actual_format, &nitems, &nbytes_after, &prop);
-
-    if (window_ret != Success || actual_type != XA_STRING) {
-        if (DefaultScreen(d) != 0) {
-            window_ret = XGetWindowProperty(d, RootWindow(d, 0), a, 0, (long) ((l+2)/4), False, XA_STRING, &actual_type, &actual_format, &nitems, &nbytes_after, &prop);
-
-            if (window_ret != Success || actual_type != XA_STRING)
-                goto finish;
-        } else
-            goto finish;
-    }
+    if (actual_type != XA_STRING)
+        goto finish;
 
     memcpy(p, prop, nitems);
     p[nitems] = 0;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/tests/lock-autospawn-test.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/tests/lock-autospawn-test.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/tests/lock-autospawn-test.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/tests/lock-autospawn-test.c	2010-01-15 23:21:19.000000000 +0000
@@ -23,9 +23,9 @@
 #include <config.h>
 #endif
 
+#include <sys/poll.h>
 #include <string.h>
 
-#include <pulsecore/poll.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/thread.h>
 #include <pulsecore/lock-autospawn.h>
@@ -69,7 +69,7 @@
         pollfd.fd = fd;
         pollfd.events = POLLIN;
 
-        pa_assert_se(pa_poll(&pollfd, 1, -1) == 1);
+        pa_assert_se(poll(&pollfd, 1, -1) == 1);
 
         pa_log("%i, woke up", PA_PTR_TO_INT(k));
     }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/tests/once-test.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/tests/once-test.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/tests/once-test.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/tests/once-test.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,103 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pthread.h>
-
-#include <pulsecore/thread.h>
-#include <pulsecore/mutex.h>
-#include <pulsecore/once.h>
-#include <pulsecore/log.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/core-error.h>
-#include <pulsecore/atomic.h>
-#include <pulse/xmalloc.h>
-
-static pa_once once = PA_ONCE_INIT;
-static volatile unsigned n_run = 0;
-static const char * volatile ran_by = NULL;
-static pthread_barrier_t barrier;
-static pa_atomic_t i_cpu = PA_ATOMIC_INIT(0);
-static unsigned n_cpu;
-
-#define N_ITERATIONS 500
-#define N_THREADS 100
-
-static void once_func(void) {
-    n_run++;
-    ran_by = (const char*) pa_thread_get_data(pa_thread_self());
-}
-
-static void thread_func(void *data) {
-    int r;
-
-#ifdef HAVE_PTHREAD_SETAFFINITY_NP
-    cpu_set_t mask;
-
-    CPU_ZERO(&mask);
-    CPU_SET((size_t) (pa_atomic_inc(&i_cpu) % n_cpu), &mask);
-    pa_assert_se(pthread_setaffinity_np(pthread_self(), sizeof(mask), &mask) == 0);
-#endif
-
-    /* pa_log("started up: %s", data); */
-
-    r = pthread_barrier_wait(&barrier);
-    pa_assert(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD);
-
-    pa_run_once(&once, once_func);
-}
-
-int main(int argc, char *argv[]) {
-    unsigned n, i;
-
-    n_cpu = pa_ncpus();
-
-    for (n = 0; n < N_ITERATIONS; n++) {
-        pa_thread* threads[N_THREADS];
-
-        pa_assert_se(pthread_barrier_init(&barrier, NULL, N_THREADS) == 0);
-
-        /* Yes, kinda ugly */
-        pa_zero(once);
-
-        for (i = 0; i < N_THREADS; i++)
-            threads[i] = pa_thread_new(thread_func, pa_sprintf_malloc("Thread #%i", i+1));
-
-        for (i = 0; i < N_THREADS; i++)
-            pa_thread_join(threads[i]);
-
-        pa_assert(n_run == 1);
-        pa_log("ran by %s", ran_by);
-
-        for (i = 0; i < N_THREADS; i++) {
-            pa_xfree(pa_thread_get_data(threads[i]));
-            pa_thread_free(threads[i]);
-        }
-
-        n_run = 0;
-        ran_by = NULL;
-
-        pa_assert_se(pthread_barrier_destroy(&barrier) == 0);
-    }
-
-    return 0;
-}
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/tests/rtpoll-test.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/tests/rtpoll-test.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/tests/rtpoll-test.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/tests/rtpoll-test.c	2010-01-15 23:21:19.000000000 +0000
@@ -22,8 +22,8 @@
 #endif
 
 #include <signal.h>
+#include <poll.h>
 
-#include <pulsecore/poll.h>
 #include <pulsecore/log.h>
 #include <pulsecore/rtpoll.h>
 
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pacat.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pacat.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pacat.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pacat.c	2010-01-15 23:21:19.000000000 +0000
@@ -45,6 +45,7 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 #include <pulsecore/sndfile-util.h>
+#include <pulsecore/core-util.h>
 
 #define TIME_EVENT_USEC 50000
 
@@ -86,6 +87,7 @@
 static pa_stream_flags_t flags = 0;
 
 static size_t latency = 0, process_time = 0;
+static int32_t latency_msec = 0, process_time_msec = 0;
 
 static pa_bool_t raw = TRUE;
 static int file_format = -1;
@@ -434,19 +436,25 @@
             buffer_attr.maxlength = (uint32_t) -1;
             buffer_attr.prebuf = (uint32_t) -1;
 
-            if (latency > 0) {
+            if (latency_msec > 0) {
+                buffer_attr.fragsize = buffer_attr.tlength = pa_usec_to_bytes(latency_msec * PA_USEC_PER_MSEC, &sample_spec);
+                flags |= PA_STREAM_ADJUST_LATENCY;
+            } else if (latency > 0) {
                 buffer_attr.fragsize = buffer_attr.tlength = (uint32_t) latency;
-                buffer_attr.minreq = (uint32_t) process_time;
                 flags |= PA_STREAM_ADJUST_LATENCY;
-            } else {
-                buffer_attr.tlength = (uint32_t) -1;
+            } else
+                buffer_attr.fragsize = buffer_attr.tlength = (uint32_t) -1;
+
+            if (process_time_msec > 0) {
+                buffer_attr.minreq = pa_usec_to_bytes(process_time_msec * PA_USEC_PER_MSEC, &sample_spec);
+            } else if (process_time > 0)
+                buffer_attr.minreq = (uint32_t) process_time;
+            else
                 buffer_attr.minreq = (uint32_t) -1;
-                buffer_attr.fragsize = (uint32_t) -1;
-            }
 
             if (mode == PLAYBACK) {
                 pa_cvolume cv;
-                if (pa_stream_connect_playback(stream, device, latency > 0 ? &buffer_attr : NULL, flags, volume_is_set ? pa_cvolume_set(&cv, sample_spec.channels, volume) : NULL, NULL) < 0) {
+                if (pa_stream_connect_playback(stream, device, &buffer_attr, flags, volume_is_set ? pa_cvolume_set(&cv, sample_spec.channels, volume) : NULL, NULL) < 0) {
                     pa_log(_("pa_stream_connect_playback() failed: %s"), pa_strerror(pa_context_errno(c)));
                     goto fail;
                 }
@@ -634,9 +642,11 @@
              "      --no-remap                        Map channels by index instead of name.\n"
              "      --latency=BYTES                   Request the specified latency in bytes.\n"
              "      --process-time=BYTES              Request the specified process time per request in bytes.\n"
+             "      --latency-msec=MSEC               Request the specified latency in msec.\n"
+             "      --process-time-msec=MSEC          Request the specified process time per request in msec.\n"
              "      --property=PROPERTY=VALUE         Set the specified property to the specified value.\n"
              "      --raw                             Record/play raw PCM data.\n"
-             "      --file-format=FFORMAT             Record/play formatted PCM data.\n"
+             "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
              "      --list-file-formats               List available file formats.\n")
            , argv0);
 }
@@ -659,7 +669,9 @@
     ARG_RAW,
     ARG_PROPERTY,
     ARG_FILE_FORMAT,
-    ARG_LIST_FILE_FORMATS
+    ARG_LIST_FILE_FORMATS,
+    ARG_LATENCY_MSEC,
+    ARG_PROCESS_TIME_MSEC
 };
 
 int main(int argc, char *argv[]) {
@@ -695,6 +707,8 @@
         {"raw",          0, NULL, ARG_RAW},
         {"file-format",  2, NULL, ARG_FILE_FORMAT},
         {"list-file-formats", 0, NULL, ARG_LIST_FILE_FORMATS},
+        {"latency-msec", 1, NULL, ARG_LATENCY_MSEC},
+        {"process-time-msec", 1, NULL, ARG_PROCESS_TIME_MSEC},
         {NULL,           0, NULL, 0}
     };
 
@@ -854,6 +868,20 @@
                 }
                 break;
 
+            case ARG_LATENCY_MSEC:
+                if (((latency_msec = (int32_t) atoi(optarg))) <= 0) {
+                    pa_log(_("Invalid latency specification '%s'"), optarg);
+                    goto quit;
+                }
+                break;
+
+            case ARG_PROCESS_TIME_MSEC:
+                if (((process_time_msec = (int32_t) atoi(optarg))) <= 0) {
+                    pa_log(_("Invalid process time specification '%s'"), optarg);
+                    goto quit;
+                }
+                break;
+
             case ARG_PROPERTY: {
                 char *t;
 
@@ -906,7 +934,7 @@
 
         filename = argv[optind];
 
-        if ((fd = pa_open_cloexec(argv[optind], mode == PLAYBACK ? O_RDONLY : O_WRONLY|O_TRUNC|O_CREAT, 0666)) < 0) {
+        if ((fd = open(argv[optind], mode == PLAYBACK ? O_RDONLY : O_WRONLY|O_TRUNC|O_CREAT, 0666)) < 0) {
             pa_log(_("open(): %s"), strerror(errno));
             goto quit;
         }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pacmd.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pacmd.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pacmd.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pacmd.c	2010-01-15 23:21:19.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include <assert.h>
 #include <signal.h>
+#include <sys/poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <errno.h>
@@ -37,7 +38,6 @@
 #include <pulse/xmalloc.h>
 #include <pulse/i18n.h>
 
-#include <pulsecore/poll.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
@@ -70,7 +70,7 @@
         goto fail;
     }
 
-    if ((fd = pa_socket_cloexec(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+    if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
         pa_log(_("socket(PF_UNIX, SOCK_STREAM, 0): %s"), strerror(errno));
         goto fail;
     }
@@ -153,7 +153,7 @@
         else if (!ibuf_eof)
             pollfd[WATCH_STDIN].events |= POLLIN;
 
-        if (pa_poll(pollfd, N_WATCH, -1) < 0) {
+        if (poll(pollfd, N_WATCH, -1) < 0) {
 
             if (errno == EINTR)
                 continue;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pactl.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pactl.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pactl.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pactl.c	2010-01-15 23:21:19.000000000 +0000
@@ -44,6 +44,8 @@
 #include <pulsecore/log.h>
 #include <pulsecore/sndfile-util.h>
 
+#define BUFSIZE (16*1024)
+
 static pa_context *context = NULL;
 static pa_mainloop_api *mainloop_api = NULL;
 
@@ -156,23 +158,10 @@
         return;
     }
 
-    printf(_("Server String: %s\n"
-             "Library Protocol Version: %u\n"
-             "Server Protocol Version: %u\n"
-             "Is Local: %s\n"
-             "Client Index: %u\n"
-             "Tile Size: %zu\n"),
-             pa_context_get_server(c),
-             pa_context_get_protocol_version(c),
-             pa_context_get_server_protocol_version(c),
-             pa_yes_no(pa_context_is_local(c)),
-             pa_context_get_index(c),
-             pa_context_get_tile_size(c, NULL));
-
     pa_sample_spec_snprint(ss, sizeof(ss), &i->sample_spec);
     pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map);
 
-    printf(_("User Name: %s\n"
+    printf(_("User name: %s\n"
              "Host Name: %s\n"
              "Server Name: %s\n"
              "Server Version: %s\n"
@@ -180,7 +169,7 @@
              "Default Channel Map: %s\n"
              "Default Sink: %s\n"
              "Default Source: %s\n"
-             "Cookie: %04x:%04x\n"),
+             "Cookie: %08x\n"),
            i->user_name,
            i->host_name,
            i->server_name,
@@ -189,8 +178,7 @@
            cm,
            i->default_sink_name,
            i->default_source_name,
-           i->cookie >> 16,
-           i->cookie & 0xFFFFU);
+           i->cookie);
 
     complete_action();
 }
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pasuspender.c pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pasuspender.c
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/pasuspender.c	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/pasuspender.c	2010-01-15 23:21:19.000000000 +0000
@@ -45,6 +45,8 @@
 #include <pulse/pulseaudio.h>
 #include <pulsecore/macro.h>
 
+#define BUFSIZE 1024
+
 static pa_context *context = NULL;
 static pa_mainloop_api *mainloop_api = NULL;
 static char **child_argv = NULL;
diff -Nru pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/qpaeq pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/qpaeq
--- pulseaudio-0.9.22~0.9.21+341-g62bf/src/utils/qpaeq	2010-01-15 01:20:45.000000000 +0000
+++ pulseaudio-0.9.22~0.9.21+stable-queue-24-gfa64/src/utils/qpaeq	1970-01-01 01:00:00.000000000 +0100
@@ -1,560 +0,0 @@
-#!/usr/bin/env python
-#    qpaeq is a equalizer interface for pulseaudio's equalizer sinks
-#    Copyright (C) 2009  Jason Newton <nevion@gmail.com
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import os,math,sys
-try:
-    import PyQt4,sip
-    from PyQt4 import QtGui,QtCore
-    import dbus.mainloop.qt
-    import dbus
-except ImportError,e:
-    print 'There was an error importing need libraries'
-    print 'Make sure you haveqt4 and dbus forthon installed'
-    print 'The error that occured was'
-    print '\t%s' %(str(e))
-    import sys
-    sys.exit(-1)
-
-from functools import partial
-
-import signal
-signal.signal(signal.SIGINT, signal.SIG_DFL)
-SYNC_TIMEOUT = 4*1000
-
-CORE_PATH = "/org/pulseaudio/core1"
-CORE_IFACE = "org.PulseAudio.Core1"
-def connect():
-    try:
-        if 'PULSE_DBUS_SERVER' in os.environ:
-            address = os.environ['PULSE_DBUS_SERVER']
-        else:
-            bus = dbus.SessionBus() # Should be UserBus, but D-Bus doesn't implement that yet.
-            server_lookup = bus.get_object('org.PulseAudio1', '/org/pulseaudio/server_lookup1')
-            address = server_lookup.Get('org.PulseAudio.ServerLookup1', 'Address', dbus_interface='org.freedesktop.DBus.Properties')
-        return dbus.connection.Connection(address)
-    except Exception,e:
-        print 'There was an error connecting to pulseaudio, please make sure you have the pulseaudio dbus'
-        print 'and equalizer modules loaded, exiting...'
-        import sys
-        sys.exit(-1)
-
-
-#TODO: signals: sink Filter changed, sink reconfigured (window size) (sink iface)
-#TODO: manager signals: new sink, removed sink, new profile, removed profile
-#TODO: add support for changing of window_size 1000-fft_size (adv option)
-#TODO: reconnect support loop 1 second trying to reconnect
-#TODO: just resample the filters for profiles when loading to different sizes
-#TODO: add preamp
-prop_iface='org.freedesktop.DBus.Properties'
-eq_iface='org.PulseAudio.Ext.Equalizing1.Equalizer'
-device_iface='org.PulseAudio.Core1.Device'
-class QPaeq(QtGui.QWidget):
-    manager_path='/org/pulseaudio/equalizing1'
-    manager_iface='org.PulseAudio.Ext.Equalizing1.Manager'
-    core_iface='org.PulseAudio.Core1'
-    core_path='/org/pulseaudio/core1'
-    def __init__(self):
-        QtGui.QWidget.__init__(self)
-        self.setWindowTitle('qpaeq')
-        self.slider_widget=None
-        self.sink_name=None
-        self.filter_state=None
-
-        self.create_layout()
-
-        self.set_connection()
-        self.connect_to_sink(self.sinks[0])
-        self.set_callbacks()
-        self.setMinimumSize(self.sizeHint())
-
-    def create_layout(self):
-        self.main_layout=QtGui.QVBoxLayout()
-        self.setLayout(self.main_layout)
-        toprow_layout=QtGui.QHBoxLayout()
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        #sizePolicy.setHeightForWidth(self.profile_box.sizePolicy().hasHeightForWidth())
-
-        toprow_layout.addWidget(QtGui.QLabel('Sink'))
-        self.sink_box = QtGui.QComboBox()
-        self.sink_box.setSizePolicy(sizePolicy)
-        self.sink_box.setDuplicatesEnabled(False)
-        self.sink_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
-        #self.sink_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
-        toprow_layout.addWidget(self.sink_box)
-
-        toprow_layout.addWidget(QtGui.QLabel('Channel'))
-        self.channel_box = QtGui.QComboBox()
-        self.channel_box.setSizePolicy(sizePolicy)
-        toprow_layout.addWidget(self.channel_box)
-
-        toprow_layout.addWidget(QtGui.QLabel('Preset'))
-        self.profile_box = QtGui.QComboBox()
-        self.profile_box.setSizePolicy(sizePolicy)
-        self.profile_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
-        #self.profile_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
-        toprow_layout.addWidget(self.profile_box)
-
-        large_icon_size=self.style().pixelMetric(QtGui.QStyle.PM_LargeIconSize)
-        large_icon_size=QtCore.QSize(large_icon_size,large_icon_size)
-        save_profile=QtGui.QToolButton()
-        save_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_DriveFDIcon))
-        save_profile.setIconSize(large_icon_size)
-        save_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
-        save_profile.clicked.connect(self.save_profile)
-        remove_profile=QtGui.QToolButton()
-        remove_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_TrashIcon))
-        remove_profile.setIconSize(large_icon_size)
-        remove_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
-        remove_profile.clicked.connect(self.remove_profile)
-        toprow_layout.addWidget(save_profile)
-        toprow_layout.addWidget(remove_profile)
-
-        reset_button = QtGui.QPushButton('Reset')
-        reset_button.clicked.connect(self.reset)
-        toprow_layout.addStretch()
-        toprow_layout.addWidget(reset_button)
-        self.layout().addLayout(toprow_layout)
-
-        self.profile_box.activated.connect(self.load_profile)
-        self.channel_box.activated.connect(self.select_channel)
-    def connect_to_sink(self,name):
-        #TODO: clear slots for profile buttons
-
-        #flush any pending saves for other sinks
-        if self.filter_state is not None:
-            self.filter_state.flush_state()
-        sink=self.connection.get_object(object_path=name)
-        self.sink_props=dbus.Interface(sink,dbus_interface=prop_iface)
-        self.sink=dbus.Interface(sink,dbus_interface=eq_iface)
-        self.filter_state=FilterState(sink)
-        #sample_rate,filter_rate,channels,channel)
-
-        self.channel_box.clear()
-        self.channel_box.addItem('All',self.filter_state.channels)
-        for i in xrange(self.filter_state.channels):
-            self.channel_box.addItem('%d' %(i+1,),i)
-        self.setMinimumSize(self.sizeHint())
-
-        self.set_slider_widget(SliderArray(self.filter_state))
-
-        self.sink_name=name
-        #set the signal listener for this sink
-        core=self._get_core()
-        #temporary hack until signal filtering works properly
-        core.ListenForSignal('',[dbus.ObjectPath(self.sink_name),dbus.ObjectPath(self.manager_path)])
-        #for x in ['FilterChanged']:
-        #    core.ListenForSignal("%s.%s" %(self.eq_iface,x),[dbus.ObjectPath(self.sink_name)])
-        #core.ListenForSignal(self.eq_iface,[dbus.ObjectPath(self.sink_name)])
-        self.sink.connect_to_signal('FilterChanged',self.read_filter)
-
-    def set_slider_widget(self,widget):
-        layout=self.layout()
-        if self.slider_widget is not None:
-            i=layout.indexOf(self.slider_widget)
-            layout.removeWidget(self.slider_widget)
-            self.slider_widget.deleteLater()
-            layout.insertWidget(i,self.slider_widget)
-        else:
-            layout.addWidget(widget)
-        self.slider_widget=widget
-        self.read_filter()
-    def _get_core(self):
-        core_obj=self.connection.get_object(object_path=self.core_path)
-        core=dbus.Interface(core_obj,dbus_interface=self.core_iface)
-        return core
-    def sink_added(self,sink):
-        #TODO: preserve selected sink
-        self.update_sinks()
-    def sink_removed(self,sink):
-        #TODO: preserve selected sink, try connecting to backup otherwise
-        if sink==self.sink_name:
-            #connect to new sink?
-            pass
-        self.update_sinks()
-    def save_profile(self):
-        #popup dialog box for name
-        current=self.profile_box.currentIndex()
-        profile,ok=QtGui.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
-        if not ok or profile=='':
-            return
-        if profile in self.profiles:
-            mbox=QtGui.QMessageBox(self)
-            mbox.setText('%s preset already exists'%(profile,))
-            mbox.setInformativeText('Do you want to save over it?')
-            mbox.setStandardButtons(mbox.Save|mbox.Discard|mbox.Cancel)
-            mbox.setDefaultButton(mbox.Save)
-            ret=mbox.exec_()
-            if ret!=mbox.Save:
-                return
-        self.sink.SaveProfile(self.filter_state.channel,dbus.String(profile))
-        if self.filter_state.channel==self.filter_state.channels:
-            for x in range(1,self.filter_state.channels):
-                self.sink.LoadProfile(x,dbus.String(profile))
-    def remove_profile(self):
-        #find active profile name, remove it
-        profile=self.profile_box.currentText()
-        manager=dbus.Interface(self.manager_obj,dbus_interface=self.manager_iface)
-        manager.RemoveProfile(dbus.String(profile))
-    def load_profile(self,x):
-        profile=self.profile_box.itemText(x)
-        self.filter_state.load_profile(profile)
-    def select_channel(self,x):
-        self.filter_state.channel = self.channel_box.itemData(x).toPyObject()
-        self._set_profile_name()
-        self.filter_state.readback()
-
-    #TODO: add back in preamp!
-    #print frequencies
-    #main_layout.addLayout(self.create_slider(partial(self.update_coefficient,0),
-    #    'Preamp')[0]
-    #)
-    def set_connection(self):
-        self.connection=connect()
-        self.manager_obj=self.connection.get_object(object_path=self.manager_path)
-        manager_props=dbus.Interface(self.manager_obj,dbus_interface=prop_iface)
-        self.sinks=manager_props.Get(self.manager_iface,'EqualizedSinks')
-    def set_callbacks(self):
-        manager=dbus.Interface(self.manager_obj,dbus_interface=self.manager_iface)
-        manager.connect_to_signal('ProfilesChanged',self.update_profiles)
-        manager.connect_to_signal('SinkAdded',self.sink_added)
-        manager.connect_to_signal('SinkRemoved',self.sink_removed)
-        #self._get_core().ListenForSignal(self.manager_iface,[])
-        #self._get_core().ListenForSignal(self.manager_iface,[dbus.ObjectPath(self.manager_path)])
-        #core=self._get_core()
-        #for x in ['ProfilesChanged','SinkAdded','SinkRemoved']:
-        #    core.ListenForSignal("%s.%s" %(self.manager_iface,x),[dbus.ObjectPath(self.manager_path)])
-        self.update_profiles()
-        self.update_sinks()
-    def update_profiles(self):
-        #print 'update profiles called!'
-        manager_props=dbus.Interface(self.manager_obj,dbus_interface=prop_iface)
-        self.profiles=manager_props.Get(self.manager_iface,'Profiles')
-        self.profile_box.blockSignals(True)
-        self.profile_box.clear()
-        self.profile_box.addItems(self.profiles)
-        self.profile_box.blockSignals(False)
-        self._set_profile_name()
-    def update_sinks(self):
-        self.sink_box.blockSignals(True)
-        self.sink_box.clear()
-        for x in self.sinks:
-            sink=self.connection.get_object(object_path=x)
-            sink_props=dbus.Interface(sink,dbus_interface=prop_iface)
-            simple_name=sink_props.Get(device_iface,'Name')
-            self.sink_box.addItem(simple_name,x)
-        self.sink_box.blockSignals(False)
-        self.sink_box.setMinimumSize(self.sink_box.sizeHint())
-    def read_filter(self):
-        #print self.filter_frequencies
-        self.filter_state.readback()
-    def reset(self):
-        coefs=dbus.Array([1/math.sqrt(2.0)]*(self.filter_state.filter_rate//2+1))
-        preamp=1.0
-        self.filter_state.set_filter(preamp,coefs)
-    def _set_profile_name(self):
-        self.profile_box.blockSignals(True)
-        profile_name=self.sink.BaseProfile(self.filter_state.channel)
-        if profile_name is not None:
-            i=self.profile_box.findText(profile_name)
-            if i>=0:
-                self.profile_box.setCurrentIndex(i)
-        self.profile_box.blockSignals(False)
-
-
-class SliderArray(QtGui.QWidget):
-    def __init__(self,filter_state,parent=None):
-        super(SliderArray,self).__init__(parent)
-        #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
-        #self.setStyleSheet('font-size: 7pt; font-family: monospace;'+outline%('blue'))
-        self.filter_state=filter_state
-        self.setLayout(QtGui.QHBoxLayout())
-        self.sub_array=None
-        self.set_sub_array(SliderArraySub(self.filter_state))
-        self.inhibit_resize=0
-    def set_sub_array(self,widget):
-        if self.sub_array is not None:
-            self.layout().removeWidget(self.sub_array)
-            self.sub_array.disconnect_signals()
-            self.sub_array.deleteLater()
-        self.sub_array=widget
-        self.layout().addWidget(self.sub_array)
-        self.sub_array.connect_signals()
-        self.filter_state.readback()
-    def resizeEvent(self,event):
-        super(SliderArray,self).resizeEvent(event)
-        if self.inhibit_resize==0:
-            self.inhibit_resize+=1
-            #self.add_sliders_to_fit()
-            t=QtCore.QTimer(self)
-            t.setSingleShot(True)
-            t.setInterval(0)
-            t.timeout.connect(partial(self.add_sliders_to_fit,event))
-            t.start()
-    def add_sliders_to_fit(self,event):
-        if event.oldSize().width()>0 and event.size().width()>0:
-            i=len(self.filter_state.frequencies)*int(round(float(event.size().width())/event.oldSize().width()))
-        else:
-            i=len(self.filter_state.frequencies)
-
-        t_w=self.size().width()
-        def evaluate(filter_state, target, variable):
-            base_freqs=self.filter_state.freq_proper(self.filter_state.DEFAULT_FREQUENCIES)
-            filter_state._set_frequency_values(subdivide(base_freqs,variable))
-            new_widget=SliderArraySub(filter_state)
-            w=new_widget.sizeHint().width()
-            return w-target
-        def searcher(initial,evaluator):
-            i=initial
-            def d(e): return 1 if e>=0 else -1
-            error=evaluator(i)
-            old_direction=d(error)
-            i-=old_direction
-            while True:
-                error=evaluator(i)
-                direction=d(error)
-                if direction!=old_direction:
-                    k=i-1
-                    #while direction<0 and error!=0:
-                    #    k-=1
-                    #    error=evaluator(i)
-                    #    direction=d(error)
-                    return k, evaluator(k)
-                i-=direction
-                old_direction=direction
-        searcher(i,partial(evaluate,self.filter_state,t_w))
-        self.set_sub_array(SliderArraySub(self.filter_state))
-        self.inhibit_resize-=1
-
-class SliderArraySub(QtGui.QWidget):
-    def __init__(self,filter_state,parent=None):
-        super(SliderArraySub,self).__init__(parent)
-        self.filter_state=filter_state
-        self.setLayout(QtGui.QGridLayout())
-        self.slider=[None]*len(self.filter_state.frequencies)
-        self.label=[None]*len(self.slider)
-        #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
-        #self.setStyleSheet('font-size: 7pt; font-family: monospace;'+outline%('blue'))
-        qt=QtCore.Qt
-        #self.layout().setHorizontalSpacing(1)
-        def add_slider(slider,label, c):
-            self.layout().addWidget(slider,0,c,qt.AlignHCenter)
-            self.layout().addWidget(label,1,c,qt.AlignHCenter)
-            self.layout().setColumnMinimumWidth(c,max(label.sizeHint().width(),slider.sizeHint().width()))
-        def create_slider(slider_label):
-            slider=QtGui.QSlider(QtCore.Qt.Vertical,self)
-            label=SliderLabel(slider_label,filter_state,self)
-            slider.setRange(-1000,2000)
-            slider.setSingleStep(1)
-            return (slider,label)
-        self.preamp_slider,self.preamp_label=create_slider('Preamp')
-        add_slider(self.preamp_slider,self.preamp_label,0)
-        for i,hz in enumerate(self.filter_state.frequencies):
-            slider,label=create_slider(self.hz2label(hz))
-            self.slider[i]=slider
-            #slider.setStyleSheet('font-size: 7pt; font-family: monospace;'+outline%('red',))
-            self.label[i]=label
-            c=i+1
-            add_slider(slider,label,i+1)
-    def hz2label(self, hz):
-        if hz==0:
-            label_text='DC'
-        elif hz==self.filter_state.sample_rate//2:
-            label_text='Coda'
-        else:
-            label_text=hz2str(hz)
-        return label_text
-
-    def connect_signals(self):
-        def connect(writer,reader,slider,label):
-            slider.valueChanged.connect(writer)
-            self.filter_state.readFilter.connect(reader)
-            label_cb=partial(slider.setValue,0)
-            label.clicked.connect(label_cb)
-            return label_cb
-
-        self.preamp_writer_cb=self.write_preamp
-        self.preamp_reader_cb=self.sync_preamp
-        self.preamp_label_cb=connect(self.preamp_writer_cb,
-                self.preamp_reader_cb,
-                self.preamp_slider,
-                self.preamp_label)
-        self.writer_callbacks=[None]*len(self.slider)
-        self.reader_callbacks=[None]*len(self.slider)
-        self.label_callbacks=[None]*len(self.label)
-        for i in range(len(self.slider)):
-            self.writer_callbacks[i]=partial(self.write_coefficient,i)
-            self.reader_callbacks[i]=partial(self.sync_coefficient,i)
-            self.label_callbacks[i]=connect(self.writer_callbacks[i],
-                    self.reader_callbacks[i],
-                    self.slider[i],
-                    self.label[i])
-    def disconnect_signals(self):
-        def disconnect(writer,reader,label_cb,slider,label):
-            slider.valueChanged.disconnect(writer)
-            self.filter_state.readFilter.disconnect(reader)
-            label.clicked.disconnect(label_cb)
-        disconnect(self.preamp_writer_cb, self.preamp_reader_cb,
-                self.preamp_label_cb, self.preamp_slider, self.preamp_label)
-        for i in range(len(self.slider)):
-            disconnect(self.writer_callbacks[i],
-                    self.reader_callbacks[i],
-                    self.label_callbacks[i],
-                    self.slider[i],
-                    self.label[i])
-
-    def write_preamp(self, v):
-        self.filter_state.preamp=self.slider2coef(v)
-        self.filter_state.seed()
-    def sync_preamp(self):
-        self.preamp_slider.blockSignals(True)
-        self.preamp_slider.setValue(self.coef2slider(self.filter_state.preamp))
-        self.preamp_slider.blockSignals(False)
-
-
-    def write_coefficient(self,i,v):
-        self.filter_state.coefficients[i]=self.slider2coef(v)/math.sqrt(2.0)
-        self.filter_state.seed()
-    def sync_coefficient(self,i):
-        slider=self.slider[i]
-        slider.blockSignals(True)
-        slider.setValue(self.coef2slider(math.sqrt(2.0)*self.filter_state.coefficients[i]))
-        slider.blockSignals(False)
-    @staticmethod
-    def slider2coef(x):
-        return (1.0+(x/1000.0))
-    @staticmethod
-    def coef2slider(x):
-        return int((x-1.0)*1000)
-outline='border-width: 1px; border-style: solid; border-color: %s;'
-
-class SliderLabel(QtGui.QLabel):
-    clicked=QtCore.pyqtSignal()
-    def __init__(self,label_text,filter_state,parent=None):
-        super(SliderLabel,self).__init__(parent)
-        self.setStyleSheet('font-size: 7pt; font-family: monospace;')
-        self.setText(label_text)
-        self.setMinimumSize(self.sizeHint())
-    def mouseDoubleClickEvent(self, event):
-        self.clicked.emit()
-        super(SliderLabel,self).mouseDoubleClickEvent(event)
-
-#until there are server side state savings, do it in the client but try and avoid
-#simulaneous broadcasting situations
-class FilterState(QtCore.QObject):
-    #DEFAULT_FREQUENCIES=map(float,[25,50,75,100,150,200,300,400,500,800,1e3,1.5e3,3e3,5e3,7e3,10e3,15e3,20e3])
-    DEFAULT_FREQUENCIES=[31.75,63.5,125,250,500,1e3,2e3,4e3,8e3,16e3]
-    readFilter=QtCore.pyqtSignal()
-    def __init__(self,sink):
-        super(FilterState,self).__init__()
-        self.sink_props=dbus.Interface(sink,dbus_interface=prop_iface)
-        self.sink=dbus.Interface(sink,dbus_interface=eq_iface)
-        self.sample_rate=self.get_eq_attr('SampleRate')
-        self.filter_rate=self.get_eq_attr('FilterSampleRate')
-        self.channels=self.get_eq_attr('NChannels')
-        self.channel=self.channels
-        self.set_frequency_values(self.DEFAULT_FREQUENCIES)
-        self.sync_timer=QtCore.QTimer()
-        self.sync_timer.setSingleShot(True)
-        self.sync_timer.timeout.connect(self.save_state)
-
-    def get_eq_attr(self,attr):
-        return self.sink_props.Get(eq_iface,attr)
-    def freq_proper(self,xs):
-        return [0]+xs+[self.sample_rate//2]
-    def _set_frequency_values(self,freqs):
-        self.frequencies=freqs
-        #print 'base',self.frequencies
-        self.filter_frequencies=map(lambda x: int(round(x)), \
-                self.translate_rates(self.filter_rate,self.sample_rate,
-                    self.frequencies) \
-                )
-        self.coefficients=[0.0]*len(self.frequencies)
-        self.preamp=1.0
-    def set_frequency_values(self,freqs):
-        self._set_frequency_values(self.freq_proper(freqs))
-    @staticmethod
-    def translate_rates(dst,src,rates):
-        return list(map(lambda x: x*dst/src,rates))
-    def seed(self):
-        self.sink.SeedFilter(self.channel,self.filter_frequencies,self.coefficients,self.preamp)
-        self.sync_timer.start(SYNC_TIMEOUT)
-    def readback(self):
-        coefs,preamp=self.sink.FilterAtPoints(self.channel,self.filter_frequencies)
-        self.coefficients=coefs
-        self.preamp=preamp
-        self.readFilter.emit()
-    def set_filter(self,preamp,coefs):
-        self.sink.SetFilter(self.channel,dbus.Array(coefs),self.preamp)
-        self.sync_timer.start(SYNC_TIMEOUT)
-    def save_state(self):
-        print 'saving state'
-        self.sink.SaveState()
-    def load_profile(self,profile):
-        self.sink.LoadProfile(self.channel,dbus.String(profile))
-        self.sync_timer.start(SYNC_TIMEOUT)
-    def flush_state(self):
-        if self.sync_timer.isActive():
-            self.sync_timer.stop()
-            self.save_state()
-
-
-def safe_log(k,b):
-    i=0
-    while k//b!=0:
-        i+=1
-        k=k//b
-    return i
-def hz2str(hz):
-    p=safe_log(hz,10.0)
-    if p<3:
-        return '%dHz' %(hz,)
-    elif hz%1000==0:
-        return '%dKHz' %(hz/(10.0**3),)
-    else:
-        return '%.1fKHz' %(hz/(10.0**3),)
-
-def subdivide(xs, t_points):
-    while len(xs)<t_points:
-        m=[0]*(2*len(xs)-1)
-        m[0:len(m):2]=xs
-        for i in range(1,len(m),2):
-            m[i]=(m[i-1]+m[i+1])//2
-        xs=m
-    p_drop=len(xs)-t_points
-    p_drop_left=p_drop//2
-    p_drop_right=p_drop-p_drop_left
-    #print 'xs',xs
-    #print 'dropping %d, %d left, %d right' %(p_drop,p_drop_left,p_drop_right)
-    c=len(xs)//2
-    left=xs[0:p_drop_left*2:2]+xs[p_drop_left*2:c]
-    right=list(reversed(xs[c:]))
-    right=right[0:p_drop_right*2:2]+right[p_drop_right*2:]
-    right=list(reversed(right))
-    return left+right
-
-def main():
-    dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
-    app=QtGui.QApplication(sys.argv)
-    qpaeq_main=QPaeq()
-    qpaeq_main.show()
-    sys.exit(app.exec_())
-
-if __name__=='__main__':
-    main()