Skip to content

feat: rename buffering strategy #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tvillega wants to merge 1 commit into
base: development
Choose a base branch
from
Open

feat: rename buffering strategy #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/com/cappielloantonio/tempo/service/BaseMediaService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import java.util.concurrent.Executors
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.ScheduledFuture
import java.util.concurrent.TimeUnit
import java.util.logging.Logger

private const val TAG = "BaseMediaService"

Expand Down Expand Up @@ -467,10 +468,11 @@ open class BaseMediaService : MediaLibraryService() {
}

private fun initializeLoadControl(): DefaultLoadControl {
val miliseconds: Int = TimeUnit.SECONDS.toMillis(Preferences.getBufferingStrategy().toLong()).toInt()
return DefaultLoadControl.Builder()
.setBufferDurationsMs(
(DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
(DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
miliseconds,
miliseconds,
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
)
Expand Down
38 changes: 38 additions & 0 deletions app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.os.LocaleListCompat;
import androidx.lifecycle.ViewModelProvider;
import androidx.media3.common.util.Log;
import androidx.media3.common.util.UnstableApi;
import androidx.navigation.NavController;
import androidx.navigation.NavOptions;
Expand All @@ -34,6 +35,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager;
import androidx.preference.SwitchPreference;

import com.cappielloantonio.tempo.BuildConfig;
Expand Down Expand Up @@ -109,6 +111,42 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
}
}
});

ListPreference bufferingPref = findPreference("buffering_strategy");

Context ctx = requireContext();
String selectedValue = PreferenceManager
.getDefaultSharedPreferences(ctx)
.getString("buffering_strategy", "1");

String[] titles = ctx.getResources().getStringArray(R.array.buffering_strategy_titles);
String[] values = ctx.getResources().getStringArray(R.array.buffering_strategy_values);

String title;
switch (selectedValue) {
case "5":
title = titles[0];
break;
case "30":
title = titles[1];
break;
case "60":
title = titles[2];
break;
case "180":
title = titles[3];
break;
case "300":
title = titles[4];
break;
default:
title = titles[2];
Log.e(TAG, "This is not working");
break;
}

String newSummary = ctx.getString(R.string.settings_buffering_strategy_summary, title);
bufferingPref.setSummary(newSummary);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ object Preferences {

@JvmStatic
fun getBufferingStrategy(): Double {
return App.getInstance().preferences.getString(BUFFERING_STRATEGY, "1")!!.toDouble()
return App.getInstance().preferences.getString(BUFFERING_STRATEGY, "60")!!.toDouble()
}

@JvmStatic
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-ca/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,16 +229,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Mínima</item>
<item>Moderada</item>
<item>Agressiva</item>
<item>Extrema</item>
<item>5 segons</item>
<item>30 segons</item>
<item>1 minuts</item>
<item>3 minuts</item>
<item>5 minuts</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-es-rES/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Mínimo</item>
<item>Moderado</item>
<item>Agresivo</item>
<item>Extremo</item>
<item>5 segundos</item>
<item>30 segundos</item>
<item>1 minuto</item>
<item>3 minutos</item>
<item>5 minutos</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="playlist_sort_option_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-fr/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Minimum</item>
<item>Modérée</item>
<item>Agressive</item>
<item>Extrême</item>
<item>5 secondes</item>
<item>30 secondes</item>
<item>1 minutes</item>
<item>3 minutes</item>
<item>5 minutes</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
20 changes: 11 additions & 9 deletions app/src/main/res/values-it/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,20 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Minimo</item>
<item>Moderato</item>
<item>Aggressivo</item>
<item>Estremo</item>
<item>5 secondi</item>
<item>30 secondi</item>
<item>1 minuto</item>
<item>3 minuti</item>
<item>5 minuti</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
<item>Minimo 0 stelle</item>
<item>Minimo 1 stella</item>
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-ko/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>최소한</item>
<item>보통</item>
<item>적극적</item>
<item>최대한</item>
<item>5초</item>
<item>30초</item>
<item>1분</item>
<item>3분</item>
<item>5분</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-pl/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Minimalna</item>
<item>Średnia</item>
<item>Agresywna</item>
<item>Ekstremalna</item>
<item>5 sekund</item>
<item>30 sekund</item>
<item>1 minuta</item>
<item>3 minuty</item>
<item>5 minut</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="playlist_sort_option_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-pt/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Mínimo</item>
<item>Moderado</item>
<item>Agressivo</item>
<item>Extremo</item>
<item>5 segundos</item>
<item>30 segundos</item>
<item>1 minuto</item>
<item>3 minutos</item>
<item>5 minutos</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-ro/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,16 +229,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Minim</item>
<item>Moderat</item>
<item>Agresiv</item>
<item>Extrem</item>
<item>5 secunde</item>
<item>30 de secunde</item>
<item>1 minut</item>
<item>3 minute</item>
<item>5 minute</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-ru/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Минимум</item>
<item>Умеренный</item>
<item>Агрессивный</item>
<item>Экстремальный</item>
<item>5 секунд</item>
<item>30 секунд</item>
<item>1 минута</item>
<item>3 минуты</item>
<item>5 минут</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-tr/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>Minimum</item>
<item>Moderate</item>
<item>Agrasif</item>
<item>Aşırı</item>
<item>5 saniye</item>
<item>30 saniye</item>
<item>1 dakika</item>
<item>3 dakika</item>
<item>5 dakika</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/values-zh/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,18 @@
</string-array>

<string-array name="buffering_strategy_titles">
<item>最小</item>
<item>适中</item>
<item>积极</item>
<item>极端</item>
<item>5秒</item>
<item>30秒</item>
<item>1分钟</item>
<item>3分钟</item>
<item>5分钟</item>
</string-array>
<string-array name="buffering_strategy_values">
<item>.1</item>
<item>1</item>
<item>4</item>
<item>8</item>
<item>5</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>300</item>
</string-array>

<string-array name="skip_min_star_rating_titles">
Expand Down
Loading