sample-cache: use the sample name as unmodified fallback in the properties when playi...

[pulseaudio] / src / pulsecore / core.c

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index a1bd0204bc4d448eb23a377e85c432569d422ccd..f072645304b2e85dfaf200a002d3fb0d910c453a 100644 (file)
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
 /***
   This file is part of PulseAudio.
 


@@ -8,7 +6,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -30,6 +28,7 @@
 #include <stdio.h>
 #include <signal.h>
 
 #include <stdio.h>
 #include <signal.h>
 

+#include <pulse/rtclock.h>

 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
 
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
 


@@ -37,18 +36,18 @@
 #include <pulsecore/sink.h>
 #include <pulsecore/source.h>
 #include <pulsecore/namereg.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/source.h>
 #include <pulsecore/namereg.h>

+#include <pulsecore/core-rtclock.h>

 #include <pulsecore/core-util.h>
 #include <pulsecore/core-scache.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/core-scache.h>

-#include <pulsecore/autoload.h>

 #include <pulsecore/core-subscribe.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>
 
 #include "core.h"
 
 #include <pulsecore/random.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 
 #include "core.h"
 

-static PA_DEFINE_CHECK_TYPE(pa_core, pa_msgobject);
+PA_DEFINE_PUBLIC_CLASS(pa_core, pa_msgobject);

 
 static int core_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk) {
     pa_core *c = PA_CORE(o);
 
 static int core_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk) {
     pa_core *c = PA_CORE(o);


@@ -58,7 +57,7 @@ static int core_process_msg(pa_msgobject *o, int code, void *userdata, int64_t o
     switch (code) {
 
         case PA_CORE_MESSAGE_UNLOAD_MODULE:
     switch (code) {
 
         case PA_CORE_MESSAGE_UNLOAD_MODULE:

-            pa_module_unload(c, userdata);
+            pa_module_unload(c, userdata, TRUE);

             return 0;
 
         default:
             return 0;
 
         default:


@@ -68,7 +67,7 @@ static int core_process_msg(pa_msgobject *o, int code, void *userdata, int64_t o
 
 static void core_free(pa_object *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;
     pa_core* c;
     pa_mempool *pool;
     int j;


@@ -76,14 +75,14 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     pa_assert(m);
 
     if (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.");
             pa_log_warn("failed to allocate shared memory pool. Falling back to a normal memory pool.");

-            shared = 0;
+            shared = FALSE;

         }
     }
 
     if (!shared) {
         }
     }
 
     if (!shared) {

-        if (!(pool = pa_mempool_new(shared))) {
+        if (!(pool = pa_mempool_new(shared, shm_size))) {

             pa_log("pa_mempool_new() failed.");
             return NULL;
         }
             pa_log("pa_mempool_new() failed.");
             return NULL;
         }


@@ -93,29 +92,31 @@ 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->parent.parent.free = core_free;
     c->parent.process_msg = core_process_msg;
 

+    c->state = PA_CORE_STARTUP;

     c->mainloop = m;
     c->mainloop = m;

+

     c->clients = pa_idxset_new(NULL, NULL);
     c->clients = pa_idxset_new(NULL, NULL);

+    c->cards = pa_idxset_new(NULL, NULL);

     c->sinks = pa_idxset_new(NULL, NULL);
     c->sources = 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->sink_inputs = pa_idxset_new(NULL, NULL);

+    c->source_outputs = pa_idxset_new(NULL, NULL);
+    c->modules = pa_idxset_new(NULL, NULL);
+    c->scache = pa_idxset_new(NULL, NULL);

 
 

-    c->default_source_name = c->default_sink_name = NULL;
+    c->namereg = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+    c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);

 
 

-    c->modules = NULL;
-    c->namereg = NULL;
-    c->scache = NULL;
-    c->autoload_idxset = NULL;
-    c->autoload_hashmap = NULL;
-    c->running_as_daemon = FALSE;
+    c->default_source = NULL;
+    c->default_sink = NULL;

 
     c->default_sample_spec.format = PA_SAMPLE_S16NE;
     c->default_sample_spec.rate = 44100;
     c->default_sample_spec.channels = 2;
 
     c->default_sample_spec.format = PA_SAMPLE_S16NE;
     c->default_sample_spec.rate = 44100;
     c->default_sample_spec.channels = 2;

+    pa_channel_map_init_extend(&c->default_channel_map, c->default_sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);

     c->default_n_fragments = 4;
     c->default_fragment_size_msec = 25;
 
     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->module_defer_unload_event = NULL;
     c->scache_auto_unload_event = NULL;
 


@@ -127,30 +128,34 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     c->mempool = pool;
     pa_silence_cache_init(&c->silence_cache);
 
     c->mempool = pool;
     pa_silence_cache_init(&c->silence_cache);
 

-    c->quit_event = NULL;
+    c->exit_event = NULL;

 
     c->exit_idle_time = -1;
 
     c->exit_idle_time = -1;

-    c->module_idle_time = 20;

     c->scache_idle_time = 20;
 
     c->scache_idle_time = 20;
 

-    c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
-
+    c->flat_volumes = TRUE;

     c->disallow_module_loading = FALSE;
     c->disallow_module_loading = FALSE;

+    c->disallow_exit = FALSE;
+    c->running_as_daemon = FALSE;

     c->realtime_scheduling = FALSE;
     c->realtime_priority = 5;
     c->disable_remixing = FALSE;
     c->realtime_scheduling = FALSE;
     c->realtime_priority = 5;
     c->disable_remixing = FALSE;

+    c->disable_lfe_remixing = FALSE;
+    c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;

 
     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
         pa_hook_init(&c->hooks[j], c);
 
 
     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
         pa_hook_init(&c->hooks[j], c);
 

-    pa_property_init(c);
-

     pa_random(&c->cookie, sizeof(c->cookie));
 
 #ifdef SIGPIPE
     pa_check_signal_is_blocked(SIGPIPE);
 #endif
 
     pa_random(&c->cookie, sizeof(c->cookie));
 
 #ifdef SIGPIPE
     pa_check_signal_is_blocked(SIGPIPE);
 #endif
 

+    pa_core_check_idle(c);
+
+    c->state = PA_CORE_RUNNING;
+

     return c;
 }
 
     return c;
 }
 


@@ -159,12 +164,23 @@ static void core_free(pa_object *o) {
     int j;
     pa_assert(c);
 
     int j;
     pa_assert(c);
 

+    c->state = PA_CORE_SHUTDOWN;
+

     pa_module_unload_all(c);
     pa_module_unload_all(c);

-    pa_assert(!c->modules);
+    pa_scache_free_all(c);
+
+    pa_assert(pa_idxset_isempty(c->scache));
+    pa_idxset_free(c->scache, NULL, NULL);
+
+    pa_assert(pa_idxset_isempty(c->modules));
+    pa_idxset_free(c->modules, NULL, NULL);

 
     pa_assert(pa_idxset_isempty(c->clients));
     pa_idxset_free(c->clients, NULL, NULL);
 
 
     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_assert(pa_idxset_isempty(c->sinks));
     pa_idxset_free(c->sinks, NULL, NULL);
 


@@ -177,45 +193,87 @@ static void core_free(pa_object *o) {
     pa_assert(pa_idxset_isempty(c->sink_inputs));
     pa_idxset_free(c->sink_inputs, NULL, NULL);
 
     pa_assert(pa_idxset_isempty(c->sink_inputs));
     pa_idxset_free(c->sink_inputs, NULL, NULL);
 

-    pa_scache_free(c);
-    pa_namereg_free(c);
-    pa_autoload_free(c);
+    pa_assert(pa_hashmap_isempty(c->namereg));
+    pa_hashmap_free(c->namereg, NULL, NULL);
+
+    pa_assert(pa_hashmap_isempty(c->shared));
+    pa_hashmap_free(c->shared, NULL, NULL);
+

     pa_subscription_free_all(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_assert(!c->default_source);
+    pa_assert(!c->default_sink);

 
     pa_silence_cache_done(&c->silence_cache);
     pa_mempool_free(c->mempool);
 
 
     pa_silence_cache_done(&c->silence_cache);
     pa_mempool_free(c->mempool);
 

-    pa_property_cleanup(c);
-

     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
     for (j = 0; j < PA_CORE_HOOK_MAX; j++)

-        pa_hook_free(&c->hooks[j]);
+        pa_hook_done(&c->hooks[j]);

 
     pa_xfree(c);
 }
 
 
     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 *t, void *userdata) {

     pa_core *c = 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);
 
     pa_assert(c);
 

-    if (!c->quit_event && c->exit_idle_time >= 0 && pa_idxset_size(c->clients) == 0) {
-        struct timeval tv;
-        pa_gettimeofday(&tv);
-        tv.tv_sec+= c->exit_idle_time;
-        c->quit_event = c->mainloop->time_new(c->mainloop, &tv, quit_callback, c);
-    } else if (c->quit_event && pa_idxset_size(c->clients) > 0) {
-        c->mainloop->time_free(c->quit_event);
-        c->quit_event = NULL;
+    if (!c->exit_event &&
+        c->exit_idle_time >= 0 &&
+        pa_idxset_size(c->clients) == 0) {
+
+        c->exit_event = pa_core_rttime_new(c, pa_rtclock_now() + c->exit_idle_time * PA_USEC_PER_SEC, exit_callback, c);
+
+    } 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;
+}
+
+void pa_core_maybe_vacuum(pa_core *c) {
+    pa_assert(c);
+
+    if (!pa_idxset_isempty(c->sink_inputs) ||
+        !pa_idxset_isempty(c->source_outputs))
+        return;
+
+    pa_log_debug("Hmm, no streams around, trying to vacuum.");
+    pa_mempool_vacuum(c->mempool);
+}
+
+pa_time_event* pa_core_rttime_new(pa_core *c, pa_usec_t usec, pa_time_event_cb_t cb, void *userdata) {
+    struct timeval tv;
+
+    pa_assert(c);
+    pa_assert(c->mainloop);
+
+    return c->mainloop->time_new(c->mainloop, pa_timeval_rtstore(&tv, usec, TRUE), cb, userdata);
+}
+
+void pa_core_rttime_restart(pa_core *c, pa_time_event *e, pa_usec_t usec) {
+    struct timeval tv;
+
+    pa_assert(c);
+    pa_assert(c->mainloop);
+
+    c->mainloop->time_restart(e, pa_timeval_rtstore(&tv, usec, TRUE));
+}