mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse: Use more intuitive indexing with port infos in introspect.c.

Browse source
This commit is contained in:
Tanu Kaskinen 2012-04-13 14:32:12 +03:00 • committed by Tanu Kaskinen
parent 7a0251eab2
commit 9b3d5acbbc
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pulse/introspect.c
View file

@ -204,22 +204,22 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, u
i.ports[0] = pa_xnew(pa_sink_port_info, i.n_ports); i.ports[0] = pa_xnew(pa_sink_port_info, i.n_ports);
for (j = 0; j < i.n_ports; j++) { for (j = 0; j < i.n_ports; j++) {
if (pa_tagstruct_gets(t, &i.ports[0][j].name) < 0 || i.ports[j] = &i.ports[0][j];
pa_tagstruct_gets(t, &i.ports[0][j].description) < 0 ||
pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) { if (pa_tagstruct_gets(t, &i.ports[j]->name) < 0 ||
pa_tagstruct_gets(t, &i.ports[j]->description) < 0 ||
pa_tagstruct_getu32(t, &i.ports[j]->priority) < 0) {
goto fail; goto fail;
} }
i.ports[0][j].available = PA_PORT_AVAILABLE_UNKNOWN; i.ports[j]->available = PA_PORT_AVAILABLE_UNKNOWN;
if (o->context->version >= 24) { if (o->context->version >= 24) {
uint32_t av; uint32_t av;
if (pa_tagstruct_getu32(t, &av) < 0 || av > PA_PORT_AVAILABLE_YES) if (pa_tagstruct_getu32(t, &av) < 0 || av > PA_PORT_AVAILABLE_YES)
goto fail; goto fail;
i.ports[0][j].available = av; i.ports[j]->available = av;
} }
i.ports[j] = &i.ports[0][j];
} }
i.ports[j] = NULL; i.ports[j] = NULL;
@ -477,22 +477,22 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command,
i.ports[0] = pa_xnew(pa_source_port_info, i.n_ports); i.ports[0] = pa_xnew(pa_source_port_info, i.n_ports);
for (j = 0; j < i.n_ports; j++) { for (j = 0; j < i.n_ports; j++) {
if (pa_tagstruct_gets(t, &i.ports[0][j].name) < 0 || i.ports[j] = &i.ports[0][j];
pa_tagstruct_gets(t, &i.ports[0][j].description) < 0 ||
pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) { if (pa_tagstruct_gets(t, &i.ports[j]->name) < 0 ||
pa_tagstruct_gets(t, &i.ports[j]->description) < 0 ||
pa_tagstruct_getu32(t, &i.ports[j]->priority) < 0) {
goto fail; goto fail;
} }
i.ports[0][j].available = PA_PORT_AVAILABLE_UNKNOWN; i.ports[j]->available = PA_PORT_AVAILABLE_UNKNOWN;
if (o->context->version >= 24) { if (o->context->version >= 24) {
uint32_t av; uint32_t av;
if (pa_tagstruct_getu32(t, &av) < 0 || av > PA_PORT_AVAILABLE_YES) if (pa_tagstruct_getu32(t, &av) < 0 || av > PA_PORT_AVAILABLE_YES)
goto fail; goto fail;
i.ports[0][j].available = av; i.ports[j]->available = av;
} }
i.ports[j] = &i.ports[0][j];
} }
i.ports[j] = NULL; i.ports[j] = NULL;