diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-11 15:31:56 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-11 15:31:56 +0000 |
| commit | 4ef1e4c6f9fd31ca96541afb09ae4f6d63f3957c (patch) | |
| tree | 892ba34cb9f80c72cd33d57dffd9b7400538a6c3 /packages | |
| parent | a08d438956aa4aea02544035828e3e03b501f3f1 (diff) | |
alsa-state: fix standard alsa dmix configuration, it now works out-of-the-box
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/alsa/alsa-state.bb | 17 | ||||
| -rw-r--r-- | packages/alsa/alsa-state/asound.conf (renamed from packages/alsa/alsa-state/asoundrc) | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index b9eb1431b4..83a9ca6ccd 100644 --- 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/asoundrc b/packages/alsa/alsa-state/asound.conf index bc038e3e73..6be024201c 100644 --- a/packages/alsa/alsa-state/asoundrc +++ b/packages/alsa/alsa-state/asound.conf @@ -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 } + |