diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-01-04 17:30:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-01-04 17:30:38 +0000 |
| commit | 5f5052f120f048924800f35c3dfe52233695d05d (patch) | |
| tree | 2fb3d57ccef75a0d4c55a88bc4622443b3d2ae0d | |
| parent | 46eb4a3dbcaeae7eb321d153a577e2ee6460f4c7 (diff) | |
| parent | 2e80d187a650faceee9b73a966a1680fb5be6531 (diff) | |
| -rw-r--r-- | meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a (renamed from meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa) | 21 | ||||
| -rw-r--r-- | meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 13 |
2 files changed, 23 insertions, 11 deletions
diff --git a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a index e041471d..0afab22b 100644 --- a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa +++ b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a @@ -1,3 +1,22 @@ +#!/usr/bin/pulseaudio -nF +# + +.fail + +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so +load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover headset=ofono +.endif + +load-module module-native-protocol-unix + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle timeout=0 + load-module module-alsa-sink device=Fallback #load-module module-alsa-sink device=CustomLow load-module module-alsa-sink device=Radio @@ -10,3 +29,5 @@ load-module module-alsa-sink device=Phone #load-module module-alsa-sink device=CustomHigh #load-module module-alsa-sink device=Warning load-module module-alsa-sink device=Emergency + +set-default-sink alsa_output.Fallback diff --git a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index 6b122f5e..d8a84990 100644 --- a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -1,16 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://90-4a-modules.pa" +SRC_URI += "file://default.pa.4a" -# Add .include directive to default.pa so optional configuration can be added do_install_append () { - if [ ! -e ${D}${sysconfdir}/pulse/default.d/ ]; then - echo ".include ${sysconfdir}/pulse/default.d" >> ${D}${sysconfdir}/pulse/default.pa - install -d ${D}${sysconfdir}/pulse/default.d - fi - install -m 0644 ${WORKDIR}/90-4a-modules.pa ${D}${sysconfdir}/pulse/default.d/ - - for m in module-udev-detect module-suspend-on-idle;do - sed -i -e "s|^load-module ${m}|#load-module ${m}|" ${D}${sysconfdir}/pulse/default.pa - done + cp ${WORKDIR}/default.pa.4a ${D}${sysconfdir}/pulse/default.pa } |