diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-05-08 02:16:10 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-05-08 02:16:10 +0200 |
commit | 7f767e5fe660ced7e1cb0207ef0477818152d833 (patch) | |
tree | 1a4b77ec6daa18e75d84ad385d7f05688a2b123a /src/pulsecore/source.c | |
parent | 8d9c26e3b6d29d3922a7cc740f273e34ea97498e (diff) |
core: liberalize 99a6a4 a bit
While flags should generally be initialized by passing them to
pa_{sink|source}_new() we make an exception for the volume related flags
which may be initilized afterwards, but before _put().
Diffstat (limited to 'src/pulsecore/source.c')
-rw-r--r-- | src/pulsecore/source.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 47bc5fb2..8aeb5606 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -174,9 +174,6 @@ pa_source* pa_source_new( return NULL; } - if (!(flags & PA_SOURCE_HW_VOLUME_CTRL)) - flags |= PA_SOURCE_DECIBEL_VOLUME; - s->parent.parent.free = source_free; s->parent.process_msg = pa_source_process_msg; @@ -311,6 +308,13 @@ void pa_source_put(pa_source *s) { pa_assert(s->rtpoll); pa_assert(s->thread_info.min_latency <= s->thread_info.max_latency); + /* Generally, flags should be initialized via pa_source_new(). As + * a special exception we allow volume related flags to be set + * between _new() and _put(). */ + + if (!(s->flags & PA_SOURCE_HW_VOLUME_CTRL)) + s->flags |= PA_SOURCE_DECIBEL_VOLUME; + s->thread_info.soft_volume = s->soft_volume; s->thread_info.soft_muted = s->muted; |