Added option to do raw video (thanks Sindre)

4 files changed, 29 insertions, 8 deletions

diff --git a/subsonic-android/res/menu/select_video_context.xml b/subsonic-android/res/menu/select_video_context.xml
index 7a45d34a..5926f8a5 100644
--- a/subsonic-android/res/menu/select_video_context.xml
+++ b/subsonic-android/res/menu/select_video_context.xml
@@ -11,11 +11,6 @@
 	<item 
 		android:id="@+id/song_menu_play_external"
 		android:title="@string/common.play_external"/>
-	
-	<item 
-		android:id="@+id/song_menu_webview"
-		android:title="@string/common.webview"
-		/>
 
 	<item 
 		android:id="@+id/song_menu_download"
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 80cc4fad..daca9b8b 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -137,4 +137,15 @@
 		<item>@string/settings.temp_loss_nothing</item>
 	</string-array>
 
+	<string-array name="videoPlayerValues">
+		<item>raw</item>
+		<item>transcode</item>
+		<item>flash</item>
+	</string-array>
+	<string-array name="videoPlayerNames">
+		<item>@string/settings.video_raw</item>
+		<item>@string/settings.video_transcode</item>
+		<item>@string/settings.video_flash</item>
+	</string-array>
+
 </resources>
\ No newline at end of file
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index b288e035..87905e18 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -18,9 +18,8 @@
 	<string name="common.name">Name</string>

 	<string name="common.comment">Comment</string>

 	<string name="common.public">Public</string>

-	<string name="common.webview">Play Web View (Flash)</string>

-	<string name="common.play_external">Play External Player</string>

-	<string name="common.stream_external">Stream External Player</string>

+	<string name="common.play_external">Play Video</string>

+	<string name="common.stream_external">Stream Video</string>

 	<string name="common.confirm">Confirm</string>

 

     <string name="button_bar.home">Home</string>

@@ -283,6 +282,11 @@
 	<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>

 	<string name="settings.chat_enabled">Chat Enabled</string>

 	<string name="settings.chat_enabled_summary">Whether or not to display the chat tab.  Restart app after changing.</string>

+	<string name="settings.video_title">Video</string>

+	<string name="settings.video_player">Video Player</string>

+	<string name="settings.video_raw">Raw</string>

+	<string name="settings.video_transcode">Direct Transcode</string>

+	<string name="settings.video_flash">Flash</string>

 

 	<string name="shuffle.startYear">Start Year:</string>

 	<string name="shuffle.endYear">End Year:</string>

diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index 17a51621..d3618ffa 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -25,6 +25,17 @@
 
     </PreferenceCategory>
 
+	<PreferenceCategory
+		android:title="@string/settings.video_title">
+
+		<ListPreference
+			android:title="@string/settings.video_player"
+			android:key="videoPlayer"
+			android:defaultValue="raw"
+			android:entryValues="@array/videoPlayerValues"
+			android:entries="@array/videoPlayerNames"/>
+	</PreferenceCategory>
+
     <PreferenceCategory
             android:title="@string/settings.network_title">