diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-10-29 01:54:45 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-10-29 01:54:45 +0100 |
| commit | 754644fa6e1ec83dba85bf586a2b09c2283aa096 (patch) | |
| tree | 27b464013d48b86ce8daba6adb6d925369c50ea0 /src | |
| parent | e7e4e4459e6dad888d1f9a01d0b185221e1a120e (diff) | |
| parent | e9ccc61a2f561c37939e34a192bd7bd953eb8cbc (diff) | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/module-device-manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c index e3158644..3991043d 100644 --- a/src/modules/module-device-manager.c +++ b/src/modules/module-device-manager.c @@ -1033,13 +1033,13 @@ 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; - uint32_t index = PA_INVALID_INDEX; + uint32_t found_index = PA_INVALID_INDEX; if ((devname = get_name(name, "sink:"))) { pa_sink* s; PA_IDXSET_FOREACH(s, u->core->sinks, idx) { if (strcmp(s->name, devname) == 0) { - index = s->index; + found_index = s->index; break; } } @@ -1048,7 +1048,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio pa_source* s; PA_IDXSET_FOREACH(s, u->core->sources, idx) { if (strcmp(s->name, devname) == 0) { - index = s->index; + found_index = s->index; break; } } @@ -1058,7 +1058,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio pa_tagstruct_puts(reply, name); pa_tagstruct_puts(reply, e->description); pa_tagstruct_puts(reply, e->icon); - pa_tagstruct_putu32(reply, index); + pa_tagstruct_putu32(reply, found_index); pa_tagstruct_putu32(reply, NUM_ROLES); for (uint32_t i = ROLE_NONE; i < NUM_ROLES; ++i) { |