From 2e80d187a650faceee9b73a966a1680fb5be6531 Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan.lemartret@iot.bzh>
Date: Wed, 27 Dec 2017 16:57:55 +0100
Subject: Fix default.pa for 4a

 - This file "default.pa" should be used with 4a.
 - 4a default configuration with AGL default audio roles was valided.

EE-must-fix

Bug-AGL: SPEC-1234

Change-Id: I4d1487efa182033ebff9c5153fa5e78920edaab2
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
---
 .../pulseaudio/files/90-4a-modules.pa              | 12 --------
 .../pulseaudio/files/default.pa.4a                 | 33 ++++++++++++++++++++++
 .../pulseaudio/pulseaudio_%.bbappend               | 13 ++-------
 3 files changed, 35 insertions(+), 23 deletions(-)
 delete mode 100644 meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa
 create mode 100644 meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a

diff --git a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa
deleted file mode 100644
index e041471d..00000000
--- a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa
+++ /dev/null
@@ -1,12 +0,0 @@
-load-module module-alsa-sink device=Fallback
-#load-module module-alsa-sink device=CustomLow
-load-module module-alsa-sink device=Radio
-#load-module module-alsa-sink device=Multimedia
-#load-module module-alsa-sink device=Streaming
-load-module module-alsa-sink device=Video
-#load-module module-alsa-sink device=CustomMedium
-load-module module-alsa-sink device=Navigation
-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
diff --git a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a
new file mode 100644
index 00000000..0afab22b
--- /dev/null
+++ b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a
@@ -0,0 +1,33 @@
+#!/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
+#load-module module-alsa-sink device=Multimedia
+#load-module module-alsa-sink device=Streaming
+load-module module-alsa-sink device=Video
+#load-module module-alsa-sink device=CustomMedium
+load-module module-alsa-sink device=Navigation
+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
 }
-- 
cgit 1.2.3-korg