X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/d806b197144733607b0ecb8678c6ee5d99ccc9ea..0a583fe0c330d167f52784585afffdd8065a92cd:/src/daemon/main.c

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 5b4e0053..02a8ea64 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -346,9 +346,9 @@ static char *check_configured_address(void) {
     char *default_server = NULL;
     pa_client_conf *c = pa_client_conf_new();
 
-    pa_client_conf_load(c, NULL);
+    pa_client_conf_load(c);
 #ifdef HAVE_X11
-    pa_client_conf_from_x11(c, NULL);
+    pa_client_conf_from_x11(c);
 #endif
     pa_client_conf_env(c);
 
@@ -817,7 +817,11 @@ int main(int argc, char *argv[]) {
 #endif
 
         if (!conf->log_target) {
+#ifdef HAVE_JOURNAL
+            pa_log_target target = { .type = PA_LOG_JOURNAL, .file = NULL };
+#else
             pa_log_target target = { .type = PA_LOG_SYSLOG, .file = NULL };
+#endif
             pa_log_set_target(&target);
         }
 
@@ -900,7 +904,8 @@ int main(int argc, char *argv[]) {
 #endif
     pa_rtclock_hrtimer_enable();
 
-    pa_raise_priority(conf->nice_level);
+    if (conf->high_priority)
+        pa_raise_priority(conf->nice_level);
 
     if (conf->system_instance)
         if (change_user() < 0)
@@ -1003,7 +1008,7 @@ int main(int argc, char *argv[]) {
         pa_log_info(_("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"));
 
     if (conf->lock_memory) {
-#ifdef HAVE_SYS_MMAN_H
+#if defined(HAVE_SYS_MMAN_H) && !defined(__ANDROID__)
         if (mlockall(MCL_FUTURE) < 0)
             pa_log_warn("mlockall() failed: %s", pa_cstrerror(errno));
         else