#include <pulsecore/socket.h>
#include <pulsecore/core-error.h>
#include <pulsecore/core-rtclock.h>
+#include <pulsecore/core-scache.h>
#include <pulsecore/core.h>
#include <pulsecore/module.h>
#include <pulsecore/cli-command.h>
return -1;
}
- if (strcmp(pw->pw_dir, PA_SYSTEM_RUNTIME_PATH) != 0)
+ if (!pa_streq(pw->pw_dir, PA_SYSTEM_RUNTIME_PATH))
pa_log_warn(_("Home directory of user '%s' is not '%s', ignoring."), PA_SYSTEM_USER, PA_SYSTEM_RUNTIME_PATH);
- if (pa_make_secure_dir(PA_SYSTEM_RUNTIME_PATH, 0755, pw->pw_uid, gr->gr_gid) < 0) {
+ if (pa_make_secure_dir(PA_SYSTEM_RUNTIME_PATH, 0755, pw->pw_uid, gr->gr_gid, true) < 0) {
pa_log(_("Failed to create '%s': %s"), PA_SYSTEM_RUNTIME_PATH, pa_cstrerror(errno));
return -1;
}
- if (pa_make_secure_dir(PA_SYSTEM_STATE_PATH, 0700, pw->pw_uid, gr->gr_gid) < 0) {
+ if (pa_make_secure_dir(PA_SYSTEM_STATE_PATH, 0700, pw->pw_uid, gr->gr_gid, true) < 0) {
pa_log(_("Failed to create '%s': %s"), PA_SYSTEM_STATE_PATH, pa_cstrerror(errno));
return -1;
}
return -1;
}
+ pa_drop_caps();
+
pa_set_env("USER", PA_SYSTEM_USER);
pa_set_env("USERNAME", PA_SYSTEM_USER);
pa_set_env("LOGNAME", PA_SYSTEM_USER);
if (!getenv("PULSE_STATE_PATH"))
pa_set_env("PULSE_STATE_PATH", PA_SYSTEM_STATE_PATH);
- pa_log_info(_("Successfully dropped root privileges."));
+ pa_log_info(_("Successfully changed user to \"" PA_SYSTEM_USER "\"."));
return 0;
}
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);
char *s;
char *configured_address;
int r = 0, retval = 1, d = 0;
- pa_bool_t valid_pid_file = FALSE;
- pa_bool_t ltdl_init = FALSE;
+ bool valid_pid_file = false;
+ bool ltdl_init = false;
int passed_fd = -1;
const char *e;
#ifdef HAVE_FORK
struct timeval win32_tv;
#endif
int autospawn_fd = -1;
- pa_bool_t autospawn_locked = FALSE;
+ bool autospawn_locked = false;
#ifdef HAVE_DBUS
pa_dbusobj_server_lookup *server_lookup = NULL; /* /org/pulseaudio/server_lookup */
pa_dbus_connection *lookup_service_bus = NULL; /* Always the user bus. */
pa_dbus_connection *server_bus = NULL; /* The bus where we reserve org.pulseaudio.Server, either the user or the system bus. */
- pa_bool_t start_server;
+ bool start_server;
#endif
pa_log_set_ident("pulseaudio");
goto finish;
}
+ if (conf->log_target)
+ pa_log_set_target(conf->log_target);
+ else {
+ pa_log_target target = { .type = PA_LOG_STDERR, .file = NULL };
+ pa_log_set_target(&target);
+ }
+
pa_log_set_level(conf->log_level);
- pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target);
if (conf->log_meta)
pa_log_set_flags(PA_LOG_PRINT_META, PA_LOG_SET);
if (conf->log_time)
break;
case PA_SERVER_TYPE_USER:
case PA_SERVER_TYPE_NONE:
- conf->system_instance = FALSE;
+ conf->system_instance = false;
break;
case PA_SERVER_TYPE_SYSTEM:
- conf->system_instance = TRUE;
+ conf->system_instance = true;
break;
default:
pa_assert_not_reached();
if (!start_server && conf->local_server_type == PA_SERVER_TYPE_SYSTEM) {
pa_log_notice(_("System mode refused for non-root user. Only starting the D-Bus server lookup service."));
- conf->system_instance = FALSE;
+ conf->system_instance = false;
}
#endif
LTDL_SET_PRELOADED_SYMBOLS();
pa_ltdl_init();
- ltdl_init = TRUE;
+ ltdl_init = true;
if (conf->dl_search_path)
lt_dlsetsearchpath(conf->dl_search_path);
* recover (i.e. autospawn) from a crash.
*/
char *ufn;
- pa_bool_t start_anyway = FALSE;
+ bool start_anyway = false;
if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) {
char *id;
if (conf->system_instance && !conf->disable_shm) {
pa_log_notice(_("Running in system mode, forcibly disabling SHM mode!"));
- conf->disable_shm = TRUE;
+ conf->disable_shm = true;
}
if (conf->system_instance && conf->exit_idle_time >= 0) {
goto finish;
}
- if ((pa_autospawn_lock_acquire(TRUE) < 0)) {
+ if ((pa_autospawn_lock_acquire(true) < 0)) {
pa_log("Failed to acquire autospawn lock");
goto finish;
}
- autospawn_locked = TRUE;
+ autospawn_locked = true;
}
if (conf->daemonize) {
* to close it in the child */
pa_autospawn_lock_release();
- pa_autospawn_lock_done(TRUE);
+ pa_autospawn_lock_done(true);
- autospawn_locked = FALSE;
+ autospawn_locked = false;
autospawn_fd = -1;
}
daemon_pipe[0] = -1;
#endif
- if (conf->auto_log_target)
- pa_log_set_target(PA_LOG_SYSLOG);
+ 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);
+ }
#ifdef HAVE_SETSID
if (setsid() < 0) {
#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)
goto finish;
}
- valid_pid_file = TRUE;
+ valid_pid_file = true;
}
pa_disable_sigpipe();
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
}
c->default_sample_spec = conf->default_sample_spec;
+ c->alternate_sample_rate = conf->alternate_sample_rate;
c->default_channel_map = conf->default_channel_map;
c->default_n_fragments = conf->default_n_fragments;
c->default_fragment_size_msec = conf->default_fragment_size_msec;
- c->sync_volume_safety_margin_usec = conf->sync_volume_safety_margin_usec;
- c->sync_volume_extra_delay_usec = conf->sync_volume_extra_delay_usec;
+ c->deferred_volume_safety_margin_usec = conf->deferred_volume_safety_margin_usec;
+ c->deferred_volume_extra_delay_usec = conf->deferred_volume_extra_delay_usec;
c->exit_idle_time = conf->exit_idle_time;
c->scache_idle_time = conf->scache_idle_time;
c->resample_method = conf->resample_method;
c->realtime_scheduling = !!conf->realtime_scheduling;
c->disable_remixing = !!conf->disable_remixing;
c->disable_lfe_remixing = !!conf->disable_lfe_remixing;
- c->sync_volume = !!conf->sync_volume;
+ c->deferred_volume = !!conf->deferred_volume;
c->running_as_daemon = !!conf->daemonize;
c->disallow_exit = conf->disallow_exit;
c->flat_volumes = conf->flat_volumes;
c->cpu_info.cpu_type = PA_CPU_X86;
if (pa_cpu_init_arm(&(c->cpu_info.flags.arm)))
c->cpu_info.cpu_type = PA_CPU_ARM;
- pa_cpu_init_orc(c->cpu_info);
+ pa_cpu_init_orc(c->cpu_info);
}
pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);
buf = pa_strbuf_new();
#ifdef HAVE_DBUS
+ pa_assert_se(dbus_threads_init_default());
+
if (start_server) {
#endif
if (conf->load_default_script_file) {
* any modules to be loaded. We haven't loaded any so far, so one might
* think there's no way to contact the server, but receiving certain
* signals could still cause modules to load. */
- conf->disallow_module_loading = TRUE;
+ conf->disallow_module_loading = true;
}
#endif
#ifdef HAVE_DBUS
if (!conf->system_instance) {
- if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
- goto finish;
- if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
- goto finish;
+ if ((server_lookup = pa_dbusobj_server_lookup_new(c))) {
+ if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
+ goto finish;
+ }
}
- if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
- goto finish;
+ if (start_server)
+ server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
#endif
#ifdef HAVE_FORK
if (autospawn_locked)
pa_autospawn_lock_release();
- pa_autospawn_lock_done(FALSE);
+ pa_autospawn_lock_done(false);
}
#ifdef OS_IS_WIN32