adjust control references in config files

Adjust the hooked control definitions for the changed interface of
"EMU10K1 PCM Send Volume" and "EMU10K1 PCM Send Routing" controls.

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index aee0c1a6abc177d19a7294237557d6d48c60bfa9..8d79fe735a90c04c0edf057742aa2ea9e36137bb 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -19,15 +19,37 @@ Audigy.pcm.front.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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 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 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0 ]
                        }
 
@@ -53,9 +75,20 @@ Audigy.pcm.rear.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 [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
                                value [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
                        }
                ]
@@ -79,15 +112,37 @@ Audigy.pcm.center_lfe.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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
+                       }
+                       {
+                               interface PCM
+                               device 0
                                name "EMU10K1 PCM Send Routing"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
+                               value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
                                value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
                        }
                ]
@@ -221,15 +276,37 @@ Audigy.pcm.iec958.0 {
                                value [ 1 1 ]
                        }
                        {
+                               interface PCM
+                               device 0
                                name "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
+                       }
+                       {
+                               interface PCM
+                               device 0
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
                                name "EMU10K1 PCM Send Routing"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
                                value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
                        }
                        {

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index a569d1d9de55870853fa1f31c85224c8ea592ebf..1f872674490f265187248ec9d653fa58624c242c 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -19,15 +19,37 @@ Audigy2.pcm.front.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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 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 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0 ]
                        }
 
@@ -53,9 +75,20 @@ Audigy2.pcm.rear.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 [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
                                name "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
                                value [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
                        }
                ]
@@ -79,15 +112,37 @@ Audigy2.pcm.center_lfe.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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
                        {
+                               interface PCM
+                               device 0
                                name "EMU10K1 PCM Send Routing"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
+                               value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
                                value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
                        }
                ]
@@ -111,15 +166,37 @@ Audigy2.pcm.side.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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
                        {
+                               interface PCM
+                               device 0
                                name "EMU10K1 PCM Send Routing"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
+                               value [ 14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
                                value [ 14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0 ]
                        }
                ]
@@ -310,15 +387,37 @@ Audigy2.pcm.iec958.0 {
                                value [ 1 1 ]
                        }
                        {
+                               interface PCM
+                               device 0
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 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 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
                        {
+                               interface PCM
+                               device 0
+                               name "EMU10K1 PCM Send Routing"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
+                               value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
                                name "EMU10K1 PCM Send Routing"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
                                value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
                        }
                        {

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 8dd9e17740fc5bb4dedd8dac060732e32a5353b4..8338009a0c0f8fa7486d9ae77194732b4e86dcd4 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -38,9 +38,20 @@ EMU10K1.pcm.rear.0 {
                                value [ 0 0 ]
                        }
                        {
+                               interface PCM
+                               device 0
                                name "EMU10K1 PCM Send Volume"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
+                               value [ 0 0 255 255 0 0 255 0 0 0 0 255 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "EMU10K1 PCM Send Volume"
+                               index { @func private_pcm_subdevice }
+                               lock true
+                               optional true
                                value [ 0 0 255 255 0 0 255 0 0 0 0 255 ]
                        }
                ]
@@ -100,15 +111,37 @@ EMU10K1.pcm.center_lfe.0 {
 #                              value 0
 #                      }
                        {
+                               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 [ 6 7 0 0 6 7 0 0 6 7 0 0 ]
+                       }
+                       {
+                               # for compatibility with older drivers
                                name "EMU10K1 PCM Send Routing"
                                index { @func private_pcm_subdevice }
                                lock true
+                               optional true
                                value [ 6 7 0 0 6 7 0 0 6 7 0 0 ]
                        }
                ]