From e345e16bb494864caf1f7dbe8864aa40df401a70 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Mon, 18 Oct 2021 14:24:52 +0200 Subject: Prepare master for new framework integration During the last workshop the transition to the new framework was presented. This change essentially deprecates the SMACK-based application framework. To prepare the integration of it, we remove the deprecated components: - meta-speech-framework and the voiceagent services Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller Change-Id: I803dd18184338a1f5519af27136e1d5a58ee9369 --- .../0001-update-pipewire-gstreamer-plugins.patch | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/files/0001-update-pipewire-gstreamer-plugins.patch (limited to 'meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/files/0001-update-pipewire-gstreamer-plugins.patch') diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/files/0001-update-pipewire-gstreamer-plugins.patch b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/files/0001-update-pipewire-gstreamer-plugins.patch deleted file mode 100644 index bc277588..00000000 --- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/files/0001-update-pipewire-gstreamer-plugins.patch +++ /dev/null @@ -1,44 +0,0 @@ -Update PipeWire gstreamer plugins - -Update PipeWire sink and source to handle drop of pwaudiosink and -pwaudiosrc in favor of pipewire* replacements. However, testing -has found that Alexa does not work with pipewiresrc (input hangs -after first interaction), so for now use "alsasrc device=pipewire" -as a workaround as recommended by upstream. - -Given that Amazon has dropped AGL support, this patch will need to -be carried locally. - -Upstream-Status: Inappropriate [no upstream] -Signed-off-by: Scott Murray ---- - lib/aal/src/gstreamer/player.c | 2 +- - lib/aal/src/gstreamer/recorder.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/aal/src/gstreamer/player.c b/lib/aal/src/gstreamer/player.c -index 5dd6627..5ff9402 100644 ---- a/lib/aal/src/gstreamer/player.c -+++ b/lib/aal/src/gstreamer/player.c -@@ -142,7 +142,7 @@ static aal_handle_t gstreamer_player_create(const aal_attributes_t* attr, aal_au - } else { - #ifdef USE_PIPEWIRE - g_info("Using Pipewire device: %s\n", attr->device); -- sink = gstreamer_create_and_add_element(bin, "pwaudiosink", "sink"); -+ sink = gstreamer_create_and_add_element(bin, "pipewiresink", "sink"); - if (sink) { - GstStructure* s = gst_structure_new("properties", "media.role", G_TYPE_STRING, attr->device, NULL); - g_object_set(G_OBJECT(sink), "stream-properties", s, NULL); -diff --git a/lib/aal/src/gstreamer/recorder.c b/lib/aal/src/gstreamer/recorder.c -index ff6d464..a13b000 100644 ---- a/lib/aal/src/gstreamer/recorder.c -+++ b/lib/aal/src/gstreamer/recorder.c -@@ -69,7 +69,7 @@ static aal_handle_t gstreamer_recorder_create(const aal_attributes_t* attr, aal_ - strncpy(src_desc, "autoaudiosrc", sizeof(src_desc) - 1); - } else { - #ifdef USE_PIPEWIRE -- snprintf(src_desc, sizeof(src_desc), "pwaudiosrc stream-properties=\"properties,media.role=%s\"", attr->device); -+ snprintf(src_desc, sizeof(src_desc), "alsasrc device=pipewire"); - #else - g_info("Using ALSA device: %s\n", attr->device); - snprintf(src_desc, sizeof(src_desc), "alsasrc device=%s", attr->device); -- cgit 1.2.3-korg