diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-06-14 21:33:49 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-06-14 21:33:49 +0000 |
| commit | 4cf508ec3991254af2eb007df6f08216329d62ef (patch) | |
| tree | 0e914104ef6aab383227a9eb635526b8bd1da31c /src/pulsecore | |
| parent | ce534976cec4fe3fa4b861b0136062e817ed0994 (diff) | |
minor modernizations, increase unload timeout to 60s
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2530 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore')
| -rw-r--r-- | src/pulsecore/core-scache.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c index e5546007..fa01291d 100644 --- a/src/pulsecore/core-scache.c +++ b/src/pulsecore/core-scache.c @@ -63,7 +63,7 @@ #include "core-scache.h" -#define UNLOAD_POLL_TIME 5 +#define UNLOAD_POLL_TIME 60 static void timeout_callback(pa_mainloop_api *m, pa_time_event*e, PA_GCC_UNUSED const struct timeval *tv, void *userdata) { pa_core *c = userdata; @@ -131,8 +131,7 @@ static pa_scache_entry* scache_add_item(pa_core *c, const char *name) { } e->last_used_time = 0; - e->memchunk.memblock = NULL; - e->memchunk.index = e->memchunk.length = 0; + pa_memchunk_reset(&e->memchunk); e->filename = NULL; e->lazy = FALSE; e->last_used_time = 0; @@ -277,8 +276,7 @@ int pa_scache_remove_item(pa_core *c, const char *name) { if (!(e = pa_namereg_get(c, name, PA_NAMEREG_SAMPLE, 0))) return -1; - if (pa_idxset_remove_by_data(c->scache, e, NULL) != e) - pa_assert(0); + pa_assert_se(pa_idxset_remove_by_data(c->scache, e, NULL) == e); pa_log_debug("Removed sample \"%s\"", name); |