emu10k1: Front channels via fxbus 8 and 9

Routes front channels via fxbus 8 and 9 instead of fxbus 0 and 1. This
makes the front and default devices independent of each other, and
"Wave Surround", "Wave Center" and "Wave LFE" don't have to be muted
during 5.1 playback.

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 2596a59f6ec79193ed26e566bd3041eecfdb1b67..589c5d4a1176723d86129434044c0a37594af67f 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -9,9 +9,51 @@ EMU10K1.pcm.front.0 {
        @args.CARD {
                type string
        }
-       type hw
-       card $CARD
-       device 0
+       type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 0
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               interface PCM
+                               device 0
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 255 255 0 0 255 0 0 0 0 255 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 255 255 0 0 255 0 0 0 0 255 0 0 ]
+                       }
+                       {
+                               interface PCM
+                               device 0
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 8 9 0 0 8 9 0 0 8 9 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 8 9 0 0 8 9 0 0 8 9 0 0 ]
+                       }
+               ]
+       }
 }      
 
 <confdir:pcm/rear.conf>
@@ -30,13 +72,6 @@ EMU10K1.pcm.rear.0 {
        hooks.0 {
                type ctl_elems
                hook_args [
-                       {
-                               name "Wave Surround Playback Volume"
-                               preserve true
-                               # don't lock a global control
-                               # lock true
-                               value [ 0 0 ]
-                       }
                        {
                                interface PCM
                                device 0
@@ -74,18 +109,6 @@ EMU10K1.pcm.center_lfe.0 {
        hooks.0 {
                type ctl_elems
                hook_args [
-                       {
-                               name "Wave Center Playback Volume"
-                               preserve true
-                               # lock true
-                               value 0
-                       }
-                       {
-                               name "Wave LFE Playback Volume"
-                               preserve true
-                               # lock true
-                               value 0
-                       }
                        {
                                name "Headphone Center Playback Switch"
                                index 1