From 910541b2b933f4a437ea83ec3ec19242a41a3630 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sun, 9 Jun 2019 23:11:58 +0200 Subject: Supporting commits for the switch to pipewire MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We move all components around meta-audio-soundmanager-framework to that layer (still kept on request). We deprecate the meta-audio-4a-framework layer for Happy Halibut. Bug-AGL: SPEC-2473 Change-Id: I2a7c9d815801a3f8ea80943165ea6fd1422533ea Signed-off-by: Jan-Simon Möller --- .../pulseaudio/files/default.pa.4a | 77 ---------------------- .../pulseaudio/pulseaudio-module-4a-client_git.bb | 20 ------ .../pulseaudio/pulseaudio_%.bbappend | 7 -- 3 files changed, 104 deletions(-) delete mode 100644 meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a delete mode 100644 meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio-module-4a-client_git.bb delete mode 100644 meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend (limited to 'meta-audio-4a-framework/recipes-multimedia/pulseaudio') 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 deleted file mode 100644 index 0efdacc2..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/files/default.pa.4a +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/pulseaudio -nF -# -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . - -# This startup script is used only if PulseAudio is started per-user -# (i.e. not in system mode) - -.fail - -### Automatically augment property information from .desktop files -### stored in /usr/share/application -load-module module-augment-properties - -### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif -load-module module-native-protocol-unix - -### Network access (may be configured with paprefs, so leave this commented -### here if you plan to use paprefs) -#load-module module-esound-protocol-tcp -#load-module module-native-protocol-tcp - -### Load the RTP receiver module (also configured via paprefs, see above) -#load-module module-rtp-recv - -### Load the RTP sender module (also configured via paprefs, see above) -#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" -#load-module module-rtp-send source=rtp.monitor - -.ifexists module-4a-client.so -load-module module-null-sink sink_name=aaaa_null_sink sink_properties="device.description='4A Null Output'" -set-default-sink aaaa_null_sink -load-module module-4a-client -.else -load-module module-udev-detect -.endif - -### Automatically move streams to the default sink if the sink they are -### connected to dies, similar for sources -load-module module-rescue-streams - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink - -### Automatically suspend sinks/sources that become idle for too long -load-module module-suspend-on-idle - -### If autoexit on idle is enabled we want to make sure we only quit -### when no local session needs us anymore. -.ifexists module-console-kit.so -load-module module-console-kit -.endif -.ifexists module-systemd-login.so -load-module module-systemd-login -.endif - -### Modules to allow autoloading of filters (such as echo cancellation) -### on demand. module-filter-heuristics tries to determine what filters -### make sense, and module-filter-apply does the heavy-lifting of -### loading modules and rerouting streams. -load-module module-filter-heuristics -load-module module-filter-apply diff --git a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio-module-4a-client_git.bb b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio-module-4a-client_git.bb deleted file mode 100644 index b5e9e011..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio-module-4a-client_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "pulseaudio 4A client module" -DESCRIPTION = "pulseaudio module to work with 4A (AGL Advanced Audio Agent)" -HOMEPAGE = "https://git.automotivelinux.org/src/pulseaudio-module-4a" -SECTION = "plugins" - -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/src/pulseaudio-module-4a.git;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "9cd72ed153f6615ed826b048e1c344bf4640bd2b" - -PV = "0.1+git${SRCPV}" -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -DEPENDS += "af-binder systemd json-c pulseaudio" -RDEPENDS_${PN} = "pulseaudio-module-alsa-sink" - -FILES_${PN} += "${libdir}/pulse-*/modules/module-4a-client.so" diff --git a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend deleted file mode 100644 index d8a84990..00000000 --- a/meta-audio-4a-framework/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://default.pa.4a" - -do_install_append () { - cp ${WORKDIR}/default.pa.4a ${D}${sysconfdir}/pulse/default.pa -} -- cgit 1.2.3-korg