changed the PCM routing for the recent redesign of the driver.

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index b047f8db972b996d87a14705f8fb9fae7d8f08d6..18f0549d90a4e9676def61de68bed8b5d17fa293 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -5,13 +5,35 @@
 <confdir:pcm/front.conf>
 
 Audigy.pcm.front.0 {
-       @args [ CARD  ]
+       @args [ CARD ]
        @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 [
+                       {
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               value [ 0 0 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
+                       }
+                                               {
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               value [ 0 1 2 3 0 0 0 0  8 9 0 1 0 0 0 0  8 9 0 1 0 0 0 0 ]
+                       }
+
+               ]
+       }
+
 }      
 
 <confdir:pcm/rear.conf>
@@ -30,12 +52,6 @@ Audigy.pcm.rear.0 {
        hooks.0 {
                type ctl_elems
                hook_args [
-                       {
-                               name "Wave Surround Playback Volume"
-                               preserve true
-                               lock true
-                               value [ 0 0 ]
-                       }
                        {
                                name "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }
@@ -62,18 +78,6 @@ Audigy.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 "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index d1631e483e655b0bfdf82938fd86c6d85a29eebc..858852175edc2157a058f8a61b038fdbe05ca13c 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -5,13 +5,35 @@
 <confdir:pcm/front.conf>
 
 Audigy2.pcm.front.0 {
-       @args [ CARD  ]
+       @args [ CARD ]
        @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 [
+                       {
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               value [ 0 0 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
+                       }
+                                               {
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               value [ 0 1 2 3 0 0 0 0  8 9 0 1 0 0 0 0  8 9 0 1 0 0 0 0 ]
+                       }
+
+               ]
+       }
+
 }      
 
 <confdir:pcm/rear.conf>
@@ -30,12 +52,6 @@ Audigy2.pcm.rear.0 {
        hooks.0 {
                type ctl_elems
                hook_args [
-                       {
-                               name "Wave Surround Playback Volume"
-                               preserve true
-                               lock true
-                               value [ 0 0 ]
-                       }
                        {
                                name "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }
@@ -62,18 +78,6 @@ Audigy2.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 "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }