diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-24 21:17:55 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-24 21:17:55 +0100 |
commit | c64d8cbcc7eefa2e805db415f99b507c5a065195 (patch) | |
tree | 376c618c1035785b11e4f55a4634257ae66b2579 /src | |
parent | 50695d95d11baf621dde1fa71db03ff422bbef6e (diff) |
Allow calling pa_{sink|source}_update_proplist() without an actual proprlist
Diffstat (limited to 'src')
-rw-r--r-- | src/pulsecore/sink.c | 5 | ||||
-rw-r--r-- | src/pulsecore/source.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 308a4e57..a3bf03a6 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -1202,11 +1202,10 @@ void pa_sink_mute_changed(pa_sink *s, pa_bool_t new_muted) { /* Called from main thread */ pa_bool_t pa_sink_update_proplist(pa_sink *s, pa_update_mode_t mode, pa_proplist *p) { - pa_sink_assert_ref(s); - pa_assert(p); - pa_proplist_update(s->proplist, mode, p); + if (p) + pa_proplist_update(s->proplist, mode, p); if (PA_SINK_IS_LINKED(s->state)) { pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_PROPLIST_CHANGED], s); diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 4a5bbad4..da3ae794 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -744,9 +744,9 @@ void pa_source_mute_changed(pa_source *s, pa_bool_t new_muted) { /* Called from main thread */ pa_bool_t pa_source_update_proplist(pa_source *s, pa_update_mode_t mode, pa_proplist *p) { pa_source_assert_ref(s); - pa_assert(p); - pa_proplist_update(s->proplist, mode, p); + if (p) + pa_proplist_update(s->proplist, mode, p); if (PA_SOURCE_IS_LINKED(s->state)) { pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], s); |