From 33d9449c71ebac8738b012241641b001fdef337d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 31 Jan 2005 11:51:36 +0000 Subject: [PATCH] Use dmix/dsnoop for default PCM Use dmix/dsnoop plugins for default PCM in most of mobo chips --- src/conf/cards/ATIIXP-SPDMA.conf | 23 +++++++++++++++++++++++ src/conf/cards/ATIIXP.conf | 23 +++++++++++++++++++++++ src/conf/cards/Azalia.conf | 14 ++++++-------- src/conf/cards/CMI8338-SWIEC.conf | 23 +++++++++++++++++++++++ src/conf/cards/CMI8338.conf | 23 +++++++++++++++++++++++ src/conf/cards/CMI8738-MC6.conf | 23 +++++++++++++++++++++++ src/conf/cards/CS46xx.conf | 24 ++++++++++++++++++++++++ src/conf/cards/ENS1370.conf | 23 +++++++++++++++++++++++ src/conf/cards/ENS1371.conf | 22 ++++++++++++++++++++++ src/conf/cards/FM801.conf | 23 +++++++++++++++++++++++ src/conf/cards/HDA-Intel.conf | 12 +++++------- src/conf/cards/ICH.conf | 12 +++++------- src/conf/cards/ICH4.conf | 12 +++++------- src/conf/cards/NFORCE.conf | 12 +++++------- src/conf/cards/VIA686A.conf | 23 +++++++++++++++++++++++ src/conf/cards/VIA8233.conf | 24 ++++++++++++++++++++++++ src/conf/cards/VIA8233A.conf | 23 +++++++++++++++++++++++ src/conf/cards/VIA8237.conf | 24 ++++++++++++++++++++++++ 18 files changed, 327 insertions(+), 36 deletions(-) diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf index 4b0de2f2..572023fc 100644 --- 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 ] + } + } +} + ATIIXP-SPDMA.pcm.surround40.0 { diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf index e3a2d3b3..5a8e49fc 100644 --- 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 ] + } + } +} + ATIIXP.pcm.surround40.0 { diff --git a/src/conf/cards/Azalia.conf b/src/conf/cards/Azalia.conf index bcfe7e35..a00ef4bd 100644 --- 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 d7ed2099..d054380a 100644 --- 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 ] + } + } +} + # 2nd DAC diff --git a/src/conf/cards/CMI8338.conf b/src/conf/cards/CMI8338.conf index 7b1d2555..f9d2b310 100644 --- 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 ] + } + } +} + # 2nd DAC diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf index f499574b..6cffaa8d 100644 --- 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 ] + } + } +} + # 2nd DAC diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf index 857f97c0..a02e356c 100644 --- 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 ] + } + } +} + CS46xx.pcm.rear.0 { diff --git a/src/conf/cards/ENS1370.conf b/src/conf/cards/ENS1370.conf index 7a803f63..79437ea8 100644 --- 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 ] + } + } +} + ENS1370.pcm.rear.0 { diff --git a/src/conf/cards/ENS1371.conf b/src/conf/cards/ENS1371.conf index 5c0de7d4..951b8e27 100644 --- 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 ] + } + } +} diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf index 8b0ba3e2..7207bf99 100644 --- 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 ] + } + } +} + 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 9329cec0..aeaaf073 100644 --- 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 d65583a9..04f11826 100644 --- 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 1edad586..ae951d92 100644 --- 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 89715b0f..923cc587 100644 --- 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 6d420dc5..f67b8765 100644 --- 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 ] + } + } +} + VIA686A.pcm.iec958.0 { diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf index cace9289..23cf4b7d 100644 --- 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 ] + } + } +} + VIA8233.pcm.surround40.0 { diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf index 05a99e1e..1103e5c4 100644 --- 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 ] + } + } +} + VIA8233A.pcm.surround40.0 { diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf index 158b85ea..74520055 100644 --- 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 ] + } + } +} + VIA8237.pcm.surround40.0 { -- 2.47.1