Add chmap override definitions for Emu10k1, Audigy and Audigy2 cards

These cards won't provide the channel maps from the driver itself
because of the dynamic routing.  For simplicity, define chmaps in the
configurations, so that chmap querying of individual stereo streams
and combined multi streams works properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index ea1e53dae4cfa087704d66b7a6aa8bc3a4bbee41..e008b6789a6788cf850b277519531b05adf2f58e 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -13,6 +13,7 @@ Audigy.pcm.front.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "FL,FR"
        }
        hooks.0 {
                type ctl_elems
@@ -65,6 +66,7 @@ Audigy.pcm.rear.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "RL,RR"
        }
        hooks.0 {
                type ctl_elems
@@ -100,6 +102,7 @@ Audigy.pcm.center_lfe.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "FC,LFE"
        }
        hooks.0 {
                type ctl_elems

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index 0290f6f8c23d7ae8cd282e28e366aa297df6357a..e34fadcfac1811ae50cc351801a7d7e532d69181 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -13,6 +13,7 @@ Audigy2.pcm.front.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "FL,FR"
        }
        hooks.0 {
                type ctl_elems
@@ -65,6 +66,7 @@ Audigy2.pcm.rear.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "RL,RR"
        }
        hooks.0 {
                type ctl_elems
@@ -100,6 +102,7 @@ Audigy2.pcm.center_lfe.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "FC,LFE"
        }
        hooks.0 {
                type ctl_elems
@@ -151,6 +154,7 @@ Audigy2.pcm.side.0 {
        slave.pcm {
                type hw
                card $CARD
+               chmap "SL,SR"
        }
        hooks.0 {
                type ctl_elems

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 706da0ad382b9cedb432ad4c7fe9d1ced7f93f03..02a732fb8234de65d896319dc6ed548fa4744a9f 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -15,6 +15,7 @@ EMU10K1.pcm.front.0 {
                slave.pcm {
                        type hw
                        card $CARD
+                       chmap "FL,FR"
                }
                hooks.0 {
                        type ctl_elems
@@ -73,6 +74,7 @@ EMU10K1.pcm.rear.0 {
                slave.pcm {
                        type hw
                        card $CARD
+                       chmap "RL,RR"
                }
                hooks.0 {
                        type ctl_elems
@@ -111,6 +113,7 @@ EMU10K1.pcm.center_lfe.0 {
                slave.pcm {
                        type hw
                        card $CARD
+                       chmap "FC,LFE"
                }
                hooks.0 {
                        type ctl_elems