Added setting for video stream bitrate

3 files changed, 56 insertions, 2 deletions

diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 493239e9..75ad2bea 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -77,6 +77,34 @@
         <item>@string/settings.max_bitrate_unlimited</item>
     </string-array>
 	
+	<string-array name="maxVideoBitrateValues">
+		<item>200</item>
+		<item>300</item>
+		<item>400</item>
+		<item>500</item>
+		<item>700</item>
+		<item>1000</item>
+		<item>1500</item>
+		<item>2000</item>
+		<item>3000</item>
+		<item>5000</item>
+		<item>0</item>
+	</string-array>
+	
+	<string-array name="maxVideoBitrateNames">
+		<item>@string/settings.max_video_bitrate_200</item>
+		<item>@string/settings.max_video_bitrate_300</item>
+		<item>@string/settings.max_video_bitrate_400</item>
+		<item>@string/settings.max_video_bitrate_500</item>
+		<item>@string/settings.max_video_bitrate_700</item>
+		<item>@string/settings.max_video_bitrate_1000</item>
+		<item>@string/settings.max_video_bitrate_1500</item>
+		<item>@string/settings.max_video_bitrate_2000</item>
+		<item>@string/settings.max_video_bitrate_3000</item>
+		<item>@string/settings.max_video_bitrate_5000</item>
+		<item>@string/settings.max_bitrate_unlimited</item>
+	</string-array>
+	
 	<string-array name="networkTimeoutValues">
 		<item>10000</item>
 		<item>15000</item>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index fb18d16c..9c9ac4b8 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -196,8 +196,8 @@
     <string name="settings.theme_dark_fullscreen">Dark Fullscreen</string>

 	<string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>

     <string name="settings.network_title">Network</string>

-    <string name="settings.max_bitrate_wifi">Max bitrate - Wi-Fi</string>

-    <string name="settings.max_bitrate_mobile">Max bitrate - Mobile</string>

+    <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>

+    <string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string>

     <string name="settings.max_bitrate_32">32 Kbps</string>

     <string name="settings.max_bitrate_64">64 Kbps</string>

     <string name="settings.max_bitrate_80">80 Kbps</string>

@@ -208,6 +208,18 @@
     <string name="settings.max_bitrate_192">192 Kbps</string>

     <string name="settings.max_bitrate_256">256 Kbps</string>

     <string name="settings.max_bitrate_320">320 Kbps</string>

+	<string name="settings.max_video_bitrate_wifi">Max Video bitrate - Wi-Fi</string>

+    <string name="settings.max_video_bitrate_mobile">Max Video bitrate - Mobile</string>

+	<string name="settings.max_video_bitrate_200">200 Kbps</string>

+    <string name="settings.max_video_bitrate_300">300 Kbps</string>

+    <string name="settings.max_video_bitrate_400">400 Kbps</string>

+    <string name="settings.max_video_bitrate_500">500 Kbps</string>

+    <string name="settings.max_video_bitrate_700">700 Kbps</string>

+    <string name="settings.max_video_bitrate_1000">1000 Kbps</string>

+    <string name="settings.max_video_bitrate_1500">1500 Kbps</string>

+    <string name="settings.max_video_bitrate_2000">2000 Kbps</string>

+    <string name="settings.max_video_bitrate_3000">3000 Kbps</string>

+    <string name="settings.max_video_bitrate_5000">5000 Kbps</string>

     <string name="settings.max_bitrate_unlimited">Unlimited</string>

     <string name="settings.wifi_required_title">Wi-Fi streaming only</string>

     <string name="settings.wifi_required_summary">Only stream media if connected to Wi-Fi</string>

diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index ebb19e03..d6570e85 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -131,6 +131,20 @@
                 android:defaultValue="0"
                 android:entryValues="@array/maxBitrateValues"
                 android:entries="@array/maxBitrateNames"/>
+				
+		<ListPreference
+			android:title="@string/settings.max_video_bitrate_wifi"
+			android:key="maxVideoBitrateWifi"
+			android:defaultValue="0"
+			android:entryValues="@array/maxVideoBitrateValues"
+			android:entries="@array/maxVideoBitrateNames"/>
+
+		<ListPreference
+			android:title="@string/settings.max_video_bitrate_mobile"
+			android:key="maxVideoBitrateMobile"
+			android:defaultValue="0"
+			android:entryValues="@array/maxVideoBitrateValues"
+			android:entries="@array/maxVideoBitrateNames"/>
 
         <CheckBoxPreference
                 android:title="@string/settings.wifi_required_title"