diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2012-07-07 11:23:48 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2012-07-07 11:23:48 -0700 |
| commit | 3e560496b7951cda1724fa2580ee0601dbe5b88c (patch) | |
| tree | f8d0ad5573433724796cae42a699b078f3f1d7e4 /subsonic-android/res | |
| parent | 912fe4c2e67c3a13debc4c80c612e7209085f75f (diff) | |
| download | dsub-3e560496b7951cda1724fa2580ee0601dbe5b88c.tar.gz dsub-3e560496b7951cda1724fa2580ee0601dbe5b88c.tar.bz2 dsub-3e560496b7951cda1724fa2580ee0601dbe5b88c.zip | |
Basic Network Timeout setting
Diffstat (limited to 'subsonic-android/res')
| -rw-r--r-- | subsonic-android/res/values/arrays.xml | 15 | ||||
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | subsonic-android/res/xml/settings.xml | 7 |
3 files changed, 29 insertions, 0 deletions
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml index 087206a9..17ea4b6a 100644 --- a/subsonic-android/res/values/arrays.xml +++ b/subsonic-android/res/values/arrays.xml @@ -58,5 +58,20 @@ <item>@string/settings.max_bitrate_320</item> <item>@string/settings.max_bitrate_unlimited</item> </string-array> + + <string-array name="networkTimeoutValues"> + <item>10000</item> + <item>15000</item> + <item>30000</item> + <item>45000</item> + <item>60000</item> + </string-array> + <string-array name="networkTimeoutNames"> + <item>@string/settings.network_timeout_10000</item> + <item>@string/settings.network_timeout_15000</item> + <item>@string/settings.network_timeout_30000</item> + <item>@string/settings.network_timeout_45000</item> + <item>@string/settings.network_timeout_60000</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 6acfed87..47487e43 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -157,11 +157,18 @@ <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>
+ <string name="settings.network_timeout_title">Network Timeout</string>
+ <string name="settings.network_timeout_10000">10 seconds</string>
+ <string name="settings.network_timeout_15000">15 seconds</string>
+ <string name="settings.network_timeout_30000">30 seconds</string>
+ <string name="settings.network_timeout_45000">45 seconds</string>
+ <string name="settings.network_timeout_60000">60 seconds</string>
<string name="settings.preload_1">1 song</string>
<string name="settings.preload_2">2 songs</string>
<string name="settings.preload_3">3 songs</string>
<string name="settings.preload_5">5 songs</string>
<string name="settings.preload_10">10 songs</string>
+ <string name="settings.preload_unlimited">Unlimited</string>
<string name="settings.clear_search_history">Clear search history</string>
<string name="settings.search_history_cleared">Search history cleared</string>
<string name="settings.other_title">Other settings</string>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml index 4e4cd7dd..21d0568a 100644 --- a/subsonic-android/res/xml/settings.xml +++ b/subsonic-android/res/xml/settings.xml @@ -137,6 +137,13 @@ android:summary="@string/settings.wifi_required_summary" android:key="wifiRequiredForDownload" android:defaultValue="false"/> + + <ListPreference + android:title="@string/settings.network_timeout_title" + android:key="networkTimeout" + android:defaultValue="15000" + android:entryValues="@array/networkTimeoutValues" + android:entries="@array/networkTimeoutNames"/> </PreferenceCategory> |