diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-08-23 00:06:35 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-08-23 00:06:35 +0200 |
commit | ab5ac06ac76c3afbbd99bce2840329dd74756a73 (patch) | |
tree | 5735f1e62502d0706a0ed7631cb365cab281303a /src/daemon/main.c | |
parent | d6fb8d10819bebc1cee203de7330cceeafde9fed (diff) | |
parent | 6076cef2092391d8b46aa84f86857cffebce4583 (diff) |
Merge commit 'wtay/optimize'
Diffstat (limited to 'src/daemon/main.c')
-rw-r--r-- | src/daemon/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 72984590..b1d1109a 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -39,8 +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 @@ #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" @@ -823,6 +823,9 @@ int main(int argc, char *argv[]) { 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 +865,6 @@ int main(int argc, char *argv[]) { 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); |