summaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2018-12-18 16:15:39 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2018-12-19 22:06:35 -0800
commita9f63b6b5f455e2957ed08e2bb2b581c058035ff (patch)
tree8366bb458157c26cff19e097c862e0b9476dd313 /conf.d
parentac1d71ad7e6610739ad74815ae90fafc6cbbcb2c (diff)
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>
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/cmake/config.cmake6
-rw-r--r--conf.d/wgt/config-4a.xml.in26
-rw-r--r--conf.d/wgt/config.xml.in5
3 files changed, 3 insertions, 34 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index a2b6b3a..1db0200 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -86,11 +86,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 175e1d3..0000000
--- a/conf.d/wgt/config-4a.xml.in
+++ /dev/null
@@ -1,26 +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" />
- <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..175e1d3 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,9 +20,7 @@
<feature name="urn:AGL:widget:required-api">
<param name="mediascanner" value="ws" />
<param name="Bluetooth-Manager" value="ws" />
- </feature>
-
- <feature name="urn:AGL:widget:required-binding">
+ <param name="ahl-4a" value="ws" />
<param name="@WIDGET_ENTRY_POINT@" value="local" />
</feature>
</widget>