mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

device-restore: Fix the application of an entry to allow changing the name of devices.

Browse source 
This fixes a few bugs in the copy+pasted implementation of apply_entry()/get_name().
This commit is contained in:
Colin Guthrie 2009-06-28 15:33:38 +01:00
parent b8b28ef57e
commit 276e9534b5
1 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/modules/module-device-manager.c
View file

@ -289,55 +289,47 @@ static pa_hook_result_t source_new_hook_callback(pa_core *c, pa_source_new_data
} }
static char *get_name(const char *key, const char *prefix) { static char *get_name(const char *key, const char *prefix) {
char *t; char *t;
if (strncmp(key, prefix, sizeof(prefix))) if (strncmp(key, prefix, strlen(prefix)))
return NULL; return NULL;
t = pa_xstrdup(key + sizeof(prefix)); t = pa_xstrdup(key + strlen(prefix));
return t; return t;
} }
static void apply_entry(struct userdata *u, const char *name, struct entry *e) { static void apply_entry(struct userdata *u, const char *name, struct entry *e) {
pa_sink *sink; pa_sink *sink;
pa_source *source; pa_source *source;
uint32_t idx; uint32_t idx;
pa_assert(u);
pa_assert(name);
pa_assert(e);
for (sink = pa_idxset_first(u->core->sinks, &idx); sink; sink = pa_idxset_next(u->core->sinks, &idx)) {
char *n; char *n;
if (!(n = get_name(name, "sink"))) pa_assert(u);
continue; pa_assert(name);
pa_assert(e);
if (!pa_streq(sink->name, n)) { if ((n = get_name(name, "sink:"))) {
pa_xfree(n); for (sink = pa_idxset_first(u->core->sinks, &idx); sink; sink = pa_idxset_next(u->core->sinks, &idx)) {
continue; if (!pa_streq(sink->name, n)) {
continue;
}
pa_log_info("Setting description for sink %s.", sink->name);
pa_sink_set_description(sink, e->description);
}
pa_xfree(n);
} }
pa_xfree(n); else if ((n = get_name(name, "source:"))) {
for (source = pa_idxset_first(u->core->sources, &idx); source; source = pa_idxset_next(u->core->sources, &idx)) {
if (!pa_streq(source->name, n)) {
continue;
}
pa_log_info("Restoring description for sink %s.", sink->name); pa_log_info("Setting description for source %s.", source->name);
pa_proplist_sets(sink->proplist, PA_PROP_DEVICE_DESCRIPTION, e->description); pa_source_set_description(source, e->description);
} }
pa_xfree(n);
for (source = pa_idxset_first(u->core->sources, &idx); source; source = pa_idxset_next(u->core->sources, &idx)) {
char *n;
if (!(n = get_name(name, "source")))
continue;
if (!pa_streq(source->name, n)) {
pa_xfree(n);
continue;
} }
pa_xfree(n);
pa_log_info("Restoring description for source %s.", source->name);
pa_proplist_sets(source->proplist, PA_PROP_DEVICE_DESCRIPTION, e->description);
}
} }
#define EXT_VERSION 1 #define EXT_VERSION 1