diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-11-22 21:40:15 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-11-22 21:40:15 +0100 |
commit | 675957b9e41d5a92d8cbff3d4fcbcec4965806da (patch) | |
tree | 1e0ac45967e965f9ef2db0784a93c1743e2b399b /src/modules/module-device-manager.c | |
parent | 9708ecd6483ac9037c82a2a2a935e97d027f6b1b (diff) | |
parent | 5aa5c6c196b23acabca3e2c8a6724cb08485acdc (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/modules/module-device-manager.c')
-rw-r--r-- | src/modules/module-device-manager.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c index 3991043d..8d61ff4c 100644 --- a/src/modules/module-device-manager.c +++ b/src/modules/module-device-manager.c @@ -1032,27 +1032,27 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio if ((e = read_entry(u, name))) { uint32_t idx; - char *devname; + char *device_name; uint32_t found_index = PA_INVALID_INDEX; - if ((devname = get_name(name, "sink:"))) { + if ((device_name = get_name(name, "sink:"))) { pa_sink* s; PA_IDXSET_FOREACH(s, u->core->sinks, idx) { - if (strcmp(s->name, devname) == 0) { + if (strcmp(s->name, device_name) == 0) { found_index = s->index; break; } } - pa_xfree(devname); - } else if ((devname = get_name(name, "source:"))) { + pa_xfree(device_name); + } else if ((device_name = get_name(name, "source:"))) { pa_source* s; PA_IDXSET_FOREACH(s, u->core->sources, idx) { - if (strcmp(s->name, devname) == 0) { + if (strcmp(s->name, device_name) == 0) { found_index = s->index; break; } } - pa_xfree(devname); + pa_xfree(device_name); } pa_tagstruct_puts(reply, name); |