Make dsnoop card-specific

Make dsnoop card-specific.  Its definition is moved to pcm/dsnoop.conf.

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index b6294d96202f6ac79f73da0387b3b5830e050cf9..9f67d3c8e8df6ebec64832148a3e81962adf9cdb 100644 (file)
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -186,30 +186,6 @@ pcm.plug {
        slave.pcm $SLAVE
 }
 
-pcm.dsnoop {
-       @args [ SLAVE FORMAT RATE ]
-       @args.SLAVE {
-               type string
-               default "hw:0,0"
-       }
-       @args.FORMAT {
-               type string
-               default S16_LE
-       }
-       @args.RATE {
-               type integer
-               default 48000
-       }
-       type dsnoop
-       ipc_key 5778293
-       ipc_key_add_uid yes
-       slave {
-               pcm $SLAVE
-               format $FORMAT
-               rate $RATE
-       }
-}
-
 pcm.shm {
        @args [ SOCKET PCM ]
        @args.SOCKET {
@@ -278,6 +254,7 @@ pcm.modem cards.pcm.modem
 
 pcm.default cards.pcm.default
 pcm.dmix cards.pcm.dmix
+pcm.dsnoop cards.pcm.dsnoop
 
 #
 #  Control interface

diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
index 2ebffcc3bbcf36c589e2b35970cbcf08889c0101..42c7add022d64007cbcdbe5246ca4b4321333a2d 100644 (file)
--- a/src/conf/cards/aliases.conf
+++ b/src/conf/cards/aliases.conf
@@ -46,3 +46,4 @@ Canyon3D-2 cards.Maestro3
 
 <confdir:pcm/default.conf>
 <confdir:pcm/dmix.conf>
+<confdir:pcm/dsnoop.conf>

diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am
index d0d43a59ae4c3a55d14b8dce70c2fa09363f2eb3..de5959fe091bdec87603453fc69f4b55202bf2b9 100644 (file)
--- a/src/conf/pcm/Makefile.am
+++ b/src/conf/pcm/Makefile.am
@@ -2,7 +2,7 @@ cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\
            surround40.conf surround41.conf \
            surround50.conf surround51.conf \
            surround71.conf iec958.conf modem.conf \
-           dmix.conf
+           dmix.conf dsnoop.conf
 
 EXTRA_DIST = $(cfg_files)
 

diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
new file mode 100644 (file)
index 0000000..d34e6f3
--- /dev/null
+++ b/src/conf/pcm/dsnoop.conf
@@ -0,0 +1,85 @@
+#
+# dsnoop
+#
+
+pcm.!dsnoop {
+       @args [ CARD DEV SUBDEV FORMAT RATE ]
+       @args.CARD {
+               type string
+               default 0
+       }
+       @args.DEV {
+               type string
+               default 0
+       }
+       @args.SUBDEV {
+               type string
+               default -1
+       }
+       @args.FORMAT {
+               type string
+               default S16_LE
+       }
+       @args.RATE {
+               type integer
+               default 48000
+       }
+       type dsnoop
+       ipc_key 5778293
+       ipc_key_add_uid yes
+       slave {
+               pcm {
+                       type hw
+                       card $CARD
+                       device $DEV
+                       subdevice $SUBDEV
+               }
+               format $FORMAT
+               rate $RATE
+               period_size {
+                       @func refer
+                       name {
+                               @func concat
+                               strings [
+                                       "cards."
+                                       {
+                                               @func card_driver
+                                               card $CARD
+                                       }
+                                       ".pcm.dsnoop.period_size"
+                               ]
+                       }
+                       default 1024
+               }               
+               period_time {
+                       @func refer
+                       name {
+                               @func concat
+                               strings [
+                                       "cards."
+                                       {
+                                               @func card_driver
+                                               card $CARD
+                                       }
+                                       ".pcm.dsnoop.period_time"
+                               ]
+                       }
+                       default -1
+               }               
+               periods {
+                       @func refer
+                       name {
+                               @func concat
+                               strings [
+                                       "cards."
+                                       {
+                                               @func card_driver
+                                               card $CARD
+                                       }
+                                       ".pcm.dsnoop.periods"
+                               ]
+                       }
+                       default 16
+               }
+       }
+}