summaryrefslogtreecommitdiffstats
path: root/src/pulsecore
diff options
context:
space:
mode:
Diffstat (limited to 'src/pulsecore')
-rw-r--r--src/pulsecore/sink-input.c41
-rw-r--r--src/pulsecore/sink.c37
-rw-r--r--src/pulsecore/sink.h4
3 files changed, 38 insertions, 44 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 3df499e4..b05373f8 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -50,36 +50,19 @@ PA_DEFINE_PUBLIC_CLASS(pa_sink_input, pa_msgobject);
static void sink_input_free(pa_object *o);
static void set_real_ratio(pa_sink_input *i, const pa_cvolume *v);
-static int check_passthrough_connection(pa_sink_input_flags_t flags, pa_sink *dest) {
+static int check_passthrough_connection(pa_format_info *format, pa_sink *dest) {
- if (dest->flags & PA_SINK_PASSTHROUGH) {
-
- if (pa_idxset_size(dest->inputs) > 0) {
-
- pa_sink_input *alt_i;
- uint32_t idx;
-
- alt_i = pa_idxset_first(dest->inputs, &idx);
-
- /* only need to check the first input is not PASSTHROUGH */
- if (alt_i->flags & PA_SINK_INPUT_PASSTHROUGH) {
- pa_log_warn("Sink is already connected to PASSTHROUGH input");
- return -PA_ERR_BUSY;
- }
-
- /* Current inputs are PCM, check new input is not PASSTHROUGH */
- if (flags & PA_SINK_INPUT_PASSTHROUGH) {
- pa_log_warn("Sink is already connected, cannot accept new PASSTHROUGH INPUT");
- return -PA_ERR_BUSY;
- }
- }
+ if (pa_sink_is_passthrough(dest)) {
+ pa_log_warn("Sink is already connected to PASSTHROUGH input");
+ return -PA_ERR_BUSY;
+ }
- } else {
- if (flags & PA_SINK_INPUT_PASSTHROUGH) {
- pa_log_warn("Cannot connect PASSTHROUGH sink input to sink without PASSTHROUGH capabilities");
- return -PA_ERR_INVALID;
- }
+ /* If current input(s) exist, check new input is not PASSTHROUGH */
+ if (pa_idxset_size(dest->inputs) > 0 && !pa_format_info_is_pcm(format)) {
+ pa_log_warn("Sink is already connected, cannot accept new PASSTHROUGH INPUT");
+ return -PA_ERR_BUSY;
}
+
return PA_OK;
}
@@ -313,7 +296,7 @@ int pa_sink_input_new(
pa_return_val_if_fail(PA_SINK_IS_LINKED(pa_sink_get_state(data->sink)), -PA_ERR_BADSTATE);
pa_return_val_if_fail(!data->sync_base || (data->sync_base->sink == data->sink && pa_sink_input_get_state(data->sync_base) == PA_SINK_INPUT_CORKED), -PA_ERR_INVALID);
- r = check_passthrough_connection(data->flags, data->sink);
+ r = check_passthrough_connection(data->format, data->sink);
pa_return_val_if_fail(r == PA_OK, r);
if (!data->sample_spec_is_set)
@@ -1355,7 +1338,7 @@ pa_bool_t pa_sink_input_may_move_to(pa_sink_input *i, pa_sink *dest) {
return FALSE;
}
- if (check_passthrough_connection(i->flags, dest) < 0)
+ if (check_passthrough_connection(i->format, dest) < 0)
return FALSE;
if (i->may_move_to)
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 345d090c..33923e1f 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -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,
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index a96dd90a..492abf68 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -382,6 +382,10 @@ int pa_sink_suspend_all(pa_core *c, pa_bool_t suspend, pa_suspend_cause_t cause)
/* Use this instead of checking s->flags & PA_SINK_FLAT_VOLUME directly. */
pa_bool_t pa_sink_flat_volume_enabled(pa_sink *s);
+/* Is the sink in passthrough mode? (that is, is there a passthrough sink input
+ * connected to this sink? */
+pa_bool_t pa_sink_is_passthrough(pa_sink *s);
+
void pa_sink_set_volume(pa_sink *sink, const pa_cvolume *volume, pa_bool_t sendmsg, pa_bool_t save);
const pa_cvolume *pa_sink_get_volume(pa_sink *sink, pa_bool_t force_refresh);