Added surround41 and surround50 definitions

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index 0b1642a65613926b7904e34e78ac15b92c528f03..4d74230869f331904e3a1ef0c3dd1fcf87ccbefd 100644 (file)
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -61,6 +61,10 @@ defaults.pcm.center_lfe.card defaults.pcm.card
 defaults.pcm.center_lfe.device defaults.pcm.device
 defaults.pcm.surround40.card defaults.pcm.card
 defaults.pcm.surround40.device defaults.pcm.device
+defaults.pcm.surround41.card defaults.pcm.card
+defaults.pcm.surround41.device defaults.pcm.device
+defaults.pcm.surround50.card defaults.pcm.card
+defaults.pcm.surround50.device defaults.pcm.device
 defaults.pcm.surround51.card defaults.pcm.card
 defaults.pcm.surround51.device defaults.pcm.device
 defaults.pcm.iec958.card defaults.pcm.card
@@ -313,6 +317,8 @@ pcm.front cards.pcm.front
 pcm.rear cards.pcm.rear
 pcm.center_lfe cards.pcm.center_lfe
 pcm.surround40 cards.pcm.surround40
+pcm.surround41 cards.pcm.surround41
+pcm.surround50 cards.pcm.surround50
 pcm.surround51 cards.pcm.surround51
 pcm.iec958 cards.pcm.iec958
 pcm.spdif cards.pcm.iec958

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index e0f73c4ce315d07767a6d1b7d2219b210055716b..8d1e4f3f2744145061f2164cc7bab97edeed3e90 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -126,6 +126,8 @@ Audigy.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 Audigy.pcm.surround51.0 {

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index dfe00de53fdae5564c58739e5012eb6cf176a288..34413d6c3ba4c2880c7cfd22b080602667354974 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -55,6 +55,8 @@ CMI8738-MC6.pcm.surround40.0 {
 }      
 
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0"

diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf
index 4dc4370f7dafb5d9df78b280cec221f9b79fab73..d09834e390437e1c40261439289f003cc3b7d6eb 100644 (file)
--- a/src/conf/cards/CS46xx.conf
+++ b/src/conf/cards/CS46xx.conf
@@ -74,6 +74,8 @@ CS46xx.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 CS46xx.pcm.surround51.0 {

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 517a0e0485ee5500c026d9fbddbea16775292bb6..5012080fff98995f628476fa5be75226d8755ac7 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -146,6 +146,8 @@ EMU10K1.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 EMU10K1.pcm.surround51.0 {

diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf
index 47299c1c8b2e986bc74a48152962366a706a83d2..8b0ba3e2511e70153807cedcb1764bc381a98a34 100644 (file)
--- a/src/conf/cards/FM801.conf
+++ b/src/conf/cards/FM801.conf
@@ -18,6 +18,8 @@ FM801.pcm.front.0 {
 
 FM801.pcm.surround40.0 "cards.FM801.pcm.front.0"
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 FM801.pcm.surround51.0 "cards.FM801.pcm.front.0"

diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf
index 9b23d25c90904e9177bc7257ba2e0be19a419d1c..c984a857f9d0f0d61da64eb708900e10e594708c 100644 (file)
--- a/src/conf/cards/ICE1712.conf
+++ b/src/conf/cards/ICE1712.conf
@@ -36,6 +36,8 @@ ICE1712.pcm.surround40.0 {
        }
 }      
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 ICE1712.pcm.surround51.0 {

diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf
index b1fd42a8518b75228e066760b00adce9d8f46b33..2dd8bb5cf367e495a77470ffdbaf7874fb93c6dc 100644 (file)
--- a/src/conf/cards/ICE1724.conf
+++ b/src/conf/cards/ICE1724.conf
@@ -36,6 +36,8 @@ ICE1724.pcm.surround40.0 {
        }
 }      
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 ICE1724.pcm.surround51.0 {

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 0a8d4b1562e41d28074904991af3013fa39c83ee..ee6aaf5e08b40f251c3ae43aab202c73dfadf42a 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -18,6 +18,8 @@ ICH.pcm.front.0 {
 
 ICH.pcm.surround40.0 "cards.ICH.pcm.front.0"
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 ICH.pcm.surround51.0 {

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 5d8953688704bd247e58aca66acc8196a0898854..7413a9d9b810aef7606c3fa5696a315cc3fb7525 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -18,6 +18,8 @@ NFORCE.pcm.front.0 {
 
 NFORCE.pcm.surround40.0 "cards.NFORCE.pcm.front.0"
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 NFORCE.pcm.surround51.0 {

diff --git a/src/conf/cards/SI7018.conf b/src/conf/cards/SI7018.conf
index 4b5d6ebdcb7b4d76d606c6e5ec07c63e00ede028..ace72d0f5c05851e0cfdaaddcdd0fa3bdae05172 100644 (file)
--- a/src/conf/cards/SI7018.conf
+++ b/src/conf/cards/SI7018.conf
@@ -78,6 +78,55 @@ SI7018.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
+<confdir:pcm/surround51.conf>
+
+SI7018.pcm.surround51.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type multi
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "cards.SI7018.pcm.front.0:CARD=" $CARD
+                               ]
+                       }
+                       channels 2
+               }
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "cards.SI7018.pcm.rear.0:CARD=" $CARD
+                               ]
+                       }
+                       channels 2
+               }
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "cards.SI7018.pcm.front.0:CARD=" $CARD
+                               ]
+                       }
+                       channels 2
+               }
+       ]
+       bindings [
+               { slave 0 channel 0 }
+               { slave 0 channel 1 }
+               { slave 1 channel 0 }
+               { slave 1 channel 1 }
+               { slave 2 channel 0 }
+               { slave 2 channel 1 }
+       ]
+}
+
 <confdir:pcm/iec958.conf>
 
 SI7018.pcm.iec958.0 {

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index 8e0350bfff1033a6fc24d8ad0fbab5a51e3eb136..9eb84886015eb92cf5d3140b96b378d2a0c292d1 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -26,6 +26,8 @@ VIA8233.pcm.surround40.0 {
        device 1
 }
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 VIA8233.pcm.surround51.0 "cards.VIA8233.pcm.surround40.0"

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 6db7bd686d60fadd88b6068c61c6fc5462b01c48..f4dfe87dd464300a03cab0237ff9aa22624706eb 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -42,6 +42,8 @@ VIA8233A.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
 VIA8233A.pcm.surround51.0 {

diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am
index 3bbcbbd5e4f58b1dcae861d14dc5816f4a107a4f..04910f7bff6484cfc7f438937d07030652915105 100644 (file)
--- a/src/conf/pcm/Makefile.am
+++ b/src/conf/pcm/Makefile.am
@@ -1,5 +1,7 @@
-cfg_files = front.conf rear.conf center_lfe.conf surround40.conf \
-           surround51.conf iec958.conf
+cfg_files = front.conf rear.conf center_lfe.conf \
+           surround40.conf surround41.conf \
+           surround50.conf surround51.conf \
+           iec958.conf
 
 EXTRA_DIST = $(cfg_files)
 

diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
new file mode 100644 (file)
index 0000000..9e504fe
--- /dev/null
+++ b/src/conf/pcm/surround41.conf
@@ -0,0 +1,62 @@
+#
+#  Hardware output from 4.1 speakers.
+#  Samples must be positioned:
+#    chn0 - front left
+#    chn1 - front right
+#    chn2 - rear left
+#    chn3 - rear right
+#    chn4 - LFE
+#
+
+pcm.!surround41 {
+       @args [ CARD DEV ]
+       @args.CARD {
+               type string
+               default {
+                       @func getenv
+                       vars [
+                               ALSA_SURROUND41_CARD
+                               ALSA_PCM_CARD
+                               ALSA_CARD
+                       ]
+                       default {
+                               @func refer
+                               name defaults.pcm.surround41.card
+                       }
+               }
+       }
+       @args.DEV {
+               type integer
+               default {
+                       @func igetenv
+                       vars [
+                               ALSA_SURROUND41_DEVICE
+                       ]
+                       default {
+                               @func refer
+                               name defaults.pcm.surround41.device
+                       }
+               }
+       }
+       type route
+       slave.pcm {
+               @func refer
+               name {
+                       @func concat
+                       strings [
+                               "cards."
+                               {
+                                       @func card_driver
+                                       card $CARD
+                               }
+                               ".pcm.surround51." $DEV ":CARD=" $CARD
+                       ]
+               }
+       }
+       slave.channels 6
+       ttable.0.0 1
+       ttable.1.1 1
+       ttable.2.2 1
+       ttable.3.3 1
+       ttable.4.5 1
+}

diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
new file mode 100644 (file)
index 0000000..7e658ec
--- /dev/null
+++ b/src/conf/pcm/surround50.conf
@@ -0,0 +1,62 @@
+#
+#  Hardware output from 5.0 speakers.
+#  Samples must be positioned:
+#    chn0 - front left
+#    chn1 - front right
+#    chn2 - rear left
+#    chn3 - rear right
+#    chn4 - center
+#
+
+pcm.!surround50 {
+       @args [ CARD DEV ]
+       @args.CARD {
+               type string
+               default {
+                       @func getenv
+                       vars [
+                               ALSA_SURROUND50_CARD
+                               ALSA_PCM_CARD
+                               ALSA_CARD
+                       ]
+                       default {
+                               @func refer
+                               name defaults.pcm.surround50.card
+                       }
+               }
+       }
+       @args.DEV {
+               type integer
+               default {
+                       @func igetenv
+                       vars [
+                               ALSA_SURROUND50_DEVICE
+                       ]
+                       default {
+                               @func refer
+                               name defaults.pcm.surround50.device
+                       }
+               }
+       }
+       type route
+       slave.pcm {
+               @func refer
+               name {
+                       @func concat
+                       strings [
+                               "cards."
+                               {
+                                       @func card_driver
+                                       card $CARD
+                               }
+                               ".pcm.surround51." $DEV ":CARD=" $CARD
+                       ]
+               }
+       }
+       slave.channels 6
+       ttable.0.0 1
+       ttable.1.1 1
+       ttable.2.2 1
+       ttable.3.3 1
+       ttable.4.4 1
+}