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

device-manager: No need to check the version after calling read_entry()

Browse source
This commit is contained in:
Colin Guthrie 2009-10-02 19:12:10 +01:00
parent 324eb21395
commit 654df0f858
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -448,7 +448,7 @@ static void update_highest_priority_device_indexes(struct userdata *u, const cha
name = pa_xstrndup(key.data, key.size); name = pa_xstrndup(key.data, key.size);
device_name = get_name(name, prefix); device_name = get_name(name, prefix);
if ((e = read_entry(u, name)) && ENTRY_VERSION == e->version) { if ((e = read_entry(u, name))) {
for (uint32_t i = 0; i < NUM_ROLES; ++i) { for (uint32_t i = 0; i < NUM_ROLES; ++i) {
if (!highest_priority_available[i] || e->priority[i] < highest_priority_available[i]) { if (!highest_priority_available[i] || e->priority[i] < highest_priority_available[i]) {
/* We've found a device with a higher priority than that we've currently got, /* We've found a device with a higher priority than that we've currently got,
@ -1049,7 +1049,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
if (!device || !*device || !description || !*description) if (!device || !*device || !description || !*description)
goto fail; goto fail;
if ((e = read_entry(u, device)) && ENTRY_VERSION == e->version) { if ((e = read_entry(u, device))) {
pa_datum key, data; pa_datum key, data;
pa_strlcpy(e->description, description, sizeof(e->description)); pa_strlcpy(e->description, description, sizeof(e->description));
@ -1217,7 +1217,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
/* Add the device to our hashmap. If it's alredy in it, free it now and carry on */ /* Add the device to our hashmap. If it's alredy in it, free it now and carry on */
if (pa_hashmap_put(h, device->device, device) == 0 if (pa_hashmap_put(h, device->device, device) == 0
&& (e = read_entry(u, device->device)) && ENTRY_VERSION == e->version) { && (e = read_entry(u, device->device))) {
/* We add offset on to the existing priorirty so that when we order, the /* We add offset on to the existing priorirty so that when we order, the
existing entries are always lower priority than the new ones. */ existing entries are always lower priority than the new ones. */
device->prio = (offset + e->priority[role_index]); device->prio = (offset + e->priority[role_index]);
@ -1272,7 +1272,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
idx = 1; idx = 1;
first = TRUE; first = TRUE;
for (i = 0; i < n_devices; ++i) { for (i = 0; i < n_devices; ++i) {
if ((e = read_entry(u, devices[i]->device)) && ENTRY_VERSION == e->version) { if ((e = read_entry(u, devices[i]->device))) {
if (e->priority[role_index] == idx) if (e->priority[role_index] == idx)
idx++; idx++;
else { else {