[oe-commits] org.oe.dev alsa-state: fix standard alsa dmix configuration, it now works out-of-the-box

[mickeyl commit]

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

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 66e7b7f5ea1279378fa8062905f8d4af01d22ccf
ViewMTN: http://monotone.openembedded.org/revision/info/66e7b7f5ea1279378fa8062905f8d4af01d22ccf
Files:
1
packages/alsa/alsa-state/asoundrc
packages/alsa/alsa-state/asound.conf
packages/alsa/alsa-state.bb
Diffs:

#
# mt diff -r293ba2b23413c1a95a37ed91260b797731ab7e5c -r66e7b7f5ea1279378fa8062905f8d4af01d22ccf
#
#
#
# rename "packages/alsa/alsa-state/asoundrc"
#     to "packages/alsa/alsa-state/asound.conf"
# 
# patch "packages/alsa/alsa-state/asound.conf"
#  from [b43d47be2ff32313c7616db36eb8999e6702492f]
#    to [096a5068f2cc45933f48651dbb834ca257a1e6b5]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [2755260387b08e7fe9dcbb5fd5df106573c7610b]
#    to [17e8820615953e8dfc0ec85f874f0dcc0a6655df]
#
============================================================
--- packages/alsa/alsa-state/asoundrc	b43d47be2ff32313c7616db36eb8999e6702492f
+++ packages/alsa/alsa-state/asound.conf	096a5068f2cc45933f48651dbb834ca257a1e6b5
@@ -1,7 +1,6 @@
-#
-# simple dmix configuration
-#
-pcm.dsp0 {
+# default dmix configuration
+
+pcm.!default {
     type plug
     slave.pcm "dmix"
 }
@@ -10,3 +9,4 @@ ctl.mixer0 {
     type hw
     card 0
 }
+
============================================================
--- packages/alsa/alsa-state.bb	2755260387b08e7fe9dcbb5fd5df106573c7610b
+++ packages/alsa/alsa-state.bb	17e8820615953e8dfc0ec85f874f0dcc0a6655df
@@ -10,14 +10,14 @@ PV = "0.1.0"
 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
 
 INITSCRIPT_NAME = "alsa-state"
@@ -32,8 +32,12 @@ PACKAGES += "alsa-states"
 }
 
 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
 }
-