alsa-state: fix standard alsa dmix configuration, it now works out-of-the-box

diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index b9eb143..83a9ca6 100644 (file)
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -10,13 +10,13 @@ RRECOMMENDS_alsa-state = "alsa-states"
 RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"
 RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"
 PV = "0.1.0"
-PR = "r17"
+PR = "r18"
 
-SRC_URI = " \
-  file://asoundrc \
+SRC_URI = "\
+  file://asound.conf \
   file://asound.state \
-  file://alsa-state "
-
+  file://alsa-state \
+"
 
 inherit update-rc.d
 
@@ -32,8 +32,12 @@ do_install() {
 }
 
 PACKAGES += "alsa-states"
-FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
+
+FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf"
+CONFFILES_${PN} = "${sysconfdir}/asound.conf"
+
 FILES_alsa-states = "${sysconfdir}/*.state"
+
 PACKAGE_ARCH_${PN} = "all"
 PACKAGE_ARCH_alsa-states = "${MACHINE_ARCH}"
 
@@ -46,4 +50,3 @@ pkg_postinst_${PN}() {
                fi
        fi
 }
-

diff --git a/packages/alsa/alsa-state/asound.conf b/packages/alsa/alsa-state/asound.conf
new file mode 100644 (file)
index 0000000..6be0242
--- /dev/null
+++ b/packages/alsa/alsa-state/asound.conf
@@ -0,0 +1,12 @@
+# default dmix configuration
+
+pcm.!default {
+    type plug
+    slave.pcm "dmix"
+}
+
+ctl.mixer0 {
+    type hw
+    card 0
+}
+

diff --git a/packages/alsa/alsa-state/asoundrc b/packages/alsa/alsa-state/asoundrc
deleted file mode 100644 (file)
index bc038e3..0000000
--- a/packages/alsa/alsa-state/asoundrc
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# simple dmix configuration
-#
-pcm.dsp0 {
-    type plug
-    slave.pcm "dmix"
-}
-
-ctl.mixer0 {
-    type hw
-    card 0
-}