[SVN-Commit] r1462 - trunk/audio/alsa-lib/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Dec 19 15:33:36 2013
New Revision: 1462

Log:
(cosmetic) use shorter syntax and move after pulse

Modified:
   trunk/audio/alsa-lib/files/asound.conf.sample

Modified: trunk/audio/alsa-lib/files/asound.conf.sample
==============================================================================
--- trunk/audio/alsa-lib/files/asound.conf.sample	Thu Dec 19 15:33:28 2013	(r1461)
+++ trunk/audio/alsa-lib/files/asound.conf.sample	Thu Dec 19 15:33:36 2013	(r1462)
@@ -1,13 +1,9 @@
 #
 # FreeBSD/OSS
 #
-pcm_slave.oss {
-	pcm.type oss
-}
-
 pcm.!default {
 	type plug
-	slave oss
+	slave.pcm.type oss
 }
 
 ctl.!default {
@@ -15,54 +11,6 @@
 }
 
 #
-# Remap all possible surround stuffs.
-#
-pcm.!front {
-	type plug
-	slave oss
-}
-
-pcm.!rear {
-	type plug
-	slave oss
-}
-
-pcm.!center_lfe {
-	type plug
-	slave oss
-}
-
-pcm.!side {
-	type plug
-	slave oss
-}
-
-pcm.!surround40 {
-	type plug
-	slave oss
-}
-
-pcm.!surround41 {
-	type plug
-	slave oss
-}
-
-pcm.!surround50 {
-	type plug
-	slave oss
-}
-
-pcm.!surround51 {
-	type plug
-	slave oss
-}
-
-pcm.!surround71 {
-	type plug
-	slave oss
-}
-
-#
 # Pulseaudio
 #
 # pcm.!default {
@@ -72,3 +20,16 @@
 # ctl.!default {
 # 	type pulse
 # }
+
+#
+# Remap all possible surround stuffs.
+#
+pcm.!front pcm.default
+pcm.!rear pcm.default
+pcm.!center_lfe pcm.default
+pcm.!side pcm.default
+pcm.!surround40 pcm.default
+pcm.!surround41 pcm.default
+pcm.!surround50 pcm.default
+pcm.!surround51 pcm.default
+pcm.!surround71 pcm.default