Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
	src/Makefile.am

diff --combined src/Makefile.am
index c3ca1eb,e65662c..16834ee
--- 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) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_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) $(LIBOIL_LIBS) $(DBUS_LIBS)
@@@ -837,8 -836,9 +837,9 @@@ libpulsecore_@PA_MAJORMINORMICRO@_la_SO
                pulsecore/resampler.c pulsecore/resampler.h \
                pulsecore/rtpoll.c pulsecore/rtpoll.h \
                pulsecore/sample-util.c pulsecore/sample-util.h \
-               pulsecore/cpu-arm.c pulsecore/cpu-x86.c \
-               pulsecore/svolume_c.c pulsecore/svolume_arm.c\
+               pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
+               pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
+               pulsecore/svolume_c.c pulsecore/svolume_arm.c \
                pulsecore/svolume_mmx.c pulsecore/svolume_sse.c \
                pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
                pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
@@@ -868,9 -868,7 +869,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
@@@ -1012,8 -1010,8 +1013,8 @@@ modlibexec_LTLIBRARIES += 
                module-tunnel-source.la \
                module-position-event-sounds.la \
                module-augment-properties.la \
-               module-cork-music-on-phone.la
- 
+               module-cork-music-on-phone.la \
+               module-loopback.la
  
  # See comment at librtp.la above
  if !OS_IS_WIN32
@@@ -1157,8 -1155,7 +1158,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
@@@ -1253,7 -1250,7 +1254,8 @@@ SYMDEF_FILES = 
                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/dbus/module-dbus-protocol-symdef.h \
+               modules/module-loopback-symdef.h
  
  EXTRA_DIST += $(SYMDEF_FILES)
  BUILT_SOURCES += $(SYMDEF_FILES)
@@@ -1302,24 -1299,6 +1304,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
@@@ -1413,6 -1392,10 +1415,10 @@@ module_tunnel_source_la_SOURCES = modul
  module_tunnel_source_la_LDFLAGS = $(MODULE_LDFLAGS)
  module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
  
+ module_loopback_la_SOURCES = modules/module-loopback.c
+ module_loopback_la_LDFLAGS = $(MODULE_LDFLAGS)
+ module_loopback_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
+ 
  # X11
  
  module_x11_bell_la_SOURCES = modules/x11/module-x11-bell.c
@@@ -1567,11 -1550,6 +1573,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)