-/* $Id$ */
-
/***
This file is part of PulseAudio.
#include <pulsecore/namereg.h>
#include <pulsecore/core-util.h>
#include <pulsecore/core-scache.h>
-#include <pulsecore/autoload.h>
#include <pulsecore/core-subscribe.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/random.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
switch (code) {
case PA_CORE_MESSAGE_UNLOAD_MODULE:
- pa_module_unload(c, userdata);
+ pa_module_unload(c, userdata, TRUE);
return 0;
default:
static void core_free(pa_object *o);
-pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
+pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared, size_t shm_size) {
pa_core* c;
pa_mempool *pool;
int j;
pa_assert(m);
if (shared) {
- if (!(pool = pa_mempool_new(shared))) {
+ if (!(pool = pa_mempool_new(shared, shm_size))) {
pa_log_warn("failed to allocate shared memory pool. Falling back to a normal memory pool.");
- shared = 0;
+ shared = FALSE;
}
}
if (!shared) {
- if (!(pool = pa_mempool_new(shared))) {
+ if (!(pool = pa_mempool_new(shared, shm_size))) {
pa_log("pa_mempool_new() failed.");
return NULL;
}
c->parent.parent.free = core_free;
c->parent.process_msg = core_process_msg;
+ c->state = PA_CORE_STARTUP;
c->mainloop = m;
c->clients = pa_idxset_new(NULL, NULL);
c->sinks = pa_idxset_new(NULL, NULL);
c->sources = pa_idxset_new(NULL, NULL);
c->source_outputs = pa_idxset_new(NULL, NULL);
c->sink_inputs = pa_idxset_new(NULL, NULL);
+ c->cards = pa_idxset_new(NULL, NULL);
c->default_source_name = c->default_sink_name = NULL;
c->modules = NULL;
c->namereg = NULL;
c->scache = NULL;
- c->autoload_idxset = NULL;
- c->autoload_hashmap = NULL;
c->running_as_daemon = FALSE;
c->default_sample_spec.format = PA_SAMPLE_S16NE;
c->default_n_fragments = 4;
c->default_fragment_size_msec = 25;
- c->module_auto_unload_event = NULL;
c->module_defer_unload_event = NULL;
c->scache_auto_unload_event = NULL;
c->mempool = pool;
pa_silence_cache_init(&c->silence_cache);
- c->quit_event = NULL;
+ c->exit_event = NULL;
c->exit_idle_time = -1;
- c->module_idle_time = 20;
c->scache_idle_time = 20;
+ c->flat_volumes = TRUE;
c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
c->disallow_module_loading = FALSE;
+ c->disallow_exit = FALSE;
c->realtime_scheduling = FALSE;
c->realtime_priority = 5;
c->disable_remixing = FALSE;
+ c->disable_lfe_remixing = FALSE;
for (j = 0; j < PA_CORE_HOOK_MAX; j++)
pa_hook_init(&c->hooks[j], c);
- pa_property_init(c);
+ pa_shared_init(c);
pa_random(&c->cookie, sizeof(c->cookie));
pa_check_signal_is_blocked(SIGPIPE);
#endif
+ pa_core_check_idle(c);
+
+ c->state = PA_CORE_RUNNING;
+
return c;
}
int j;
pa_assert(c);
+ c->state = PA_CORE_SHUTDOWN;
+
pa_module_unload_all(c);
pa_assert(!c->modules);
pa_assert(pa_idxset_isempty(c->clients));
pa_idxset_free(c->clients, NULL, NULL);
+ pa_assert(pa_idxset_isempty(c->cards));
+ pa_idxset_free(c->cards, NULL, NULL);
+
pa_assert(pa_idxset_isempty(c->sinks));
pa_idxset_free(c->sinks, NULL, NULL);
pa_scache_free(c);
pa_namereg_free(c);
- pa_autoload_free(c);
pa_subscription_free_all(c);
- if (c->quit_event)
- c->mainloop->time_free(c->quit_event);
+ if (c->exit_event)
+ c->mainloop->time_free(c->exit_event);
pa_xfree(c->default_source_name);
pa_xfree(c->default_sink_name);
pa_silence_cache_done(&c->silence_cache);
pa_mempool_free(c->mempool);
- pa_property_cleanup(c);
+ pa_shared_cleanup(c);
for (j = 0; j < PA_CORE_HOOK_MAX; j++)
- pa_hook_free(&c->hooks[j]);
+ pa_hook_done(&c->hooks[j]);
pa_xfree(c);
}
-static void quit_callback(pa_mainloop_api*m, pa_time_event *e, PA_GCC_UNUSED const struct timeval *tv, void *userdata) {
+static void exit_callback(pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata) {
pa_core *c = userdata;
- pa_assert(c->quit_event == e);
+ pa_assert(c->exit_event == e);
- m->quit(m, 0);
+ pa_log_info("We are idle, quitting...");
+ pa_core_exit(c, TRUE, 0);
}
-void pa_core_check_quit(pa_core *c) {
+void pa_core_check_idle(pa_core *c) {
pa_assert(c);
- if (!c->quit_event &&
+ if (!c->exit_event &&
c->exit_idle_time >= 0 &&
pa_idxset_size(c->clients) == 0) {
pa_gettimeofday(&tv);
tv.tv_sec+= c->exit_idle_time;
- c->quit_event = c->mainloop->time_new(c->mainloop, &tv, quit_callback, c);
+ c->exit_event = c->mainloop->time_new(c->mainloop, &tv, exit_callback, c);
- } else if (c->quit_event && pa_idxset_size(c->clients) > 0) {
- c->mainloop->time_free(c->quit_event);
- c->quit_event = NULL;
+ } else if (c->exit_event && pa_idxset_size(c->clients) > 0) {
+ c->mainloop->time_free(c->exit_event);
+ c->exit_event = NULL;
}
}
+
+int pa_core_exit(pa_core *c, pa_bool_t force, int retval) {
+ pa_assert(c);
+
+ if (c->disallow_exit && !force)
+ return -1;
+
+ c->mainloop->quit(c->mainloop, retval);
+ return 0;
+}