Merge remote branch 'phish3/master'

diff --combined configure.ac
index a371be8,ebfdc2b..fd10c83
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -22,7 -22,8 +22,7 @@@
  
  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])
@@@ -1198,6 -1199,7 +1198,7 @@@ if test "x${dbus}" != xno || test "x${b
              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.])

diff --combined src/Makefile.am
index 69711ac,82bc2f9..d6267a5
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -169,14 -169,13 +169,14 @@@ BUILT_SOURCES = 
  bin_PROGRAMS = pulseaudio
  
  pulseaudio_SOURCES = \
 -              daemon/caps.h daemon/caps.c \
 +              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/main.c \
 +              daemon/server-lookup.c daemon/server-lookup.h
  
  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)
@@@ -870,9 -869,7 +870,9 @@@ libpulsecore_@PA_MAJORMINORMICRO@_la_LD
  endif
  
  if HAVE_DBUS
 -libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES += pulsecore/dbus-shared.c pulsecore/dbus-shared.h
 +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_CFLAGS += $(DBUS_CFLAGS)
  libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD += $(DBUS_LIBS)
  endif
@@@ -1009,6 -1006,7 +1009,7 @@@ modlibexec_LTLIBRARIES += 
                module-combine.la \
                module-remap-sink.la \
                module-ladspa-sink.la \
+               module-equalizer-sink.la \
                module-esound-sink.la \
                module-tunnel-sink.la \
                module-tunnel-source.la \
@@@ -1159,8 -1157,7 +1160,8 @@@ endi
  
  if HAVE_DBUS
  modlibexec_LTLIBRARIES += \
 -              module-rygel-media-server.la
 +              module-rygel-media-server.la \
 +              module-dbus-protocol.la
  endif
  
  if HAVE_BLUEZ
@@@ -1204,6 -1201,7 +1205,7 @@@ SYMDEF_FILES = 
                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 \
@@@ -1255,7 -1253,6 +1257,7 @@@
                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)
@@@ -1305,24 -1302,6 +1307,24 @@@ module_http_protocol_unix_la_CFLAGS = -
  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
@@@ -1403,6 -1382,11 +1405,11 @@@ module_ladspa_sink_la_CFLAGS = -DLADSPA
  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)
+ module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
+ module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) -lfftw3f 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
@@@ -1574,11 -1558,6 +1581,11 @@@ module_stream_restore_la_LDFLAGS = $(MO
  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)