From 1cf37d72c4e77fac55f2b1792bdcf12744a5a51a Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 19 Nov 2007 08:07:19 +0100
Subject: [PATCH] oxygen: enhance configuration

Remove the now superfluous softvol plugin from the CMI8788
configuration, use 24-bit samples for dmix, and add an alias for the
AV200 driver.
---
 src/conf/cards/CMI8788.conf | 17 ++++-------------
 src/conf/cards/aliases.conf |  1 +
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf
index f34e7cc4..e05da8f6 100644
--- a/src/conf/cards/CMI8788.conf
+++ b/src/conf/cards/CMI8788.conf
@@ -2,8 +2,6 @@
 # Configuration for the CMI8788 chip
 #
 
-# TODO: use 96 or 192 kHz for dmix?
-# TODO: remove softvol
 # TODO: add hooks for SPDIF mixer controls
 
 <confdir:pcm/front.conf>
@@ -24,7 +22,7 @@ CMI8788.pcm.front.0 {
 	}
 }	
 
-# default with dmix+softvol & dsnoop
+# default with dmix & dsnoop
 CMI8788.pcm.default {
 	@args [ CARD ]
 	@args.CARD {
@@ -34,22 +32,15 @@ CMI8788.pcm.default {
 	playback.pcm {
 		type plug
 		slave.pcm {
-			type softvol
-			slave.pcm {
-				@func concat
-				strings [ "dmix:" $CARD ]
-			}
-			control {
-				name "PCM Playback Volume"
-				card $CARD
-			}
+			@func concat
+			strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
 		}
 	}
 	capture.pcm {
 		type plug
 		slave.pcm {
 			@func concat
-			strings [ "dsnoop:" $CARD ]
+			strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
 		}
 	}
 }
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
index 7d4cd127..cd293124 100644
--- a/src/conf/cards/aliases.conf
+++ b/src/conf/cards/aliases.conf
@@ -49,6 +49,7 @@ Allegro cards.Maestro3
 Canyon3D-2 cards.Maestro3
 Azalia cards.HDA-Intel
 aaci-pl041 cards.AACI
+AV200 cards.CMI8788
 
 <confdir:pcm/default.conf>
 <confdir:pcm/dmix.conf>
-- 
2.47.1