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.

diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf
index f34e7cc428f8073a8176e1ea33014794b28926a0..e05da8f656a9542958cb229a50cf3d5795a4b804 100644 (file)
--- 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 7d4cd12720de5d13fff0ba87345a2267c08f5481..cd293124aff500b0adb0e919e4fc74c441000596 100644 (file)
--- 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>