added streaming support for external players. Fixed a npe in ChannelListActivity

4 files changed, 40 insertions, 2 deletions

diff --git a/vdrmanager/res/values/arrays.xml b/vdrmanager/res/values/arrays.xml
new file mode 100644
index 0000000..7b5b28a
--- /dev/null
+++ b/vdrmanager/res/values/arrays.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string-array name="livetv_streamformat">
+    <item>TS</item>
+    <item>PES</item>
+    <item>ES</item>
+    <item>PS</item>
+  </string-array>
+  <string-array name="livetv_streamformat_values">
+    <item>TS</item>
+    <item>PES</item>
+    <item>ES</item>
+    <item>PS</item>
+  </string-array>
+</resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/preferences_keys.xml b/vdrmanager/res/values/preferences_keys.xml
index 36fee64..7eb0c6d 100644
--- a/vdrmanager/res/values/preferences_keys.xml
+++ b/vdrmanager/res/values/preferences_keys.xml
@@ -5,6 +5,8 @@
   <string name="vdr_port_key">svdrp_port </string>
   <string name="vdr_password_key">svdrp_password</string>
   <string name="vdr_ssl_key">svdrp_ssl</string>
+  <string name="vdr_stream_format">stream_format</string>
+  <string name="vdr_stream_port">stream_port</string>
   
   <string name="alive_check_enabled_key">alive_check_enabled</string>
   <string name="alive_check_interval_key">alive_check_interval</string>
diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml
index 1fcd07e..47eb950 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  
-  
+ <string name="livetv">Live TV</string>
+    <string name="settings_livetv_summary">Needs streamdev-server on VDR and an external player such as VPlayer</string>
+    <string name="settings_livetv_streamformat">Streamformat</string>
+    <string name="settings_livetv_port">Streaming Port</string>
+    <string name="settings_livetv_port_summary">Default 3000. The access must be enabled in streamdevhosts.conf.</string>
 </resources>
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>