mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

introspect: Expose card profile available flag

Browse source 
Available flag can be used by clients to disable the selection of
profiles unavailable.

Update protocol to 29
This commit is contained in:
Luiz Augusto von Dentz 2013-07-15 18:21:25 +03:00 • committed by Tanu Kaskinen
parent b76b9c32d9
commit b98a2e158f
5 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/pulse/introspect.c
View file

@ -886,12 +886,8 @@ static void context_get_card_info_callback(pa_pdispatch *pd, uint32_t command, u
pa_tagstruct_gets(t, &i.name) < 0 ||
pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
pa_tagstruct_gets(t, &i.driver) < 0 ||
pa_tagstruct_getu32(t, &i.n_profiles) < 0) {
pa_context_fail(o->context, PA_ERR_PROTOCOL);
card_info_free(&i);
goto finish;
}
pa_tagstruct_getu32(t, &i.n_profiles) < 0)
goto fail;
if (i.n_profiles > 0) {
i.profiles = pa_xnew0(pa_card_profile_info, i.n_profiles+1);
@ -902,11 +898,15 @@ static void context_get_card_info_callback(pa_pdispatch *pd, uint32_t command, u
pa_tagstruct_gets(t, &i.profiles[j].description) < 0 ||
pa_tagstruct_getu32(t, &i.profiles[j].n_sinks) < 0 ||
pa_tagstruct_getu32(t, &i.profiles[j].n_sources) < 0 ||
pa_tagstruct_getu32(t, &i.profiles[j].priority) < 0) {
pa_tagstruct_getu32(t, &i.profiles[j].priority) < 0)
goto fail;
pa_context_fail(o->context, PA_ERR_PROTOCOL);
card_info_free(&i);
goto finish;
i.profiles[j].available = 1;
if (o->context->version >= 29) {
uint32_t av;
if (pa_tagstruct_getu32(t, &av) < 0)
goto fail;
i.profiles[j].available = av;
}
}
@ -934,11 +934,8 @@ static void context_get_card_info_callback(pa_pdispatch *pd, uint32_t command, u
}
if (o->context->version >= 26) {
if (fill_card_port_info(o->context, t, &i) < 0) {
pa_context_fail(o->context, PA_ERR_PROTOCOL);
card_info_free(&i);
goto finish;
}
if (fill_card_port_info(o->context, t, &i) < 0)
goto fail;
}
if (o->callback) {
@ -958,6 +955,12 @@ static void context_get_card_info_callback(pa_pdispatch *pd, uint32_t command, u
finish:
pa_operation_done(o);
pa_operation_unref(o);
return;
fail:
pa_context_fail(o->context, PA_ERR_PROTOCOL);
card_info_free(&i);
goto finish;
}
pa_operation* pa_context_get_card_info_by_index(pa_context *c, uint32_t idx, pa_card_info_cb_t cb, void *userdata) {

6
src/pulse/introspect.h
View file

@ -452,6 +452,12 @@ typedef struct pa_card_profile_info {
uint32_t n_sinks; /**< Number of sinks this profile would create */
uint32_t n_sources; /**< Number of sources this profile would create */
uint32_t priority; /**< The higher this value is, the more useful this profile is as a default. */
int available;
/**< Is this profile available? If this is zero, meaning "unavailable",
* then it makes no sense to try to activate this profile. If this is
* non-zero, it's still not a guarantee that activating the profile will
* result in anything useful, it just means that the server isn't aware of
* any reason why the profile would definitely be useless. \since 5.0 */
} pa_card_profile_info;
/** Stores information about a specific port of a card. Please

3
src/pulsecore/protocol-native.c
View file

@ -3287,6 +3287,9 @@ static void card_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_car
pa_tagstruct_putu32(t, p->n_sinks);
pa_tagstruct_putu32(t, p->n_sources);
pa_tagstruct_putu32(t, p->priority);
if (c->version >= 29)
pa_tagstruct_putu32(t, (p->available != PA_AVAILABLE_NO));
}
pa_tagstruct_puts(t, card->active_profile->name);