Merge commit 'wtay/optimize'

diff --combined src/Makefile.am
index 73c0db5b010dbb5693fd08db791b897803a402c2,ab91be83e259a04f07bd8657e89438d0c1552f16..2fd9a734a4bafb6f8d41295b6858d0f41f32da24
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -74,7 -74,6 +74,7 @@@ AM_CFLAGS = 
        $(LIBSAMPLERATE_CFLAGS) \
        $(LIBSNDFILE_CFLAGS) \
        $(LIBSPEEX_CFLAGS) \
 +      -DPA_BUILDDIR=\"$(abs_builddir)\" \
        -DPA_DLSEARCHPATH=\"$(modlibexecdir)\" \
        -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \
        -DPA_BINARY=\"$(PA_BINARY)\" \
@@@ -84,8 -83,8 +84,8 @@@
        -DAO_REQUIRE_CAS \
        -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
        -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
 -      -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
 -      -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
 +        -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
 +        -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
  
  AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
  AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
@@@ -280,8 -279,7 +280,8 @@@ TESTS = 
                proplist-test \
                lock-autospawn-test \
                prioq-test \
 -              sigbus-test
 +              sigbus-test \
 +              usergroup-test
  
  TESTS_BINARIES = \
                mainloop-test \
@@@ -319,8 -317,7 +319,8 @@@
                stripnul \
                lock-autospawn-test \
                prioq-test \
 -              sigbus-test
 +              sigbus-test \
 +              usergroup-test
  
  if HAVE_SIGXCPU
  #TESTS += \
@@@ -559,11 -556,6 +559,11 @@@ alsa_time_test_LDADD = $(AM_LDADD
  alsa_time_test_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
  alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(ASOUNDLIB_LIBS)
  
 +usergroup_test_SOURCES = tests/usergroup-test.c
 +usergroup_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la
 +usergroup_test_CFLAGS = $(AM_CFLAGS)
 +usergroup_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 +
  ###################################
  #         Common library          #
  ###################################
@@@ -628,7 -620,6 +628,7 @@@ libpulsecommon_@PA_MAJORMINORMICRO@_la_
                pulsecore/tagstruct.c pulsecore/tagstruct.h \
                pulsecore/time-smoother.c 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
  
@@@ -831,9 -822,14 +831,14 @@@ libpulsecore_@PA_MAJORMINORMICRO@_la_SO
                pulsecore/object.c pulsecore/object.h \
                pulsecore/play-memblockq.c pulsecore/play-memblockq.h \
                pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
+               pulsecore/remap.c pulsecore/remap.h \
+               pulsecore/remap_mmx.c \
                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/svolume_mmx.c pulsecore/svolume_sse.c \
                pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
                pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
                pulsecore/sconv.c pulsecore/sconv.h \

diff --combined src/daemon/main.c
index 729845909ba374db00184040077fd041c6c4d3cf,ec8ff400c35578dfbeecdf7cfdb423575c9eb040..b1d1109a50657566d2edc61c884cfcab466fbea8
--- 1/src/daemon/main.c
--- 2/src/daemon/main.c
+++ b/src/daemon/main.c
@@@ -39,8 -39,6 +39,6 @@@
  #include <sys/types.h>
  #include <sys/stat.h>
  
- #include <liboil/liboil.h>
- 
  #ifdef HAVE_SYS_MMAN_H
  #include <sys/mman.h>
  #endif
@@@ -95,6 -93,8 +93,8 @@@
  #ifdef HAVE_DBUS
  #include <pulsecore/dbus-shared.h>
  #endif
+ #include <pulsecore/cpu-arm.h>
+ #include <pulsecore/cpu-x86.h>
  
  #include "cmdline.h"
  #include "cpulimit.h"
@@@ -774,8 -774,6 +774,8 @@@ int main(int argc, char *argv[]) 
      pa_log_info(_("Using state directory %s."), s);
      pa_xfree(s);
  
 +    pa_log_info(_("Using modules directory %s."), conf->dl_search_path);
 +
      pa_log_info(_("Running in system mode: %s"), pa_yes_no(pa_in_system_mode()));
  
      if (pa_in_system_mode())
@@@ -823,6 -821,9 +823,9 @@@
  
      pa_memtrap_install();
  
+     pa_cpu_init_x86();
+     pa_cpu_init_arm();
+ 
      pa_assert_se(mainloop = pa_mainloop_new());
  
      if (!(c = pa_core_new(pa_mainloop_get_api(mainloop), !conf->disable_shm, conf->shm_size))) {
@@@ -862,8 -863,6 +865,6 @@@
      win32_timer = pa_mainloop_get_api(mainloop)->rtclock_time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL);
  #endif
  
-     oil_init();
- 
      if (!conf->no_cpu_limit)
          pa_assert_se(pa_cpu_limit_init(pa_mainloop_get_api(mainloop)) == 0);