diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:25:16 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:25:16 +0300 |
| commit | c7a77657ffe00b6d52a0c7e3d29f4fcf8537af5f (patch) | |
| tree | 1ac05a5c37df435c164736b684903a926a733b8d /src/daemon/main.c | |
| parent | 6b034f5bfd4a69d5795f2292014f902fd450a8a4 (diff) | |
| parent | 821dc1797faa903618c7585d3c053fd7ae6e93db (diff) | |
Merge branch 'master' into master-tx
Diffstat (limited to 'src/daemon/main.c')
| -rw-r--r-- | src/daemon/main.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index c8eda398..a9e8ed46 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -65,8 +65,8 @@ #include <pulse/timeval.h> #include <pulse/xmalloc.h> #include <pulse/i18n.h> -#include <pulse/lock-autospawn.h> +#include <pulsecore/lock-autospawn.h> #include <pulsecore/winsock.h> #include <pulsecore/core-error.h> #include <pulsecore/core.h> @@ -778,8 +778,15 @@ int main(int argc, char *argv[]) { pa_set_env("PULSE_SYSTEM", conf->system_instance ? "1" : "0"); pa_log_info(_("This is PulseAudio %s"), PACKAGE_VERSION); + pa_log_debug(_("Compilation host: %s"), CANONICAL_HOST); pa_log_debug(_("Compilation CFLAGS: %s"), PA_CFLAGS); + s = pa_uname_string(); + pa_log_debug(_("Running on host: %s"), s); + pa_xfree(s); + + pa_log_info(_("Page size is %lu bytes"), (unsigned long) PA_PAGE_SIZE); + #ifdef HAVE_VALGRIND_MEMCHECK_H pa_log_debug(_("Compiled with Valgrind support: yes")); #else @@ -792,8 +799,6 @@ int main(int argc, char *argv[]) { pa_log_debug(_("Optimized build: no")); #endif - pa_log_info(_("Page size is %lu bytes"), (unsigned long) PA_PAGE_SIZE); - if (!(s = pa_machine_id())) { pa_log(_("Failed to get machine ID")); goto finish; @@ -864,6 +869,7 @@ int main(int argc, char *argv[]) { c->realtime_priority = conf->realtime_priority; c->realtime_scheduling = !!conf->realtime_scheduling; c->disable_remixing = !!conf->disable_remixing; + c->disable_lfe_remixing = !!conf->disable_lfe_remixing; c->running_as_daemon = !!conf->daemonize; c->disallow_exit = conf->disallow_exit; |