mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

source: Fix monitor source rate changing

Browse source 
When a sink changes its sample rate, also the monitor source rate
needs to be changed. In order to determine whether a source supports
rate changing, the code checks if the update_rate() callback is set,
but monitor sources don't have that callback set, so the old code
always failed to change the monitor source rate.

This patch fixes the monitor source rate changing by handling monitor
sources as a special case in pa_source_update_rate(): if the source is
a monitor source, then the update_rate() callback is not required.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=66424
This commit is contained in:
Tanu Kaskinen 2013-08-09 07:45:26 +03:00
parent 9a590dd3f2
commit 2c14306507
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pulsecore/source.c
View file

@ -972,14 +972,12 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
uint32_t desired_rate = rate; uint32_t desired_rate = rate;
uint32_t default_rate = s->default_sample_rate; uint32_t default_rate = s->default_sample_rate;
uint32_t alternate_rate = s->alternate_sample_rate; uint32_t alternate_rate = s->alternate_sample_rate;
uint32_t idx;
pa_source_output *o;
bool use_alternate = false; bool use_alternate = false;
if (rate == s->sample_spec.rate) if (rate == s->sample_spec.rate)
return true; return true;
if (!s->update_rate) if (!s->update_rate && !s->monitor_of)
return false; return false;
if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) { if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) {
@ -1027,14 +1025,24 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
pa_log_debug("Suspending source %s due to changing the sample rate.", s->name); pa_log_debug("Suspending source %s due to changing the sample rate.", s->name);
pa_source_suspend(s, true, PA_SUSPEND_INTERNAL); pa_source_suspend(s, true, PA_SUSPEND_INTERNAL);
if (s->update_rate(s, desired_rate) == true) { if (s->update_rate)
pa_log_info("Changed sampling rate successfully "); ret = s->update_rate(s, desired_rate);
else {
/* This is a monitor source. */
s->sample_spec.rate = desired_rate;
ret = true;
}
if (ret) {
uint32_t idx;
pa_source_output *o;
PA_IDXSET_FOREACH(o, s->outputs, idx) { PA_IDXSET_FOREACH(o, s->outputs, idx) {
if (o->state == PA_SOURCE_OUTPUT_CORKED) if (o->state == PA_SOURCE_OUTPUT_CORKED)
pa_source_output_update_rate(o); pa_source_output_update_rate(o);
} }
ret = true;
pa_log_info("Changed sampling rate successfully");
} }
pa_source_suspend(s, false, PA_SUSPEND_INTERNAL); pa_source_suspend(s, false, PA_SUSPEND_INTERNAL);