move flat volume logic into the core. while doing so add n_volume_steps field to...

[pulseaudio] / src / pulsecore / core.c

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index 5c594b0242cf8eb23daea33e38f29df4b46d38ec..381a677901f029e80782c0ca00c5882d623a85bf 100644 (file)
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -37,7 +37,6 @@
 #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/shared.h>
 #include <pulsecore/random.h>
@@ -66,7 +65,7 @@ static int core_process_msg(pa_msgobject *o, int code, void *userdata, int64_t o
 
 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;
@@ -74,14 +73,14 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     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;
         }
@@ -91,20 +90,20 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     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;
@@ -113,7 +112,6 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     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;
 
@@ -128,8 +126,8 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     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;
 
@@ -138,6 +136,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     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);
@@ -152,6 +151,8 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
 
     pa_core_check_idle(c);
 
+    c->state = PA_CORE_RUNNING;
+
     return c;
 }
 
@@ -160,12 +161,17 @@ static void core_free(pa_object *o) {
     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);
 
@@ -180,7 +186,6 @@ static void core_free(pa_object *o) {
 
     pa_scache_free(c);
     pa_namereg_free(c);
-    pa_autoload_free(c);
     pa_subscription_free_all(c);
 
     if (c->exit_event)
@@ -200,10 +205,11 @@ static void core_free(pa_object *o) {
     pa_xfree(c);
 }
 
-static void exit_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->exit_event == e);
 
+    pa_log_info("We are idle, quitting...");
     pa_core_exit(c, TRUE, 0);
 }