diff options
-rw-r--r-- | res/values-es/strings.xml | 1 | ||||
-rw-r--r-- | res/values-hu/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ru/strings.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | res/xml/settings.xml | 6 | ||||
-rw-r--r-- | src/github/daneren2005/dsub/activity/SettingsActivity.java | 3 | ||||
-rw-r--r-- | src/github/daneren2005/dsub/service/DownloadServiceImpl.java | 9 | ||||
-rw-r--r-- | src/github/daneren2005/dsub/util/Constants.java | 1 |
8 files changed, 2 insertions, 23 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5dd4cdda..cb245e83 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -308,7 +308,6 @@ <string name="settings.screen_lit_summary">Mantener la pantalla encendida durantes las descargas mejora la velocidad de descarga.</string> <string name="settings.playlist_title">Listas de reproducción</string> <string name="settings.playlist_random_size_title">Tamaño aleatorio</string> - <string name="settings.buffer_length">Tamaño del buffer (0 = totalmente en caché)</string> <string name="settings.sleep_timer_title">Temporizador</string> <string name="settings.sleep_timer_duration_title">Duración del temporizador</string> <string name="settings.sleep_timer_off">Encendido</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index c4f50fdd..afe5db36 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -325,7 +325,6 @@ <string name="settings.screen_lit_summary">Képernyő ébrentartása a letöltés alatt, a magasabb letöltési sebesség érdekében.</string>
<string name="settings.playlist_title">Lejátszási listák</string>
<string name="settings.playlist_random_size_title">Véletlenszerű lejátszási lista mérete</string>
- <string name="settings.buffer_length">Pufferméret (0 = teljes gyorsítótárazás)</string>
<string name="settings.sleep_timer_title">Alvás időzítő</string>
<string name="settings.sleep_timer_duration_title">Alvás időzítő időtartam</string>
<string name="settings.sleep_timer_off">Ki</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 2671a8b6..f53a421c 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -234,7 +234,6 @@ <string name="settings.screen_lit_summary">Оставить экран включенным для повышения скорости при скачивании.</string>
<string name="settings.playlist_title">Списки воспроизведения</string>
<string name="settings.playlist_random_size_title">Размер случайного списка</string>
- <string name="settings.buffer_length">Размер буфера (0 = кешировать полностью)</string>
<string name="settings.sleep_timer_title">Таймер сна</string>
<string name="settings.sleep_timer_duration_title">Продолжительность таймера сна</string>
<string name="settings.sleep_timer_off">Выключен</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml index 7abcbd28..1d4398f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -272,7 +272,7 @@ <string name="settings.track_title">Display Track #</string>
<string name="settings.track_summary">Display Track # in front of songs if one exists</string>
<string name="settings.custom_sort">Custom Sort</string>
- <string name="settings.custom_sort_summary">Sort directory listings to properly sort by disc number. Interferes with the servers sort albums by year.</string>
+ <string name="settings.custom_sort_summary">Override default server sorting to sort by disc number and by year.</string>
<string name="settings.network_title">Network</string>
<string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>
<string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string>
@@ -328,7 +328,6 @@ <string name="settings.screen_lit_summary">Keeping the screen on while downloading improves download speed.</string>
<string name="settings.playlist_title">Play</string>
<string name="settings.playlist_random_size_title">Random Size</string>
- <string name="settings.buffer_length">Buffer Length (0 = when fully cached)</string>
<string name="settings.sleep_timer_title">Sleep Timer</string>
<string name="settings.sleep_timer_duration_title">Sleep Timer Duration</string>
<string name="settings.sleep_timer_off">Off</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 30b2e584..573da94b 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -278,12 +278,6 @@ android:title="@string/settings.playback_title"> <EditTextPreference - android:title="@string/settings.buffer_length" - android:key="bufferLength" - android:defaultValue="5" - android:digits="0123456789"/> - - <EditTextPreference android:title="@string/settings.playlist_random_size_title" android:key="randomSize" android:defaultValue="20" diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java index 7cebdbdd..40ca5570 100644 --- a/src/github/daneren2005/dsub/activity/SettingsActivity.java +++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java @@ -77,7 +77,6 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer private EditTextPreference randomSize; private ListPreference tempLoss; private ListPreference pauseDisconnect; - private EditTextPreference bufferLength; private Preference addServerPreference; private PreferenceCategory serversCategory; private EditTextPreference chatRefreshRate; @@ -119,7 +118,6 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer randomSize = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_RANDOM_SIZE); tempLoss = (ListPreference) findPreference(Constants.PREFERENCES_KEY_TEMP_LOSS); pauseDisconnect = (ListPreference) findPreference(Constants.PREFERENCES_KEY_PAUSE_DISCONNECT); - bufferLength = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_BUFFER_LENGTH); serversCategory = (PreferenceCategory) findPreference(Constants.PREFERENCES_KEY_SERVER_KEY); addServerPreference = (Preference) findPreference(Constants.PREFERENCES_KEY_SERVER_ADD); chatRefreshRate = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_CHAT_REFRESH); @@ -303,7 +301,6 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer randomSize.setSummary(randomSize.getText()); tempLoss.setSummary(tempLoss.getEntry()); pauseDisconnect.setSummary(pauseDisconnect.getEntry()); - bufferLength.setSummary(bufferLength.getText() + " seconds"); chatRefreshRate.setSummary(chatRefreshRate.getText()); videoPlayer.setSummary(videoPlayer.getEntry()); syncInterval.setSummary(syncInterval.getEntry()); diff --git a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java index 19e7625c..9f1e5ee9 100644 --- a/src/github/daneren2005/dsub/service/DownloadServiceImpl.java +++ b/src/github/daneren2005/dsub/service/DownloadServiceImpl.java @@ -1622,16 +1622,9 @@ public class DownloadServiceImpl extends Service implements DownloadService { this.position = position; partialFile = downloadFile.getPartialFile(); - SharedPreferences prefs = Util.getPreferences(DownloadServiceImpl.this); - long bufferLength = Integer.parseInt(prefs.getString(Constants.PREFERENCES_KEY_BUFFER_LENGTH, "5")); - if(bufferLength == 0) { - // Set to seconds in a day, basically infinity - bufferLength = 86400L; - } - // Calculate roughly how many bytes BUFFER_LENGTH_SECONDS corresponds to. int bitRate = downloadFile.getBitRate(); - long byteCount = Math.max(100000, bitRate * 1024L / 8L * bufferLength); + long byteCount = Math.max(100000, bitRate * 1024L / 8L * 5L); // Find out how large the file should grow before resuming playback. Log.i(TAG, "Buffering from position " + position + " and bitrate " + bitRate); diff --git a/src/github/daneren2005/dsub/util/Constants.java b/src/github/daneren2005/dsub/util/Constants.java index c6dd49f2..aa4fe62a 100644 --- a/src/github/daneren2005/dsub/util/Constants.java +++ b/src/github/daneren2005/dsub/util/Constants.java @@ -112,7 +112,6 @@ public final class Constants { public static final String PREFERENCES_KEY_SHUFFLE_END_YEAR = "endYear"; public static final String PREFERENCES_KEY_SHUFFLE_GENRE = "genre"; public static final String PREFERENCES_KEY_KEEP_SCREEN_ON = "keepScreenOn"; - public static final String PREFERENCES_KEY_BUFFER_LENGTH = "bufferLength"; public static final String PREFERENCES_EQUALIZER_ON = "equalizerOn"; public static final String PREFERENCES_VISUALIZER_ON = "visualizerOn"; public static final String PREFERENCES_EQUALIZER_SETTINGS = "equalizerSettings"; |