diff options
| author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-08-09 08:51:12 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-08-23 13:26:43 +0300 |
| commit | 22058713af28930c2b95318937c06a8786b41c94 (patch) | |
| tree | 818bbf9ec26393899c86c5942586e39922d66feb /src | |
| parent | 9aaf053dad2fef8d92ffd42510564b6268b2a857 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pulsecore/sink.c | 4 | ||||
| -rw-r--r-- | 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 2f5174e40..cd08b9901 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 2c8d4401e..00294545d 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; } |