diff options
| author | lado <herrlado@gmail.com> | 2011-09-07 09:50:16 +0200 |
|---|---|---|
| committer | lado <herrlado@gmail.com> | 2011-09-07 09:50:16 +0200 |
| commit | adf15c58d390eace444149e9ab90acbcf456ae9c (patch) | |
| tree | 1b09d8bd84d2ae61eda3b740302a9733c20cf20b /vdrmanager/res/values | |
| parent | 1f38710cbed1e6fd6507376e3cb5c5b3c509de39 (diff) | |
| download | vdr-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/values')
| -rw-r--r-- | vdrmanager/res/values/arrays.xml | 15 | ||||
| -rw-r--r-- | vdrmanager/res/values/preferences_keys.xml | 2 | ||||
| -rw-r--r-- | vdrmanager/res/values/strings.xml | 7 |
3 files changed, 22 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> |