Use dmix/dsnoop for default PCM

Use dmix/dsnoop plugins for default PCM in most of mobo chips

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index 4b0de2f28f8719a48a28abe2bbe293e3a5c8a2d1..572023fc7f30a6f86d4ac589cf2e77aa14737ba2 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -14,6 +14,29 @@ ATIIXP-SPDMA.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+ATIIXP.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/surround40.conf>
 
 ATIIXP-SPDMA.pcm.surround40.0 {

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index e3a2d3b37dd7aa9168428e93ea8ebc0597749f9f..5a8e49fc8737697b6e9e3055e61f2583bb7f3155 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -14,6 +14,29 @@ ATIIXP.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+ATIIXP.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/surround40.conf>
 
 ATIIXP.pcm.surround40.0 {

diff --git a/src/conf/cards/Azalia.conf b/src/conf/cards/Azalia.conf
index bcfe7e351c3c1d92ba4b99af506368661a58c9a0..a00ef4bd03f93354d0e13c7594f305d8206b69d4 100644 (file)
--- a/src/conf/cards/Azalia.conf
+++ b/src/conf/cards/Azalia.conf
@@ -21,8 +21,8 @@ Azalia.pcm.front.0 {
        }
 }      
 
-# with dmix?
-Azalia.pcm.default {
+# default with dmix+softvol & dsnoop
+HDA-Intel.pcm.default {
        @args [ CARD ]
        @args.CARD {
                type integer
@@ -33,9 +33,8 @@ Azalia.pcm.default {
                slave.pcm {
                        type softvol
                        slave.pcm {
-                               type hw
-                               card $CARD
-                               device 0
+                               @func concat
+                               strings [ "dmix:" $CARD ]
                        }
                        control {
                                name "PCM Playback Volume"
@@ -46,9 +45,8 @@ Azalia.pcm.default {
        capture.pcm {
                type plug
                slave.pcm {
-                       type hw
-                       card $CARD
-                       device 0
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
                }
        }
 }

diff --git a/src/conf/cards/CMI8338-SWIEC.conf b/src/conf/cards/CMI8338-SWIEC.conf
index d7ed2099873c36da5924dbfd1aec4e2144c8f680..d054380aa05590603cd0c444372e6d33688561a4 100644 (file)
--- a/src/conf/cards/CMI8338-SWIEC.conf
+++ b/src/conf/cards/CMI8338-SWIEC.conf
@@ -15,6 +15,29 @@ CMI8338-SWIEC.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+CMI8338-SWIEC.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/rear.conf>
 
 # 2nd DAC

diff --git a/src/conf/cards/CMI8338.conf b/src/conf/cards/CMI8338.conf
index 7b1d25556b4a1f56447d91fb4e9c0b083ef2657b..f9d2b3106dd3714e33afe1f51a61b794051f1e7d 100644 (file)
--- a/src/conf/cards/CMI8338.conf
+++ b/src/conf/cards/CMI8338.conf
@@ -14,6 +14,29 @@ CMI8338.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+CMI8338.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/rear.conf>
 
 # 2nd DAC

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index f499574bf250dca8d40aca607e441d5796c912b2..6cffaa8dbed21155ab7d991408a65f8ea4d512c8 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -14,6 +14,29 @@ CMI8738-MC6.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+CMI8738-MC6.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/rear.conf>
 
 # 2nd DAC

diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf
index 857f97c02032372c310d97053032929de5a16768..a02e356c76364188897c5d899f78ccbced83222b 100644 (file)
--- a/src/conf/cards/CS46xx.conf
+++ b/src/conf/cards/CS46xx.conf
@@ -14,6 +14,30 @@ CS46xx.pcm.front.0 {
        device 0
 }      
 
+# default with plughw/dsnoop
+# CS46xx supports multi-playback
+CS46xx.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "hw:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/rear.conf>
 
 CS46xx.pcm.rear.0 {

diff --git a/src/conf/cards/ENS1370.conf b/src/conf/cards/ENS1370.conf
index 7a803f630145aa95a755556b9ddfb5c804197ecb..79437ea83cba804008d430a6b8b87b2b7385da2f 100644 (file)
--- a/src/conf/cards/ENS1370.conf
+++ b/src/conf/cards/ENS1370.conf
@@ -14,6 +14,29 @@ ENS1370.pcm.front.0 {
        device 1
 }      
 
+# default with dmix/dsnoop
+ENS1370.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/rear.conf>
 
 ENS1370.pcm.rear.0 {

diff --git a/src/conf/cards/ENS1371.conf b/src/conf/cards/ENS1371.conf
index 5c0de7d44ba5cc3f6761ba5a7c3250467a65a8e5..951b8e272aed2ba62d08ae1769a78cc65e281a56 100644 (file)
--- a/src/conf/cards/ENS1371.conf
+++ b/src/conf/cards/ENS1371.conf
@@ -14,6 +14,28 @@ ENS1371.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+ENS1371.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
 
 <confdir:pcm/rear.conf>
 

diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf
index 8b0ba3e2511e70153807cedcb1764bc381a98a34..7207bf99a2bfb07bd1e65d2e30cc0b06bb6cd934 100644 (file)
--- a/src/conf/cards/FM801.conf
+++ b/src/conf/cards/FM801.conf
@@ -14,6 +14,29 @@ FM801.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+FM801.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/surround40.conf>
 
 FM801.pcm.surround40.0 "cards.FM801.pcm.front.0"

diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf
index 9329cec0f93e48e0003f37c125b1ca651c7d0229..aeaaf0732dcbbf3dfe74ba098388172b8ae30696 100644 (file)
--- a/src/conf/cards/HDA-Intel.conf
+++ b/src/conf/cards/HDA-Intel.conf
@@ -21,7 +21,7 @@ HDA-Intel.pcm.front.0 {
        }
 }      
 
-# with dmix?
+# default with dmix+softvol & dsnoop
 HDA-Intel.pcm.default {
        @args [ CARD ]
        @args.CARD {
@@ -33,9 +33,8 @@ HDA-Intel.pcm.default {
                slave.pcm {
                        type softvol
                        slave.pcm {
-                               type hw
-                               card $CARD
-                               device 0
+                               @func concat
+                               strings [ "dmix:" $CARD ]
                        }
                        control {
                                name "PCM Playback Volume"
@@ -46,9 +45,8 @@ HDA-Intel.pcm.default {
        capture.pcm {
                type plug
                slave.pcm {
-                       type hw
-                       card $CARD
-                       device 0
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
                }
        }
 }

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index d65583a938442317a1917ed5fe3631ff90febd49..04f11826ae7b868239216352415014699c42ff05 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -21,7 +21,7 @@ ICH.pcm.front.0 {
        }
 }      
 
-# with dmix?
+# default with dmix+softvol & dsnoop
 ICH.pcm.default {
        @args [ CARD ]
        @args.CARD {
@@ -33,9 +33,8 @@ ICH.pcm.default {
                slave.pcm {
                        type softvol
                        slave.pcm {
-                               type hw
-                               card $CARD
-                               device 0
+                               @func concat
+                               strings [ "dmix:" $CARD ]
                        }
                        control {
                                name "PCM Playback Volume"
@@ -46,9 +45,8 @@ ICH.pcm.default {
        capture.pcm {
                type plug
                slave.pcm {
-                       type hw
-                       card $CARD
-                       device 0
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
                }
        }
 }

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index 1edad586207888be007511ed5ad458608498cfe7..ae951d924caa2848dfc603b254fdc17c125eade3 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -21,7 +21,7 @@ ICH4.pcm.front.0 {
        }
 }      
 
-# with dmix?
+# default with dmix+softvol & dsnoop
 ICH4.pcm.default {
        @args [ CARD ]
        @args.CARD {
@@ -33,9 +33,8 @@ ICH4.pcm.default {
                slave.pcm {
                        type softvol
                        slave.pcm {
-                               type hw
-                               card $CARD
-                               device 0
+                               @func concat
+                               strings [ "dmix:" $CARD ]
                        }
                        control {
                                name "PCM Playback Volume"
@@ -46,9 +45,8 @@ ICH4.pcm.default {
        capture.pcm {
                type plug
                slave.pcm {
-                       type hw
-                       card $CARD
-                       device 0
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
                }
        }
 }

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 89715b0ff201eb367058767dda6970212b5854e3..923cc5876feac38af7f9072197a8a2cfe4bfc473 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -21,7 +21,7 @@ NFORCE.pcm.front.0 {
        }
 }      
 
-# with dmix?
+# default with dmix+softvol & dsnoop
 NFORCE.pcm.default {
        @args [ CARD ]
        @args.CARD {
@@ -33,9 +33,8 @@ NFORCE.pcm.default {
                slave.pcm {
                        type softvol
                        slave.pcm {
-                               type hw
-                               card $CARD
-                               device 0
+                               @func concat
+                               strings [ "dmix:" $CARD ]
                        }
                        control {
                                name "PCM Playback Volume"
@@ -46,9 +45,8 @@ NFORCE.pcm.default {
        capture.pcm {
                type plug
                slave.pcm {
-                       type hw
-                       card $CARD
-                       device 0
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
                }
        }
 }

diff --git a/src/conf/cards/VIA686A.conf b/src/conf/cards/VIA686A.conf
index 6d420dc586326336124a949eaa1b5b83d390e62d..f67b876529757962cd3f60fab25627d21c70806f 100644 (file)
--- a/src/conf/cards/VIA686A.conf
+++ b/src/conf/cards/VIA686A.conf
@@ -17,6 +17,29 @@ VIA686A.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+VIA686A.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/iec958.conf>
 
 VIA686A.pcm.iec958.0 {

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index cace92897d640f37f46ca31b4132407ea4d5be2d..23cf4b7df89cb97873f731bdd0bfe9542f473cbc 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -14,6 +14,30 @@ VIA8233.pcm.front.0 {
        device 0
 }      
 
+# default with plughw/dsnoop
+# VIA8233 supports multi-playback
+VIA8233.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "hw:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/surround40.conf>
 
 VIA8233.pcm.surround40.0 {

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 05a99e1ec44cee63b53163f03627ca3224c6bb24..1103e5c45196020a5b04ef07e09210e5b7b7ed9a 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -14,6 +14,29 @@ VIA8233A.pcm.front.0 {
        device 0
 }      
 
+# default with dmix/dsnoop
+VIA8233A.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/surround40.conf>
 
 VIA8233A.pcm.surround40.0 {

diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index 158b85ea820f5a110bac17671d15b51e2ff0236e..74520055661aa69bb4a2fb50af05e1149fc8e684 100644 (file)
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -14,6 +14,30 @@ VIA8237.pcm.front.0 {
        device 0
 }      
 
+# default with plughw/dsnoop
+# VIA8237 supports multi-playback
+VIA8237.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "hw:" $CARD ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:" $CARD ]
+               }
+       }
+}
+
 <confdir:pcm/surround40.conf>
 
 VIA8237.pcm.surround40.0 {