]> git.alsa-project.org Git - alsa-lib.git/commitdiff
alsa-lib: add LaCie Firewire Speakers/Griffin FireWave Surround driver
authorClemens Ladisch <clemens@ladisch.de>
Tue, 15 Mar 2011 07:02:59 +0000 (08:02 +0100)
committerClemens Ladisch <clemens@ladisch.de>
Tue, 15 Mar 2011 07:02:59 +0000 (08:02 +0100)
Add configuration files for the "default"/"front"/"surround51" devices
of the FireWire driver.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
src/conf/cards/FWSpeakers.conf [new file with mode: 0644]
src/conf/cards/FireWave.conf [new file with mode: 0644]
src/conf/cards/Makefile.am

diff --git a/src/conf/cards/FWSpeakers.conf b/src/conf/cards/FWSpeakers.conf
new file mode 100644 (file)
index 0000000..cd6fa60
--- /dev/null
@@ -0,0 +1,26 @@
+#
+# Configuration for the LaCie Firewire speakers
+#
+
+FWSpeakers.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type plug
+       slave.pcm {
+               @func concat
+               strings [ "dmix:" $CARD ",FORMAT=S32" ]
+       }
+}
+
+<confdir:pcm/front.conf>
+
+FWSpeakers.pcm.front.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+}
diff --git a/src/conf/cards/FireWave.conf b/src/conf/cards/FireWave.conf
new file mode 100644 (file)
index 0000000..63fb23d
--- /dev/null
@@ -0,0 +1,50 @@
+#
+# Configuration for the Griffin FireWave Surround
+#
+
+FireWave.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type plug
+       slave.pcm {
+               @func concat
+               strings [ "dmix:" $CARD ",FORMAT=S32" ]
+       }
+}
+
+<confdir:pcm/front.conf>
+
+FireWave.pcm.front.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+}
+
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
+<confdir:pcm/surround51.conf>
+
+FireWave.pcm.surround51.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type route
+       ttable [
+               [ 1 0 0 0 0 0 ]
+               [ 0 1 0 0 0 0 ]
+               [ 0 0 0 0 1 0 ]
+               [ 0 0 0 0 0 1 ]
+               [ 0 0 1 0 0 0 ]
+               [ 0 0 0 1 0 0 ]
+       ]
+       slave.pcm {
+               type hw
+               card $CARD
+       }
+}
index 9da78f01a5a9c46cd0302fe53faa77c9129a70ad..b7190e7de2d89073ff46b6d054cbb29eb3f7c465 100644 (file)
@@ -25,6 +25,8 @@ cfg_files = aliases.conf \
        ENS1371.conf \
        ES1968.conf \
        FM801.conf \
+       FWSpeakers.conf \
+       FireWave.conf \
        GUS.conf \
        HDA-Intel.conf \
        ICE1712.conf \