summaryrefslogtreecommitdiff
path: root/vdrmanager/res/xml
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2011-10-08 02:18:52 +0200
committerlado <herrlado@gmail.com>2011-10-08 02:18:52 +0200
commitea30c8114bf099f2fdd96994569c57393a4e08c3 (patch)
tree46f5a609d0c7a13acd41f7eb65384f6b817df8ea /vdrmanager/res/xml
parentf3deabce766d858c284a8e4597fd1686989e44db (diff)
downloadvdr-manager-ea30c8114bf099f2fdd96994569c57393a4e08c3.tar.gz
vdr-manager-ea30c8114bf099f2fdd96994569c57393a4e08c3.tar.bz2
support now streaming via remux
Diffstat (limited to 'vdrmanager/res/xml')
-rw-r--r--vdrmanager/res/xml/preferences.xml39
1 files changed, 27 insertions, 12 deletions
diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml
index 10063b7..a8578b2 100644
--- a/vdrmanager/res/xml/preferences.xml
+++ b/vdrmanager/res/xml/preferences.xml
@@ -3,6 +3,7 @@
<PreferenceCategory android:title="@string/vdr_preferences"
android:key="vdr_preferences">
+
<EditTextPreference android:key="@string/vdr_host_key"
android:title="@string/vdr_host_title" android:summary="@string/vdr_host_summary" />
<EditTextPreference android:key="@string/vdr_port_key"
@@ -15,17 +16,7 @@
android:title="@string/vdr_ssl_title" android:summary="@string/vdr_ssl_summary" />
</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" />
- <EditTextPreference android:key="streamingport"
- android:inputType="number" android:title="@string/settings_livetv_port"
- android:summary="@string/settings_livetv_port_summary"
- android:defaultValue="3000" />
- </PreferenceCategory>
-
+
<PreferenceCategory android:title="@string/channel_filter_preferences"
android:key="filter_preferences">
<CheckBoxPreference android:key="@string/channel_filter_filter_key"
@@ -59,7 +50,7 @@
<EditTextPreference android:key="@string/wakeup_wol_custom_broadcast_key"
android:title="@string/wakeup_wol_custom_boradcast_title"
android:summaryOn="@string/wakeup_wol_custom_boradcast_summary"
- android:dependency="@string/wakeup_enabled_key" android:defaultValue="" />
+ android:dependency="@string/wakeup_enabled_key" android:defaultValue="255.255.255.255" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/timer_preferences"
@@ -88,4 +79,28 @@
android:summaryOn="@string/gui_enable_24h_format_summary_on"
android:summaryOff="@string/gui_enable_24h_format_summary_off" />
</PreferenceCategory>
+ <PreferenceCategory android:title="@string/livetv">
+ <EditTextPreference android:key="streamingport"
+ android:inputType="number" android:title="@string/settings_livetv_port"
+ android:summary="@string/settings_livetv_port_summary"
+ android:defaultValue="3000" />
+
+ <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" />
+
+ <CheckBoxPreference android:key="remux_enable" android:title="@string/remux_enable_title" android:summary="@string/remux_enable_summary"
+
+ />
+ <EditTextPreference android:dependency="remux_enable" android:key="remux_command" android:title="@string/remux_command_title" android:defaultValue="EXT" android:summary="@string/remux_command_summary"
+ />
+
+ <EditTextPreference android:dependency="remux_enable" android:key="remux_parameter" android:title="@string/remux_parameter_title" android:summary="@string/remux_parameter_summary"
+ android:defaultValue="QUALITY=DSL1000"
+ />
+
+
+ </PreferenceCategory>
+
</PreferenceScreen>