From 83c16f45d11aa226cdd5479e25f012a589523ce9 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Tue, 18 Dec 2018 16:15:39 -0800
Subject: binding: mediaplayer: allow open/close of mediaplayer roles

When streams are paused or stopped the mediaplayer role needs to be
released to allow playback from other applications (i.e. radio)

Change-Id: Idd324d0695bfaa35401f05a95380d56df848009e
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 conf.d/cmake/config.cmake   |  6 +-----
 conf.d/wgt/config-4a.xml.in | 29 -----------------------------
 conf.d/wgt/config.xml.in    |  2 ++
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 conf.d/wgt/config-4a.xml.in

(limited to 'conf.d')

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 5927316..c5d1b4b 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -87,11 +87,7 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
 
 # Optional location for config.xml.in
 # -----------------------------------
-if(HAVE_4A_FRAMEWORK)
-	set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config-4a.xml.in)
-else()
-	set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
-endif()
+set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
 
 # Mandatory widget Mimetype specification of the main unit
 # --------------------------------------------------------------------------
diff --git a/conf.d/wgt/config-4a.xml.in b/conf.d/wgt/config-4a.xml.in
deleted file mode 100644
index daf5acf..0000000
--- a/conf.d/wgt/config-4a.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
-	<name>@PROJECT_NAME@</name>
-	<icon src="@PROJECT_ICON@"/>
-	<content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/>
-	<description>@PROJECT_DESCRIPTION@</description>
-	<author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
-	<license>@PROJECT_LICENSE@</license>
-
-	<feature name="urn:AGL:widget:required-permission">
-		<param name="urn:AGL:permission::public:hidden" value="required" />
-		<param name="urn:AGL:permission::public:no-htdocs" value="required" />
-		<param name="urn:AGL:permission:audio:public:audiostream" value="required" />
-	</feature>
-
-	<feature name="urn:AGL:widget:provided-api">
-		<param name="mediaplayer" value="ws" />
-	</feature>
-
-	<feature name="urn:AGL:widget:required-api">
-		<param name="mediascanner" value="ws" />
-		<param name="Bluetooth-Manager" value="ws" />
-		<param name="ahl-4a" value="ws" />
-	</feature>
-
-	<feature name="urn:AGL:widget:required-binding">
-		<param name="@WIDGET_ENTRY_POINT@" value="local" />
-	</feature>
-</widget>
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 3e8447a..daf5acf 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -10,6 +10,7 @@
 	<feature name="urn:AGL:widget:required-permission">
 		<param name="urn:AGL:permission::public:hidden" value="required" />
 		<param name="urn:AGL:permission::public:no-htdocs" value="required" />
+		<param name="urn:AGL:permission:audio:public:audiostream" value="required" />
 	</feature>
 
 	<feature name="urn:AGL:widget:provided-api">
@@ -19,6 +20,7 @@
 	<feature name="urn:AGL:widget:required-api">
 		<param name="mediascanner" value="ws" />
 		<param name="Bluetooth-Manager" value="ws" />
+		<param name="ahl-4a" value="ws" />
 	</feature>
 
 	<feature name="urn:AGL:widget:required-binding">
-- 
cgit 1.2.3-korg