Merge pull request #1222 from CvH/tvh_up9

tvheadend42: update to 4.1.2415
LibreELEC · Jan 29, 2017 · 4bf322b · 4bf322b
2 parents dc46e42 + 2ec7563
commit 4bf322b
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 64 deletions.
diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt
@@ -1,3 +1,9 @@
+109
+- added custom start options to addon
+- added FRITZ!Box Sat>IP server support to addon
+- update to Tvheadend 4.1.2415
+- fix debug if activated but nothing selected
+
 108
 - added CA (libdvben50221) support
 - update to Tvheadend 4.1.2401

diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://LibreELEC.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-2017 Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="1f894a6"
-PKG_VERSION_NUMBER="4.1.2401"
-PKG_REV="108"
+PKG_VERSION="e5f5a42"
+PKG_VERSION_NUMBER="4.1.2415"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"

diff --git a/packages/addons/service/tvheadend42/source/bin/tvheadend42.start b/packages/addons/service/tvheadend42/source/bin/tvheadend42.start
@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-2017 Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -44,6 +44,19 @@ XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file"
 
 chmod a+x $ADDON_DIR/bin/*
 
+# workaround to support old 4.1.x version upgrade for Tvh after 4.1.2369
+if [ -f "$ADDON_HOME/dvr/config/dvr-config" ]; then
+  rm $ADDON_HOME/dvr/config/dvr-config
+fi
+
+if [ -f "$ADDON_HOME/channel/config/config.tmp" ]; then
+  rm $ADDON_HOME/channel/config/config.tmp
+fi
+
+if [ -f "$ADDON_HOME/channel/config/tag.tmp" ]; then
+  rm $ADDON_HOME/channel/config/tag.tmp
+fi
+
 # copy config files to userdata
 if [ ! -f "$DVR_SETTINGS_FILE" ]; then
   mkdir -p $DVR_SETTINGS_DIR
@@ -71,11 +84,26 @@ if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
   cp $ADDON_DIR/defaults/xmltv/config $XMLTV_SETTINGS_FILE
 fi
 
-# options
+# delayed Tvh startup
 if [ "$WORKAROUND_SLEEP" == "true" ]; then
   sleep $WORKAROUND_SLEEP_TIME
 fi
 
+# support FritzBox Sat>IP Server detection workaround
+if [ "$AVM_SATIP_SERVER" == "true" ]; then
+  AVM_SATIP=""
+  for i in $(seq 1 $AVM_SATIP_SERVER_NUM); do
+    ref_ip=AVM_IP_${i}
+    eval "AVM_IP=\${$ref_ip}"
+    AVM_SATIP="$AVM_SATIP --satip_xml http://${AVM_IP}:${AVM_PORT}/satipdesc.xml"
+  done
+fi
+
+# custom startup parameters
+if [ "$CUSTOM_START" != "true" ]; then
+  CUSTOM_ARGS=""
+fi
+
 # debug value generation
 if [ "$DEBUG_LOG_TRACE_1" != "NONE" ]; then
   DEBUG_LOG_ARG="$DEBUG_LOG_TRACE_1"
@@ -84,7 +112,7 @@ fi
 if [ "$DEBUG_LOG_TRACE_2" != "NONE" ]; then
   DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_2"
 fi
- 
+
 if [ "$DEBUG_LOG_TRACE_3" != "NONE" ]; then
   DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_3"
 fi
@@ -97,16 +125,21 @@ if [ "$DEBUG_LOG_TRACE_5" != "NONE" ]; then
   DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_5"
 fi
 
+# if debuglog is activated and nothing selected to trace
+if [ -z "$DEBUG_LOG_ARG" ];then
+  DEBUG_LOG_ARG="all"
+fi
+
 # rename debuglog if already exist to prevent overwriting after crash
 if [ -f "${DEBUG_LOG_PATH}" ]; then
   cp ${DEBUG_LOG_PATH} ${DEBUG_LOG_PATH}_$(date '+%Y-%m-%d_%H.%M.%S').txt
 fi
 
 # debug commandline
 if [ "$DEBUG_LOG" = "true" ]; then
-  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME -l ${DEBUG_LOG_PATH} --trace $DEBUG_LOG_ARG"
+  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME $AVM_SATIP $CUSTOM_ARGS -l ${DEBUG_LOG_PATH} --trace $DEBUG_LOG_ARG"
 else
-  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME $AVM_SATIP $CUSTOM_ARGS"
 fi
 
 # start userspace DVB driver/addon

diff --git a/packages/addons/service/tvheadend42/source/resources/language/English/strings.xml b/packages/addons/service/tvheadend42/source/resources/language/English/strings.xml
@@ -1,27 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
-	<!-- HTS TVHEADEND -->
-	<string id="1000">XMLTV</string>
-	<string id="1001">DVB</string>
-	<string id="1002">DEBUG</string>
-	<string id="1010">XMLTV Configuration</string>
-	<string id="1011">XMLTV source type</string>
-	<string id="1012">XMLTV File location</string>
-	<string id="1013">XMLTV Web location</string>
-	<string id="1014">XMLTV Script location</string>
-	<string id="1020">DVB Configuration</string>
-	<string id="1021">Unload DVB mudules before suspend</string>
-	<string id="1022">Wait for frontend initialization</string>
-	<string id="1023">Number of adapters to wait for</string>
-	<string id="1024">Preload capmt_ca.so library</string>
-	<string id="1025">Delay the start of Tvheadend</string>
-	<string id="1026">Seconds delay</string>
-	<string id="1030">TRACE Configuration</string>
-	<string id="1031">Path</string>	
-	<string id="1032">Activate TRACE Debug</string>
-	<string id="31032">Debug Value #1</string>
-	<string id="31033">Debug Value #2</string>
-	<string id="31034">Debug Value #3</string>
-	<string id="31035">Debug Value #4</string>
-	<string id="31036">Debug Value #5</string>
+  <!-- HTS TVHEADEND -->
+  <string id="1000">XMLTV</string>
+  <string id="1001">DVB</string>
+  <string id="1002">DEBUG</string>
+  <string id="1003">FRITZ!Box Sat>IP</string>
+  <string id="1010">XMLTV Configuration</string>
+  <string id="1011">XMLTV source type</string>
+  <string id="1012">XMLTV File location</string>
+  <string id="1013">XMLTV Web location</string>
+  <string id="1014">XMLTV Script location</string>
+  <string id="1020">DVB Configuration</string>
+  <string id="1021">Unload DVB mudules before suspend</string>
+  <string id="1022">Wait for frontend initialization</string>
+  <string id="1023">Number of adapters to wait for</string>
+  <string id="1024">Preload capmt_ca.so library</string>
+  <string id="1025">Delay the start of Tvheadend</string>
+  <string id="1026">Seconds delay</string>
+  <string id="1028">Custom start parameter</string>
+  <string id="1029">Parameter</string>
+  <string id="1110">FRITZ!Box Sat>IP server</string>
+  <string id="1111"># of tuners</string>
+  <string id="1112">Tuner #1 address</string>
+  <string id="1113">Tuner #2 address</string>
+  <string id="1114">Tuner #3 address</string>
+  <string id="1115">Tuner #4 address</string>
+  <string id="1116">AVM SAT>IP Port</string>
+  <string id="1120">Port</string>
+  <string id="1121">FRITZ!Box Sat>IP server connection</string>
+  <string id="1030">TRACE Configuration</string>
+  <string id="1031">Path</string>
+  <string id="1032">Activate TRACE Debug</string>
+  <string id="31032">Debug Value #1</string>
+  <string id="31033">Debug Value #2</string>
+  <string id="31034">Debug Value #3</string>
+  <string id="31035">Debug Value #4</string>
+  <string id="31036">Debug Value #5</string>
 </strings>
diff --git a/packages/addons/service/tvheadend42/source/resources/settings.xml b/packages/addons/service/tvheadend42/source/resources/settings.xml
@@ -1,34 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-   <!-- HTS TVHEADEND -->
-    <category label="1000">
-		<setting label="1010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|SCRIPT|WEB" sort="yes" default="NONE"/>
-		<setting id="XMLTV_LOCATION_FILE" type="file" label="1012" default="" enable="eq(-1,0)"/>
-		<setting id="XMLTV_LOCATION_WEB" type="text" label="1013" default="http://" enable="eq(-2,3)"/>
-		<setting id="XMLTV_LOCATION_SCRIPT" type="file" label="1014" default="" enable="eq(-3,2)"/>
-    </category>
-    <category label="1001">
-		<setting label="1020" type="lsep"/>
-		<setting type="sep" />
-		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
-		<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
-		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
-		<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
-		<setting id="WORKAROUND_SLEEP" type="bool" label="1025" default="false" />
-		<setting id="WORKAROUND_SLEEP_TIME" type="slider" range="1,30" option="int" label="1026" default="1" enable="eq(-1,true)" />
-    </category>
-    <category label="1002">
-		<setting label="1030" type="lsep"/>
-		<setting type="sep" />
-		<setting id="DEBUG_LOG" type="bool" label="1032" default="false" />
-		<setting type="sep" />
-		<setting id="DEBUG_LOG_PATH" type="text" label="1031" default="/storage/.kodi/userdata/addon_data/service.tvheadend42/debug.txt" enable="eq(-2,true)"/>
-		<setting id="DEBUG_LOG_TRACE_1" type="select" default="NONE" enable="eq(-3,true)" label="31032" values="NONE|all|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-		<setting id="DEBUG_LOG_TRACE_2" type="select" default="NONE" enable="!eq(-1,NONE)+eq(-4,true)" label="31033" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-		<setting id="DEBUG_LOG_TRACE_3" type="select" default="NONE" enable="!eq(-1,NONE)+!eq(-2,NONE)+eq(-5,true)" label="31034" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-		<setting id="DEBUG_LOG_TRACE_4" type="select" default="NONE" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+eq(-6,true)" label="31035" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-		<setting id="DEBUG_LOG_TRACE_5" type="select" default="NONE" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+!eq(-4,NONE)+eq(-7,true)" label="31036" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-    </category>
+  <!-- HTS TVHEADEND -->
+  <category label="1000">
+    <setting label="1010" type="lsep"/>
+    <setting type="sep" />
+    <setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|SCRIPT|WEB" sort="yes" default="NONE"/>
+    <setting id="XMLTV_LOCATION_FILE" type="file" label="1012" default="" enable="eq(-1,0)"/>
+    <setting id="XMLTV_LOCATION_WEB" type="text" label="1013" default="http://" enable="eq(-2,3)"/>
+    <setting id="XMLTV_LOCATION_SCRIPT" type="file" label="1014" default="" enable="eq(-3,2)"/>
+  </category>
+  <category label="1001">
+    <setting label="1020" type="lsep"/>
+    <setting type="sep" />
+    <setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
+    <setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
+    <setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
+    <setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
+    <setting id="WORKAROUND_SLEEP" type="bool" label="1025" default="false" />
+    <setting id="WORKAROUND_SLEEP_TIME" type="slider" range="1,30" option="int" label="1026" default="1" enable="eq(-1,true)" />
+  </category>
+  <category label="1002">
+    <setting label="1030" type="lsep"/>
+    <setting type="sep" />
+    <setting id="DEBUG_LOG" type="bool" label="1032" default="false" />
+    <setting type="sep" />
+    <setting id="DEBUG_LOG_PATH" type="text" label="1031" default="/storage/.kodi/userdata/addon_data/service.tvheadend42/debug.txt" enable="eq(-2,true)"/>
+    <setting id="DEBUG_LOG_TRACE_1" type="select" default="NONE" visible="eq(-3,true)" enable="eq(-3,true)" label="31032" values="NONE|all|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_2" type="select" default="NONE" visible="eq(-4,true)" enable="!eq(-1,NONE)+eq(-4,true)" label="31033" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_3" type="select" default="NONE" visible="eq(-5,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+eq(-5,true)" label="31034" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_4" type="select" default="NONE" visible="eq(-6,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+eq(-6,true)" label="31035" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_5" type="select" default="NONE" visible="eq(-7,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+!eq(-4,NONE)+eq(-7,true)" label="31036" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting type="sep" />
+    <setting id="CUSTOM_START" type="bool" label="1028" default="false" />
+    <setting id="CUSTOM_ARGS" type="text" label="1029" default="" enable="eq(-1,true)" />
+  </category>
+  <category label="1003">
+    <setting label="1121" type="lsep"/>
+    <setting type="sep" />
+    <setting id="AVM_SATIP_SERVER" type="bool" label="1110" default="false"/>
+    <setting id="AVM_SATIP_SERVER_NUM" label="1111" type="labelenum" values="0|1|2|3|4" default="1" visible="eq(-1,true)" enable="eq(-1,true)"/>
+    <setting id="AVM_IP_1" type="ipaddress" label="1112" default="192.168.178.254" visible="gt(-1,0)+eq(-2,true)" enable="gt(-1,0)+eq(-2,true)" />
+    <setting id="AVM_IP_2" type="ipaddress" label="1113" default="192.168.178.253" visible="gt(-2,1)+eq(-3,true)" enable="gt(-2,1)+eq(-3,true)" />
+    <setting id="AVM_IP_3" type="ipaddress" label="1114" default="192.168.178.252" visible="gt(-3,2)+eq(-4,true)" enable="gt(-3,2)+eq(-4,true)" />
+    <setting id="AVM_IP_4" type="ipaddress" label="1115" default="192.168.178.251" visible="gt(-4,3)+eq(-5,true)" enable="gt(-4,3)+eq(-5,true)" />
+    <setting id="AVM_PORT" type="number" label="1120" default="49000" visible="gt(-5,0)+eq(-6,true)" enable="gt(-5,0)+eq(-6,true)" />
+  </category>
 </settings>