From 54ec88bafbbae08edebdea2f79bfe213d1c6b9ed Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 13 Apr 2005 13:35:58 +0000 Subject: [PATCH] Use 'Channel Mode' control Use 'Channel Mode' control to set the 4/6 channel mode in the config hooks. --- src/conf/cards/ATIIXP-SPDMA.conf | 15 ++++-------- src/conf/cards/ATIIXP.conf | 15 ++++-------- src/conf/cards/ICH.conf | 15 ++++-------- src/conf/cards/ICH4.conf | 15 ++++-------- src/conf/cards/NFORCE.conf | 15 ++++-------- src/conf/cards/VIA8233.conf | 16 ++++--------- src/conf/cards/VIA8233A.conf | 15 ++++-------- src/conf/cards/VIA8237.conf | 40 +++++++++++++------------------- 8 files changed, 44 insertions(+), 102 deletions(-) diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf index eedac04a..24bf5048 100644 --- a/src/conf/cards/ATIIXP-SPDMA.conf +++ b/src/conf/cards/ATIIXP-SPDMA.conf @@ -54,9 +54,9 @@ ATIIXP-SPDMA.pcm.surround40.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true + value "4ch" lock true optional true } @@ -90,16 +90,9 @@ ATIIXP-SPDMA.pcm.surround51.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" - preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf index e4d5c8ad..57a168df 100644 --- a/src/conf/cards/ATIIXP.conf +++ b/src/conf/cards/ATIIXP.conf @@ -54,9 +54,9 @@ ATIIXP.pcm.surround40.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true + value "4ch" lock true optional true } @@ -90,16 +90,9 @@ ATIIXP.pcm.surround51.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" - preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" + name "Channel Mode" preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf index 553ce5e3..165605b8 100644 --- a/src/conf/cards/ICH.conf +++ b/src/conf/cards/ICH.conf @@ -70,9 +70,9 @@ ICH.pcm.surround40.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true + value "4ch" lock true optional true } @@ -121,16 +121,9 @@ ICH.pcm.surround51.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" - preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" + name "Channel Mode" preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf index eebe3aa1..4858614f 100644 --- a/src/conf/cards/ICH4.conf +++ b/src/conf/cards/ICH4.conf @@ -70,9 +70,9 @@ ICH4.pcm.surround40.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true + value "4ch" lock true optional true } @@ -113,16 +113,9 @@ ICH4.pcm.surround51.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" - preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" + name "Channel Mode" preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf index 89e54b44..138d8687 100644 --- a/src/conf/cards/NFORCE.conf +++ b/src/conf/cards/NFORCE.conf @@ -70,9 +70,9 @@ NFORCE.pcm.surround40.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true + value "4ch" lock true optional true } @@ -121,16 +121,9 @@ NFORCE.pcm.surround51.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" - preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" + name "Channel Mode" preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf index bdea52e2..4d3d5c0d 100644 --- a/src/conf/cards/VIA8233.conf +++ b/src/conf/cards/VIA8233.conf @@ -63,10 +63,10 @@ VIA8233.pcm.surround40.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" device 0 preserve true - value true + value "4ch" lock true optional true } @@ -101,18 +101,10 @@ VIA8233.pcm.surround51.0 { type ctl_elems hook_args [ { - name "Line-In As Surround" + name "Channel Mode" device 0 preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" - device 0 - preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf index 4f37a8ff..3b784356 100644 --- a/src/conf/cards/VIA8233A.conf +++ b/src/conf/cards/VIA8233A.conf @@ -62,9 +62,9 @@ VIA8233A.pcm.surround40.0 { optional true } { - name "Line-In As Surround" + name "Channel Mode" preserve true - value true + value "4ch" lock true optional true } @@ -106,16 +106,9 @@ VIA8233A.pcm.surround51.0 { optional true } { - name "Line-In As Surround" - preserve true - value true - lock true - optional true - } - { - name "Mic As Center/LFE" + name "Channel Mode" preserve true - value true + value "6ch" lock true optional true } diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf index 6dbc97b6..5f93570e 100644 --- a/src/conf/cards/VIA8237.conf +++ b/src/conf/cards/VIA8237.conf @@ -62,14 +62,14 @@ VIA8237.pcm.surround40.0 { hooks.0 { type ctl_elems hook_args [ -# { -# name "Line-In As Surround" -# device 0 -# preserve true -# value true -# lock true -# optional true -# } + { + name "Channel Mode" + device 0 + preserve true + value "4ch" + lock true + optional true + } { name "Surround Down Mix" device 0 @@ -108,22 +108,14 @@ VIA8237.pcm.surround51.0 { hooks.0 { type ctl_elems hook_args [ -# { -# name "Line-In As Surround" -# device 0 -# preserve true -# value true -# lock true -# optional true -# } -# { -# name "Mic As Center/LFE" -# device 0 -# preserve true -# value true -# lock true -# optional true -# } + { + name "Channel Mode" + device 0 + preserve true + value "6ch" + lock true + optional true + } { name "Surround Down Mix" device 0 -- 2.47.1