diff options
| author | Peter Meerwald <p.meerwald@bct-electronic.com> | 2013-11-29 15:32:41 +0100 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-12-05 10:54:12 +0200 |
| commit | e74d4244a285a7e29300c19df7b202ba7c51ecef (patch) | |
| tree | d6129d8740d0e4d86a5452f06e84a16ff98004eb | |
| parent | 742b93d32cfb90d23016f8f0dfe6bd66e5909d74 (diff) | |
modules: Make use of new function pa_modargs_get_sample_rate()
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>
| -rw-r--r-- | src/modules/bluetooth/module-bluez4-device.c | 3 | ||||
| -rw-r--r-- | src/modules/module-sine-source.c | 2 | ||||
| -rw-r--r-- | src/pulsecore/modargs.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c index 047332b07..f419cb9f3 100644 --- a/src/modules/bluetooth/module-bluez4-device.c +++ b/src/modules/bluetooth/module-bluez4-device.c @@ -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; } diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c index bb3f8c411..338fedb11 100644 --- a/src/modules/module-sine-source.c +++ b/src/modules/module-sine-source.c @@ -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; } diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c index 04e60fdd0..432e480d5 100644 --- a/src/pulsecore/modargs.c +++ b/src/pulsecore/modargs.c @@ -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; |