diff options
| -rw-r--r-- | src/modules/alsa/alsa-sink.c | 3 | ||||
| -rw-r--r-- | src/modules/alsa/alsa-source.c | 3 | ||||
| -rw-r--r-- | src/pulsecore/sink.c | 9 | ||||
| -rw-r--r-- | src/pulsecore/source.c | 9 |
4 files changed, 6 insertions, 18 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index ed9e0a51c..4cc4b0e3a 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -2435,8 +2435,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca u->sink->set_port = sink_set_port_ucm_cb; else u->sink->set_port = sink_set_port_cb; - if (u->sink->alternate_sample_rate) - u->sink->reconfigure = sink_reconfigure_cb; + u->sink->reconfigure = sink_reconfigure_cb; u->sink->userdata = u; pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index 31d5bb321..2bb42f0b3 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -2111,8 +2111,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p u->source->set_port = source_set_port_ucm_cb; else u->source->set_port = source_set_port_cb; - if (u->source->alternate_sample_rate) - u->source->reconfigure = source_reconfigure_cb; + u->source->reconfigure = source_reconfigure_cb; u->source->userdata = u; pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index b801b6bcc..38e8e50d2 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -271,11 +271,6 @@ pa_sink* pa_sink_new( else s->alternate_sample_rate = s->core->alternate_sample_rate; - if (s->sample_spec.rate == s->alternate_sample_rate) { - pa_log_warn("Default and alternate sample rates are the same."); - s->alternate_sample_rate = 0; - } - s->inputs = pa_idxset_new(NULL, NULL); s->n_corked = 0; s->input_to_master = NULL; @@ -1500,9 +1495,9 @@ int pa_sink_reconfigure(pa_sink *s, pa_sample_spec *spec, bool passthrough) { default_rate_is_usable = true; if (default_rate % 4000 == 0 && spec->rate % 4000 == 0) default_rate_is_usable = true; - if (alternate_rate && alternate_rate % 11025 == 0 && spec->rate % 11025 == 0) + if (alternate_rate % 11025 == 0 && spec->rate % 11025 == 0) alternate_rate_is_usable = true; - if (alternate_rate && alternate_rate % 4000 == 0 && spec->rate % 4000 == 0) + if (alternate_rate % 4000 == 0 && spec->rate % 4000 == 0) alternate_rate_is_usable = true; if (alternate_rate_is_usable && !default_rate_is_usable) diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index ffb8b6ce4..02ae87a89 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -258,11 +258,6 @@ pa_source* pa_source_new( else s->alternate_sample_rate = s->core->alternate_sample_rate; - if (s->sample_spec.rate == s->alternate_sample_rate) { - pa_log_warn("Default and alternate sample rates are the same."); - s->alternate_sample_rate = 0; - } - s->outputs = pa_idxset_new(NULL, NULL); s->n_corked = 0; s->monitor_of = NULL; @@ -1081,9 +1076,9 @@ int pa_source_reconfigure(pa_source *s, pa_sample_spec *spec, bool passthrough) default_rate_is_usable = true; if (default_rate % 4000 == 0 && spec->rate % 4000 == 0) default_rate_is_usable = true; - if (alternate_rate && alternate_rate % 11025 == 0 && spec->rate % 11025 == 0) + if (alternate_rate % 11025 == 0 && spec->rate % 11025 == 0) alternate_rate_is_usable = true; - if (alternate_rate && alternate_rate % 4000 == 0 && spec->rate % 4000 == 0) + if (alternate_rate % 4000 == 0 && spec->rate % 4000 == 0) alternate_rate_is_usable = true; if (alternate_rate_is_usable && !default_rate_is_usable) |