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

alsa: New modarg "paths_dir" for module-alsa-card

Browse source 
The new module argument can be used to provide a custom
directory for loading alsa path configuration files. This is
useful for testing: no need to be root to create test
configuration files.
This commit is contained in:
Tanu Kaskinen 2011-10-06 23:09:15 +03:00 • committed by Arun Raghavan
parent ca6057316d
commit a88b1d5cd4
5 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/alsa/alsa-source.c
View file

@ -90,6 +90,7 @@ struct userdata {
snd_pcm_t *pcm_handle;
char *paths_dir;
pa_alsa_fdlist *mixer_fdl;
pa_alsa_mixer_pdata *mixer_pd;
snd_mixer_t *mixer_handle;
@ -1563,7 +1564,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char
pa_alsa_path_dump(u->mixer_path);
} else {
if (!(u->mixer_path_set = pa_alsa_path_set_new(mapping, PA_ALSA_DIRECTION_INPUT)))
if (!(u->mixer_path_set = pa_alsa_path_set_new(mapping, PA_ALSA_DIRECTION_INPUT, u->paths_dir)))
goto fail;
pa_alsa_path_set_probe(u->mixer_path_set, u->mixer_handle, ignore_dB);
@ -1761,6 +1762,8 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
ma, "device_id",
pa_modargs_get_value(ma, "device", DEFAULT_DEVICE));
u->paths_dir = pa_xstrdup(pa_modargs_get_value(ma, "paths_dir", NULL));
if (reserve_init(u, dev_id) < 0)
goto fail;
@ -2041,6 +2044,7 @@ static void userdata_free(struct userdata *u) {
pa_xfree(u->device_name);
pa_xfree(u->control_device);
pa_xfree(u->paths_dir);
pa_xfree(u);
}