summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/source.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-05-08 02:02:06 +0200
committerLennart Poettering <lennart@poettering.net>2009-05-08 02:04:48 +0200
commit99a6a4742f01fc62e5d6b56ec18ee36b7905456a (patch)
treef77a23ba5ab099263ebe0049c07da17dbad1bd2b /src/pulsecore/source.c
parent3766850c8b98b3fe8abb3b5634d4801cbdb95377 (diff)
core: make sure we fix up flags/monitor flags already in pa_sink_new() instead of pa_sink_put()
Diffstat (limited to 'src/pulsecore/source.c')
-rw-r--r--src/pulsecore/source.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index a772dc65..92387f60 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -174,6 +174,9 @@ 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;
@@ -308,20 +311,12 @@ void pa_source_put(pa_source *s) {
pa_assert(s->rtpoll);
pa_assert(s->thread_info.min_latency <= s->thread_info.max_latency);
- 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;
- }
-
- if (s->flags & PA_SOURCE_DECIBEL_VOLUME)
- s->n_volume_steps = PA_VOLUME_NORM+1;
+ s->thread_info.soft_volume = s->soft_volume;
+ s->thread_info.soft_muted = s->muted;
- if (s->flags & PA_SOURCE_DYNAMIC_LATENCY)
- s->fixed_latency = 0;
- else if (s->fixed_latency <= 0)
- s->fixed_latency = DEFAULT_FIXED_LATENCY;
+ pa_assert((s->flags & PA_SOURCE_HW_VOLUME_CTRL) || (s->base_volume == PA_VOLUME_NORM && s->flags & PA_SOURCE_DECIBEL_VOLUME));
+ pa_assert(!(s->flags & PA_SOURCE_DECIBEL_VOLUME) || s->n_volume_steps == PA_VOLUME_NORM+1);
+ pa_assert(!(s->flags & PA_SOURCE_DYNAMIC_LATENCY) == (s->fixed_latency != 0));
pa_assert_se(source_set_state(s, PA_SOURCE_IDLE) == 0);