mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

redirect->refer

Browse source 
Removed the aliasing code (it was already in the search_alias function).
This commit is contained in:
Jaroslav Kysela 2001-06-14 09:47:44 +00:00
parent 2dd594a2f2
commit 1b8d405606
2 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/alsa.conf
View file

@ -155,7 +155,7 @@ pcm.surround40 {
default 0 default 0
} }
} }
redirect { refer {
filename { filename {
@func concat @func concat
strings [ strings [
@ -205,7 +205,7 @@ pcm.surround51 {
default 0 default 0
} }
} }
redirect { refer {
filename { filename {
@func concat @func concat
strings [ strings [
@ -275,7 +275,7 @@ pcm.iec958 {
# fs=48000Hz, clock accuracy=1000ppm # fs=48000Hz, clock accuracy=1000ppm
default 0x02 default 0x02
} }
redirect { refer {
filename { filename {
@func concat @func concat
strings [ strings [
@ -304,7 +304,7 @@ pcm.iec958 {
} }
} }
pcm.spdif "pcm.iec958" pcm.spdif iec958
# #
# Control interface # Control interface

19
src/pcm/pcm.c
View file

@ -1035,29 +1035,12 @@ static int snd_pcm_open_noupdate(snd_pcm_t **pcmp, snd_config_t *root,
return err; return err;
} }
} }
if (snd_config_get_type(pcm_conf) == SND_CONFIG_TYPE_STRING) {
snd_config_get_string(pcm_conf, (const char **)&key);
if (args == NULL)
return snd_pcm_open_noupdate(pcmp, root, key, stream, mode);
else {
char *nname;
nname = malloc(strlen(key) + 1 + strlen(args) + 1);
if (nname == NULL)
return -ENOMEM;
strcpy(nname, key);
strcat(nname, ":");
strcat(nname, args);
err = snd_pcm_open_noupdate(pcmp, root, nname, stream, mode);
free(nname);
return err;
}
}
err = snd_config_expand(pcm_conf, args, NULL, &pcm_conf); err = snd_config_expand(pcm_conf, args, NULL, &pcm_conf);
if (err < 0) { if (err < 0) {
SNDERR("Could not expand configuration: %s", snd_strerror(err)); SNDERR("Could not expand configuration: %s", snd_strerror(err));
return err; return err;
} }
if (snd_config_search(pcm_conf, "redirect", &conf) >= 0) { if (snd_config_search(pcm_conf, "refer", &conf) >= 0) {
snd_config_t *tmp_conf; snd_config_t *tmp_conf;
int conf_free_tmp; int conf_free_tmp;
char *redir_name = NULL; char *redir_name = NULL;