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

sink: Remove PASSTHROUGH flag

Browse source 
This removes the passthrough flag from sinks since we will drop
exclusively passthrough sinks in favour of providing a list of formats
supported by each sink. We can still determine whether a sink is in
passthrough mode by checking if any non-PCM streams are attached to it.
This commit is contained in:
Arun Raghavan 2011-03-02 02:06:54 +05:30
parent 54c391e6db
commit 71ec9577cf
5 changed files with 41 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/pulsecore/sink.c
View file

@ -1241,6 +1241,24 @@ pa_bool_t pa_sink_flat_volume_enabled(pa_sink *s) {
return (s->flags & PA_SINK_FLAT_VOLUME);
}
/* Called from main context */
pa_bool_t pa_sink_is_passthrough(pa_sink *s) {
pa_sink_input *alt_i;
uint32_t idx;
pa_sink_assert_ref(s);
/* one and only one PASSTHROUGH input can possibly be connected */
if (pa_idxset_size(s->inputs) == 1) {
alt_i = pa_idxset_first(s->inputs, &idx);
if (!pa_format_info_is_pcm(alt_i->format))
return TRUE;
}
return FALSE;
}
/* Called from main context. */
static void compute_reference_ratio(pa_sink_input *i) {
unsigned c = 0;
@ -1632,21 +1650,10 @@ void pa_sink_set_volume(
pa_assert(!volume || volume->channels == 1 || pa_cvolume_compatible(volume, &s->sample_spec));
/* make sure we don't change the volume when a PASSTHROUGH input is connected */
if (s->flags & PA_SINK_PASSTHROUGH) {
pa_sink_input *alt_i;
uint32_t idx;
/* one and only one PASSTHROUGH input can possibly be connected */
if (pa_idxset_size(s->inputs) == 1) {
alt_i = pa_idxset_first(s->inputs, &idx);
if (alt_i->flags & PA_SINK_INPUT_PASSTHROUGH) {
/* FIXME: Need to notify client that volume control is disabled */
pa_log_warn("Cannot change volume, Sink is connected to PASSTHROUGH input");
return;
}
}
if (pa_sink_is_passthrough(s)) {
/* FIXME: Need to notify client that volume control is disabled */
pa_log_warn("Cannot change volume, Sink is connected to PASSTHROUGH input");
return;
}
/* In case of volume sharing, the volume is set for the root sink first,