123 lines
2.5 KiB
Diff
123 lines
2.5 KiB
Diff
|
From 8650c02ae21b620fbe8d5e90bf5639e5a4a3f401 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Clemens Ladisch <clemens@ladisch.de>
|
||
|
|
Date: Tue, 15 Mar 2011 08:02:59 +0100
|
||
|
|
Subject: [PATCH 02/23] alsa-lib: add LaCie Firewire Speakers/Griffin FireWave
|
||
|
|
Surround driver
|
||
|
|
|
||
|
|
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 | 26 ++++++++++++++++++++
|
||
|
|
src/conf/cards/FireWave.conf | 50 ++++++++++++++++++++++++++++++++++++++++
|
||
|
|
src/conf/cards/Makefile.am | 2 +
|
||
|
|
3 files changed, 78 insertions(+), 0 deletions(-)
|
||
|
|
create mode 100644 src/conf/cards/FWSpeakers.conf
|
||
|
|
create mode 100644 src/conf/cards/FireWave.conf
|
||
|
|
|
||
|
|
diff --git a/src/conf/cards/FWSpeakers.conf b/src/conf/cards/FWSpeakers.conf
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..cd6fa60
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/src/conf/cards/FWSpeakers.conf
|
||
|
|
@@ -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
|
||
|
|
index 0000000..63fb23d
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/src/conf/cards/FireWave.conf
|
||
|
|
@@ -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
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
|
||
|
|
index 9da78f0..b7190e7 100644
|
||
|
|
--- a/src/conf/cards/Makefile.am
|
||
|
|
+++ b/src/conf/cards/Makefile.am
|
||
|
|
@@ -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 \
|
||
|
|
--
|
||
|
|
1.7.5.3
|
||
|
|
|