mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

if possible do not unload already loaded modules when the gconf settings change. instead try to reuse already loaded modules as much as possible

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1157 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-07-27 16:51:20 +00:00
parent 87d4f0bd93
commit fec7e9bec7
1 changed files with 71 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

100
src/modules/gconf/module-gconf.c
View file

@ -62,11 +62,17 @@ PA_MODULE_USAGE("")
/* #undef PA_GCONF_HELPER */ /* #undef PA_GCONF_HELPER */
/* #define PA_GCONF_HELPER "/home/lennart/projects/pulseaudio/src/gconf-helper" */ /* #define PA_GCONF_HELPER "/home/lennart/projects/pulseaudio/src/gconf-helper" */
struct module_item {
char *name;
char *args;
uint32_t index;
};
struct module_info { struct module_info {
char *name; char *name;
unsigned n_indexes; struct module_item items[MAX_MODULES];
uint32_t indexes[MAX_MODULES]; unsigned n_items;
}; };
struct userdata { struct userdata {
@ -134,42 +140,70 @@ static char *read_string(struct userdata *u) {
} }
} }
static void unload_modules(struct userdata *u, struct module_info*m) { static void unload_one_module(struct userdata *u, struct module_info*m, unsigned i) {
assert(u);
assert(m);
assert(i < m->n_items);
if (m->items[i].index == PA_INVALID_INDEX)
return;
pa_log_debug(__FILE__": Unloading module #%i", m->items[i].index);
pa_module_unload_by_index(u->core, m->items[i].index);
m->items[i].index = PA_INVALID_INDEX;
pa_xfree(m->items[i].name);
pa_xfree(m->items[i].args);
m->items[i].name = m->items[i].args = NULL;
}
static void unload_all_modules(struct userdata *u, struct module_info*m) {
unsigned i; unsigned i;
assert(u); assert(u);
assert(m); assert(m);
for (i = 0; i < m->n_indexes; i++) { for (i = 0; i < m->n_items; i++)
pa_log_debug(__FILE__": Unloading module #%i", m->indexes[i]); unload_one_module(u, m, i);
pa_module_unload_by_index(u->core, m->indexes[i]);
}
m->n_indexes = 0; m->n_items = 0;
} }
static void load_module( static void load_module(
struct userdata *u, struct userdata *u,
struct module_info *m, struct module_info *m,
const char *module, int i,
const char *args) { const char *name,
const char *args,
int is_new) {
pa_module *mod; pa_module *mod;
assert(u); assert(u);
assert(m); assert(m);
assert(module); assert(name);
assert(args);
assert(m->n_indexes < MAX_MODULES); if (!is_new) {
if (m->items[i].index != PA_INVALID_INDEX &&
strcmp(m->items[i].name, name) == 0 &&
strcmp(m->items[i].args, args) == 0)
return;
pa_log_debug(__FILE__": Loading module '%s' with args '%s' due to GConf configuration.", module, args); unload_one_module(u, m, i);
}
if (!(mod = pa_module_load(u->core, module, args))) { pa_log_debug(__FILE__": Loading module '%s' with args '%s' due to GConf configuration.", name, args);
m->items[i].name = pa_xstrdup(name);
m->items[i].args = pa_xstrdup(args);
m->items[i].index = PA_INVALID_INDEX;
if (!(mod = pa_module_load(u->core, name, args))) {
pa_log(__FILE__": pa_module_load() failed"); pa_log(__FILE__": pa_module_load() failed");
return; return;
} }
m->indexes[m->n_indexes++] = mod->index; m->items[i].index = mod->index;
} }
static void module_info_free(void *p, void *userdata) { static void module_info_free(void *p, void *userdata) {
@ -179,7 +213,7 @@ static void module_info_free(void *p, void *userdata) {
assert(m); assert(m);
assert(u); assert(u);
unload_modules(u, m); unload_all_modules(u, m);
pa_xfree(m->name); pa_xfree(m->name);
pa_xfree(m); pa_xfree(m);
} }
@ -201,24 +235,25 @@ static int handle_event(struct userdata *u) {
case '+': { case '+': {
char *name; char *name;
struct module_info *m; struct module_info *m;
unsigned i, j;
if (!(name = read_string(u))) if (!(name = read_string(u)))
goto fail; goto fail;
if ((m = pa_hashmap_get(u->module_infos, name))) { if (!(m = pa_hashmap_get(u->module_infos, name))) {
unload_modules(u, m);
} else {
m = pa_xnew(struct module_info, 1); m = pa_xnew(struct module_info, 1);
m->name = pa_xstrdup(name); m->name = name;
m->n_indexes = 0; m->n_items = 0;
pa_hashmap_put(u->module_infos, m->name, m); pa_hashmap_put(u->module_infos, m->name, m);
} } else
pa_xfree(name);
while (m->n_indexes < MAX_MODULES) {
i = 0;
while (i < MAX_MODULES) {
char *module, *args; char *module, *args;
if (!(module = read_string(u))) { if (!(module = read_string(u))) {
pa_xfree(name); if (i > m->n_items) m->n_items = i;
goto fail; goto fail;
} }
@ -228,18 +263,25 @@ static int handle_event(struct userdata *u) {
} }
if (!(args = read_string(u))) { if (!(args = read_string(u))) {
pa_xfree(name);
pa_xfree(module); pa_xfree(module);
if (i > m->n_items) m->n_items = i;
goto fail; goto fail;
} }
load_module(u, m, module, args); load_module(u, m, i, module, args, i >= m->n_items);
i++;
pa_xfree(module); pa_xfree(module);
pa_xfree(args); pa_xfree(args);
} }
pa_xfree(name); /* Unload all removed modules */
for (j = i; j < m->n_items; j++)
unload_one_module(u, m, j);
m->n_items = i;
break; break;
} }