redirect->refer

Removed the aliasing code (it was already in the search_alias function).

diff --git a/src/alsa.conf b/src/alsa.conf
index 1f587e27d26df69304f5e364c9ed73edad291f2e..2f3845f8af39076a9b41055d1f3928f7352ebd13 100644 (file)
--- a/src/alsa.conf
+++ b/src/alsa.conf
@@ -155,7 +155,7 @@ pcm.surround40 {
                        default 0
                }
        }
-       redirect {
+       refer {
                filename {
                        @func concat
                        strings [
@@ -205,7 +205,7 @@ pcm.surround51 {
                        default 0
                }
        }
-       redirect {
+       refer {
                filename {
                        @func concat
                        strings [
@@ -275,7 +275,7 @@ pcm.iec958 {
                # fs=48000Hz, clock accuracy=1000ppm
                default 0x02
        }
-       redirect {
+       refer {
                filename {
                        @func concat
                        strings [
@@ -304,7 +304,7 @@ pcm.iec958 {
        }
 }
 
-pcm.spdif "pcm.iec958"
+pcm.spdif iec958
 
 #
 #  Control interface

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 0497d1120cba5b5cf39fb5352cd0d4fed6fef9e6..e28c1b0d688ecdc9562450a96ae852e832a4e5e3 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -1035,29 +1035,12 @@ static int snd_pcm_open_noupdate(snd_pcm_t **pcmp, snd_config_t *root,
                        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);
        if (err < 0) {
                SNDERR("Could not expand configuration: %s", snd_strerror(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;
                int conf_free_tmp;
                char *redir_name = NULL;