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

sink, source: Reduce indentation level in *_update_rate()

Browse source
This commit is contained in:
Tanu Kaskinen 2013-08-09 07:42:07 +03:00
parent 8cca3b3c10
commit 9aaf053dad
2 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/sink.c
View file

@ -1379,8 +1379,6 @@ void pa_sink_render_full(pa_sink *s, size_t length, pa_memchunk *result) {
/* Called from main thread */ /* Called from main thread */
bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) { bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
bool ret = false; bool ret = false;
if (s->update_rate) {
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;
@ -1388,6 +1386,9 @@ bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
pa_sink_input *i; pa_sink_input *i;
bool use_alternate = false; bool use_alternate = false;
if (!s->update_rate)
return false;
if (PA_UNLIKELY(default_rate == alternate_rate)) { if (PA_UNLIKELY(default_rate == alternate_rate)) {
pa_log_warn("Default and alternate sample rates are the same."); pa_log_warn("Default and alternate sample rates are the same.");
return false; return false;
@ -1456,7 +1457,6 @@ bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
} }
pa_sink_suspend(s, false, PA_SUSPEND_INTERNAL); pa_sink_suspend(s, false, PA_SUSPEND_INTERNAL);
}
return ret; return ret;
} }

6
src/pulsecore/source.c
View file

@ -969,8 +969,6 @@ void pa_source_post_direct(pa_source*s, pa_source_output *o, const pa_memchunk *
/* Called from main thread */ /* Called from main thread */
bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) { bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
bool ret = false; bool ret = false;
if (s->update_rate) {
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;
@ -978,6 +976,9 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
pa_source_output *o; pa_source_output *o;
bool use_alternate = false; bool use_alternate = false;
if (!s->update_rate)
return false;
if (PA_UNLIKELY(default_rate == alternate_rate)) { if (PA_UNLIKELY(default_rate == alternate_rate)) {
pa_log_warn("Default and alternate sample rates are the same."); pa_log_warn("Default and alternate sample rates are the same.");
return false; return false;
@ -1035,7 +1036,6 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
} }
pa_source_suspend(s, false, PA_SUSPEND_INTERNAL); pa_source_suspend(s, false, PA_SUSPEND_INTERNAL);
}
return ret; return ret;
} }