Some fixes to work when 4A is enabled:
- Simplified the echo that adds /etc/pulse/default.d to
/etc/pulse/default.pa, as it was resulting in "-e -n" in the file
sometimes for reasons unknown.
- PulseAudio does not like the /etc/pulse/default.d directory being
empty, and additionally it was realized that the module unloads that
are in module-router.pa are useful in all our usecases and should
likely always be present. To kill two birds with one stone, the
unload lines have been moved to a 10-unload-modules.pa file that
is installed by the pulseaudio bbappend, and those lines have been
removed from the module-router.pa files, which has been renamed to
20-module-router.pa so that ordering will be maintained if someone
needs to reenable it.
Change-Id: I70cd1d0dfc596b894009c1bdd7520ffe6394e60e
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
--- /dev/null
+.ifexists module-router.so
+load-module module-router
+.endif
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI = "file://module-router.pa"
+SRC_URI = "file://20-module-router.pa"
do_install () {
install -d ${D}${sysconfdir}/pulse/default.d
- install -m 0644 ${WORKDIR}/module-router.pa ${D}${sysconfdir}/pulse/default.d/
+ install -m 0644 ${WORKDIR}/20-module-router.pa ${D}${sysconfdir}/pulse/default.d/
}
RDEPENDS_${PN} = "module-router"
-.ifexists module-router.so
unload-module module-role-cork
unload-module module-device-restore
unload-module module-stream-restore
unload-module module-card-restore
-load-module module-router
-.endif
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://10-unload-modules.pa"
+
# Add .include directive to default.pa so optional configuration can be added
do_install_append () {
- echo -e -n "\n.include ${sysconfdir}/pulse/default.d\n" >> ${D}${sysconfdir}/pulse/default.pa
+ echo ".include ${sysconfdir}/pulse/default.d" >> ${D}${sysconfdir}/pulse/default.pa
+ install -d ${D}${sysconfdir}/pulse/default.d
+ install -m 0644 ${WORKDIR}/10-unload-modules.pa ${D}${sysconfdir}/pulse/default.d/
}