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

card: Store a pa_card pointer in pa_card_profile.

Browse source
This commit is contained in:
Tanu Kaskinen 2012-06-29 18:04:55 +03:00 • committed by Tanu Kaskinen
parent d0be10191e
commit 43454bc48c
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pulsecore/card.c
View file

@ -44,6 +44,7 @@ pa_card_profile *pa_card_profile_new(const char *name, const char *description,
pa_assert(name); pa_assert(name);
c = pa_xmalloc(PA_ALIGN(sizeof(pa_card_profile)) + extra); c = pa_xmalloc(PA_ALIGN(sizeof(pa_card_profile)) + extra);
c->card = NULL;
c->name = pa_xstrdup(name); c->name = pa_xstrdup(name);
c->description = pa_xstrdup(description); c->description = pa_xstrdup(description);
@ -56,6 +57,7 @@ pa_card_profile *pa_card_profile_new(const char *name, const char *description,
void pa_card_profile_free(pa_card_profile *c) { void pa_card_profile_free(pa_card_profile *c) {
pa_assert(c); pa_assert(c);
pa_assert(!c->card); /* Card profiles shouldn't be freed before removing them from the card. */
pa_xfree(c->name); pa_xfree(c->name);
pa_xfree(c->description); pa_xfree(c->description);
@ -85,6 +87,7 @@ void pa_card_add_profile(pa_card *c, pa_card_profile *profile) {
/* take ownership of the profile */ /* take ownership of the profile */
pa_assert_se(pa_hashmap_put(c->profiles, profile->name, profile) >= 0); pa_assert_se(pa_hashmap_put(c->profiles, profile->name, profile) >= 0);
profile->card = c;
pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index); pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
@ -140,6 +143,8 @@ void pa_card_new_data_done(pa_card_new_data *data) {
pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) { pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
pa_card *c; pa_card *c;
const char *name; const char *name;
void *state;
pa_card_profile *profile;
pa_core_assert_ref(core); pa_core_assert_ref(core);
pa_assert(data); pa_assert(data);
@ -178,6 +183,11 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
c->ports = data->ports; c->ports = data->ports;
data->ports = NULL; data->ports = NULL;
if (c->profiles) {
PA_HASHMAP_FOREACH(profile, c->profiles, state)
profile->card = c;
}
c->active_profile = NULL; c->active_profile = NULL;
c->save_profile = FALSE; c->save_profile = FALSE;
@ -186,12 +196,9 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
c->save_profile = data->save_profile; c->save_profile = data->save_profile;
if (!c->active_profile) { if (!c->active_profile) {
void *state; PA_HASHMAP_FOREACH(profile, c->profiles, state)
pa_card_profile *p; if (!c->active_profile || profile->priority > c->active_profile->priority)
c->active_profile = profile;
PA_HASHMAP_FOREACH(p, c->profiles, state)
if (!c->active_profile || p->priority > c->active_profile->priority)
c->active_profile = p;
} }
c->userdata = NULL; c->userdata = NULL;
@ -238,8 +245,10 @@ void pa_card_free(pa_card *c) {
if (c->profiles) { if (c->profiles) {
pa_card_profile *p; pa_card_profile *p;
while ((p = pa_hashmap_steal_first(c->profiles))) while ((p = pa_hashmap_steal_first(c->profiles))) {
p->card = NULL;
pa_card_profile_free(p); pa_card_profile_free(p);
}
pa_hashmap_free(c->profiles, NULL, NULL); pa_hashmap_free(c->profiles, NULL, NULL);
} }

1
src/pulsecore/card.h
View file

@ -30,6 +30,7 @@ typedef struct pa_card pa_card;
#include <pulsecore/idxset.h> #include <pulsecore/idxset.h>
typedef struct pa_card_profile { typedef struct pa_card_profile {
pa_card *card;
char *name; char *name;
char *description; char *description;