summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-08-11 23:18:01 +0200
committerLennart Poettering <lennart@poettering.net>2009-08-11 23:18:01 +0200
commitc117febbe4a92864a7214da2dd8a5c9dae432925 (patch)
tree189365947a7ec714d2d53bf9c8f065c1c6b4c597
parentc1039c94fbae193aad149339124e8e62f0233eaa (diff)
hal: replace subdevs= parameter by subdevices= parameter
Abbreviating tsched like this was bad enough, so let's not add another option here.
-rw-r--r--src/modules/module-hal-detect.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c
index b5b2aaf0..ec370d61 100644
--- a/src/modules/module-hal-detect.c
+++ b/src/modules/module-hal-detect.c
@@ -58,13 +58,13 @@ PA_MODULE_LOAD_ONCE(TRUE);
#if defined(HAVE_ALSA) && defined(HAVE_OSS_OUTPUT)
PA_MODULE_USAGE("api=<alsa or oss> "
"tsched=<enable system timer based scheduling mode?>"
- "subdevs=<init all subdevices>");
+ "subdevices=<init all subdevices>");
#elif defined(HAVE_ALSA)
PA_MODULE_USAGE("api=<alsa> "
"tsched=<enable system timer based scheduling mode?>");
#elif defined(HAVE_OSS_OUTPUT)
PA_MODULE_USAGE("api=<oss>"
- "subdevs=<init all subdevices>");
+ "subdevices=<init all subdevices>");
#endif
PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-hal-detect!");
@@ -98,7 +98,7 @@ static const char* const valid_modargs[] = {
"tsched",
#endif
#ifdef HAVE_OSS_OUTPUT
- "subdevs",
+ "subdevices",
#endif
NULL
};
@@ -772,8 +772,8 @@ int pa__init(pa_module*m) {
}
#ifdef HAVE_OSS_OUTPUT
- if (pa_modargs_get_value_boolean(ma, "subdevs", &u->init_subdevs) < 0) {
- pa_log("Failed to parse subdevs argument.");
+ if (pa_modargs_get_value_boolean(ma, "subdevices", &u->init_subdevs) < 0) {
+ pa_log("Failed to parse subdevices= argument.");
goto fail;
}
#endif