From 22058713af28930c2b95318937c06a8786b41c94 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Fri, 9 Aug 2013 08:51:12 +0300 Subject: [PATCH] sink, source: Don't care about default and alternate rate in passthrough mode In passthrough mode the device rate is set to match the stream rate, and the default and alternate rates are ignored. --- src/pulsecore/sink.c | 4 ++-- src/pulsecore/source.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 2f5174e..cd08b99 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -1389,8 +1389,8 @@ bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) { if (!s->update_rate) return false; - if (PA_UNLIKELY(default_rate == alternate_rate)) { - pa_log_warn("Default and alternate sample rates are the same."); + if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) { + pa_log_debug("Default and alternate sample rates are the same."); return false; } diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 2c8d440..0029454 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -979,8 +979,8 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) { if (!s->update_rate) return false; - if (PA_UNLIKELY(default_rate == alternate_rate)) { - pa_log_warn("Default and alternate sample rates are the same."); + if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) { + pa_log_debug("Default and alternate sample rates are the same."); return false; } -- 2.7.4