support now streaming via remux

2 files changed, 44 insertions, 14 deletions

diff --git a/vdrmanager/res/values/livetv.xml b/vdrmanager/res/values/livetv.xml
index 266f862..c39d228 100644
--- a/vdrmanager/res/values/livetv.xml
+++ b/vdrmanager/res/values/livetv.xml
@@ -12,13 +12,28 @@
 		<item>PES</item>
 		<item>ES</item>
 		<item>PS</item>
-		<item>External</item>
 	</string-array>
 	<string-array name="livetv_streamformat_values">
 		<item>TS</item>
 		<item>PES</item>
 		<item>ES</item>
 		<item>PS</item>
-		<item>EXT</item>
 	</string-array>
+	<string name="key_remux_enable">remux_enable</string>
+	<string name="key_remux_command">remux_command</string>
+	<string name="key_remux_parameter">remux_parameter</string>
+	
+	<string name="stream_via_as">Stream</string>
+	<string name="stream_via">via %s</string>
+	<string name="stream_as">as %s</string>
+	<string name="remux_title">Remux</string>
+	<string name="remux_enable_title">Enable Remux</string>
+	<string name="remux_enable_summary">Enable streaming via remux (e.g. externremux.sh)</string>
+	
+	<string name="remux_command_title">Command</string>
+	<string name="remux_command_summary">Typically EXT or Extern e.g. http://vdr:3000/Extern/1</string>
+	
+	<string name="remux_parameter_title">Parameter</string>
+	<string name="remux_parameter_summary">Control Streaming quality. E.g. http://vdr:3000/Extern;DSL1000/1</string>
+	
 </resources>
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>