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

card: make sure to always hand failure code back in some calls

Browse source
This commit is contained in:
Lennart Poettering 2009-06-17 03:15:56 +02:00
parent 325c01bdbc
commit 4f44fe86fb
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/pulsecore/card.c
View file

@ -212,26 +212,27 @@ void pa_card_free(pa_card *c) {
int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save) {
pa_card_profile *profile;
int r;
pa_assert(c);
if (!c->set_profile) {
pa_log_warn("set_profile() operation not implemented for card %u \"%s\"", c->index, c->name);
return -1;
pa_log_debug("set_profile() operation not implemented for card %u \"%s\"", c->index, c->name);
return -PA_ERR_NOTIMPLEMENTED;
}
if (!c->profiles)
return -1;
return -PA_ERR_NOENTITY;
if (!(profile = pa_hashmap_get(c->profiles, name)))
return -1;
return -PA_ERR_NOENTITY;
if (c->active_profile == profile) {
c->save_profile = c->save_profile || save;
return 0;
}
if (c->set_profile(c, profile) < 0)
return -1;
if ((r = c->set_profile(c, profile)) < 0)
return r;
pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
@ -252,11 +253,19 @@ int pa_card_suspend(pa_card *c, pa_bool_t suspend, pa_suspend_cause_t cause) {
pa_assert(c);
pa_assert(cause != 0);
for (sink = pa_idxset_first(c->sinks, &idx); sink; sink = pa_idxset_next(c->sinks, &idx))
ret -= pa_sink_suspend(sink, suspend, cause) < 0;
for (sink = pa_idxset_first(c->sinks, &idx); sink; sink = pa_idxset_next(c->sinks, &idx)) {
int r;
for (source = pa_idxset_first(c->sources, &idx); source; source = pa_idxset_next(c->sources, &idx))
ret -= pa_source_suspend(source, suspend, cause) < 0;
if ((r = pa_sink_suspend(sink, suspend, cause)) < 0)
ret = r;
}
for (source = pa_idxset_first(c->sources, &idx); source; source = pa_idxset_next(c->sources, &idx)) {
int r;
if ((r = pa_source_suspend(source, suspend, cause)) < 0)
ret = r;
}
return ret;
}