mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	hal: replace subdevs= parameter by subdevices= parameter
Abbreviating tsched like this was bad enough, so let's not add another option here.
This commit is contained in:
		
							parent
							
								
									c1039c94fb
								
							
						
					
					
						commit
						c117febbe4
					
				
					 1 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
					@ -58,13 +58,13 @@ PA_MODULE_LOAD_ONCE(TRUE);
 | 
				
			||||||
#if defined(HAVE_ALSA) && defined(HAVE_OSS_OUTPUT)
 | 
					#if defined(HAVE_ALSA) && defined(HAVE_OSS_OUTPUT)
 | 
				
			||||||
PA_MODULE_USAGE("api=<alsa or oss> "
 | 
					PA_MODULE_USAGE("api=<alsa or oss> "
 | 
				
			||||||
                "tsched=<enable system timer based scheduling mode?>"
 | 
					                "tsched=<enable system timer based scheduling mode?>"
 | 
				
			||||||
                "subdevs=<init all subdevices>");
 | 
					                "subdevices=<init all subdevices>");
 | 
				
			||||||
#elif defined(HAVE_ALSA)
 | 
					#elif defined(HAVE_ALSA)
 | 
				
			||||||
PA_MODULE_USAGE("api=<alsa> "
 | 
					PA_MODULE_USAGE("api=<alsa> "
 | 
				
			||||||
                "tsched=<enable system timer based scheduling mode?>");
 | 
					                "tsched=<enable system timer based scheduling mode?>");
 | 
				
			||||||
#elif defined(HAVE_OSS_OUTPUT)
 | 
					#elif defined(HAVE_OSS_OUTPUT)
 | 
				
			||||||
PA_MODULE_USAGE("api=<oss>"
 | 
					PA_MODULE_USAGE("api=<oss>"
 | 
				
			||||||
                "subdevs=<init all subdevices>");
 | 
					                "subdevices=<init all subdevices>");
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-hal-detect!");
 | 
					PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-hal-detect!");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,7 +98,7 @@ static const char* const valid_modargs[] = {
 | 
				
			||||||
    "tsched",
 | 
					    "tsched",
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#ifdef HAVE_OSS_OUTPUT
 | 
					#ifdef HAVE_OSS_OUTPUT
 | 
				
			||||||
    "subdevs",
 | 
					    "subdevices",
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
    NULL
 | 
					    NULL
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -772,8 +772,8 @@ int pa__init(pa_module*m) {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef HAVE_OSS_OUTPUT
 | 
					#ifdef HAVE_OSS_OUTPUT
 | 
				
			||||||
    if (pa_modargs_get_value_boolean(ma, "subdevs", &u->init_subdevs) < 0) {
 | 
					    if (pa_modargs_get_value_boolean(ma, "subdevices", &u->init_subdevs) < 0) {
 | 
				
			||||||
        pa_log("Failed to parse subdevs argument.");
 | 
					        pa_log("Failed to parse subdevices= argument.");
 | 
				
			||||||
        goto fail;
 | 
					        goto fail;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue