summaryrefslogtreecommitdiff
path: root/vdrmanager/res/xml
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2011-09-07 09:50:16 +0200
committerlado <herrlado@gmail.com>2011-09-07 09:50:16 +0200
commitadf15c58d390eace444149e9ab90acbcf456ae9c (patch)
tree1b09d8bd84d2ae61eda3b740302a9733c20cf20b /vdrmanager/res/xml
parent1f38710cbed1e6fd6507376e3cb5c5b3c509de39 (diff)
downloadvdr-manager-adf15c58d390eace444149e9ab90acbcf456ae9c.tar.gz
vdr-manager-adf15c58d390eace444149e9ab90acbcf456ae9c.tar.bz2
added streaming support for external players. Fixed a npe in ChannelListActivity
Diffstat (limited to 'vdrmanager/res/xml')
-rw-r--r--vdrmanager/res/xml/preferences.xml18
1 files changed, 18 insertions, 0 deletions
diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml
index 8a84449..15044f6 100644
--- a/vdrmanager/res/xml/preferences.xml
+++ b/vdrmanager/res/xml/preferences.xml
@@ -25,6 +25,14 @@
android:key="@string/vdr_ssl_key"
android:title="@string/vdr_ssl_title"
android:summary="@string/vdr_ssl_summary"/>
+
+
+ <EditTextPreference
+ android:key="streamingport"
+ android:inputType="number"
+ android:title="@string/settings_livetv_port"
+ android:summary="@string/settings_livetv_port_summary"
+ android:defaultValue="3000" />
</PreferenceCategory>
@@ -96,5 +104,15 @@
android:defaultValue="50"/>
</PreferenceCategory>
+
+
+ <PreferenceCategory android:title="@string/livetv">
+ <ListPreference
+ android:key="livetv_streamformat"
+ android:title="@string/settings_livetv_streamformat"
+ android:defaultValue="TS"
+ android:entries="@array/livetv_streamformat"
+ android:entryValues="@array/livetv_streamformat_values" />
+ </PreferenceCategory>
</PreferenceScreen>