summaryrefslogtreecommitdiffstats
path: root/meta-audio-4a-framework
diff options
context:
space:
mode:
Diffstat (limited to 'meta-audio-4a-framework')
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template4
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template84
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb19
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/90-4a-modules.pa12
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a33
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend13
6 files changed, 37 insertions, 128 deletions
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template
index 57fc5cca..f2244b83 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template
@@ -12,7 +12,7 @@
"output": [
"alsa.plug:Emergency_Main"
],
- "interupt_behavior": "continue"
+ "interupt_behavior": "pause"
},
{
"name": "Warning",
@@ -21,7 +21,7 @@
"output": [
"alsa.plug:Warning_Main"
],
- "interupt_behavior": "continue"
+ "interupt_behavior": "pause"
},
{
"name": "CustomHigh",
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template
index aa97a39c..f428ba74 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template
@@ -151,13 +151,6 @@ pcm.Emergency {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -192,13 +185,6 @@ pcm.Warning {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -233,13 +219,6 @@ pcm.CustomHigh {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -274,13 +253,6 @@ pcm.Phone {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -315,13 +287,6 @@ pcm.Navigation {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -356,13 +321,6 @@ pcm.CustomMedium {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -397,13 +355,6 @@ pcm.Video {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -439,13 +390,6 @@ pcm.Streaming {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -480,13 +424,6 @@ pcm.Multimedia {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -521,13 +458,6 @@ pcm.Radio {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -562,13 +492,6 @@ pcm.CustomLow {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
@@ -603,13 +526,6 @@ pcm.Fallback {
release {
stream_close "{}"
}
-
- # map AGL event on Unix signal. Search in event for json key=value
- events {
- sig-02 {search state_event, value 1}
- sig-31 {search state_event, value 2}
- sig-32 {search state_event, value 3}
- }
}
}
}
diff --git a/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb b/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb
deleted file mode 100644
index 9590ad95..00000000
--- a/meta-audio-4a-framework/recipes-multimedia/agl-service-unicens/agl-service-unicens_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "4A - Infotainment network setup and access"
-DESCRIPTION = "Infotainment network setup and access (using Unified Centralized Network Stack)"
-HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/agl-service-unicens"
-SECTION = "apps"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-service-unicens;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-PV = "0.1+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-inherit cmake aglwgt pkgconfig
-
-DEPENDS += "alsa-lib json-c systemd af-binder glib-2.0 libxml2"
-RDEPENDS_${PN} += "libxml2 "
-
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 0cc2fdc0..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
}