diff options
| author |   Scott Murray <scottm@ghidorah.spiteful.org> | 2018-05-28 21:16:23 -0400 |
|---|---|---|
| committer | Scott Murray <scottm@ghidorah.spiteful.org> | 2018-05-28 21:25:45 -0400 |
| commit | 906174204ce5e1687f2725a7e3977d42d3c45fbf (patch) | |
| tree | 2e75b2216e4ff3ff51c39b001e3010cc0fb33cf9 /conf.d | |
| parent | e65da04f8451c1166a414fdb58acfe01c63e4f94 (diff) | |
Rework output to directly support 4A
When building for 4A, switch to new gstreamer-based ALSA output for
the RTL-SDR backend, and the Kingfisher backend now uses a gstreamer
pipeline for its loopback to either an ALSA or Pulse sink depending
on 4A or not. Using gstreamer instead of direct ALSA output has the
benefit of transparently handling resampling to the M3ULCB hardware's
required 48 KHz sample rate for the RTL-SDR backend.
Change-Id: I2bfbf924927bb461cce88b04aba0e626f8d71215
Signed-off-by: Scott Murray <scottm@ghidorah.spiteful.org>
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/cmake/config.cmake | 6 | ||||
| -rw-r--r-- | conf.d/wgt/config-4a.xml.in | 29 |
2 files changed, 34 insertions, 1 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 4fa7666..86588d4 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -91,7 +91,11 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) # Optional location for config.xml.in # ----------------------------------- -set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/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() # 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 new file mode 100644 index 0000000..42ad037 --- /dev/null +++ b/conf.d/wgt/config-4a.xml.in @@ -0,0 +1,29 @@ +<?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@ <@PROJECT_AUTHOR_MAIL@></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:file-properties"> + <param name="bin/rtl_fm_helper" value="executable" /> + </feature> + + <feature name="urn:AGL:widget:provided-api"> + <param name="radio" value="ws" /> + </feature> + + <feature name="urn:AGL:widget:required-api"> + <param name="ahl-4a" value="ws" /> + <param name="@WIDGET_ENTRY_POINT@" value="local" /> + </feature> + +</widget> |