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

modules: Make use of new function pa_modargs_get_sample_rate()

Browse source 
by using pa_modargs_get_sample_rate() we avoid inconsistant validity
checking of the sample rate in various places

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2013-11-29 15:32:41 +01:00 • committed by Tanu Kaskinen
parent 742b93d32c
commit e74d4244a2
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/bluetooth/module-bluez4-device.c
View file

@ -2450,8 +2450,7 @@ int pa__init(pa_module *m) {
goto fail;
}
if (pa_modargs_get_value_u32(ma, "rate", &u->sample_spec.rate) < 0 ||
u->sample_spec.rate <= 0 || u->sample_spec.rate > PA_RATE_MAX) {
if (pa_modargs_get_sample_rate(ma, &u->sample_spec.rate) < 0) {
pa_log_error("Failed to get rate from module arguments");
goto fail;
}

2
src/modules/module-sine-source.c
View file

@ -213,7 +213,7 @@ int pa__init(pa_module*m) {
ss.channels = 1;
ss.rate = 44100;
if (pa_modargs_get_value_u32(ma, "rate", &ss.rate) < 0 || ss.rate <= 1) {
if (pa_modargs_get_sample_rate(ma, &ss.rate) < 0) {
pa_log("Invalid rate specification");
goto fail;
}

4
src/pulsecore/modargs.c
View file

@ -387,9 +387,7 @@ int pa_modargs_get_sample_spec(pa_modargs *ma, pa_sample_spec *rss) {
pa_assert(rss);
ss = *rss;
if ((pa_modargs_get_value_u32(ma, "rate", &ss.rate)) < 0 ||
ss.rate <= 0 ||
ss.rate > PA_RATE_MAX)
if ((pa_modargs_get_sample_rate(ma, &ss.rate)) < 0)
return -1;
channels = ss.channels;