Refactored code

Author: litetex

app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java

@@ -44,8 +44,8 @@ public class PlaybackParameterDialog extends DialogFragment {
     private static final String TAG = "PlaybackParameterDialog";
 
     // Minimum allowable range in ExoPlayer
-    private static final double MIN_PLAYBACK_VALUE = 0.10f;
-    private static final double MAX_PLAYBACK_VALUE = 3.00f;
+    private static final double MIN_PITCH_OR_SPEED = 0.10f;
+    private static final double MAX_PITCH_OR_SPEED = 3.00f;
 
     private static final boolean PITCH_CTRL_MODE_PERCENT = false;
     private static final boolean PITCH_CTRL_MODE_SEMITONE = true;
@@ -62,8 +62,8 @@ public class PlaybackParameterDialog extends DialogFragment {
     private static final boolean DEFAULT_SKIP_SILENCE = false;
 
     private static final SliderStrategy QUADRATIC_STRATEGY = new SliderStrategy.Quadratic(
-            MIN_PLAYBACK_VALUE,
-            MAX_PLAYBACK_VALUE,
+            MIN_PITCH_OR_SPEED,
+            MAX_PITCH_OR_SPEED,
             1.00f,
             10_000);
 
@@ -177,10 +177,10 @@ public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
 
     private void initUI() {
         // Tempo
-        setText(binding.tempoMinimumText, PlayerHelper::formatSpeed, MIN_PLAYBACK_VALUE);
-        setText(binding.tempoMaximumText, PlayerHelper::formatSpeed, MAX_PLAYBACK_VALUE);
+        setText(binding.tempoMinimumText, PlayerHelper::formatSpeed, MIN_PITCH_OR_SPEED);
+        setText(binding.tempoMaximumText, PlayerHelper::formatSpeed, MAX_PITCH_OR_SPEED);
 
-        binding.tempoSeekbar.setMax(QUADRATIC_STRATEGY.progressOf(MAX_PLAYBACK_VALUE));
+        binding.tempoSeekbar.setMax(QUADRATIC_STRATEGY.progressOf(MAX_PITCH_OR_SPEED));
         setAndUpdateTempo(tempo);
         binding.tempoSeekbar.setOnSeekBarChangeListener(
                 getTempoOrPitchSeekbarChangeListener(
@@ -215,10 +215,10 @@ private void initUI() {
         changePitchControlMode(isCurrentPitchControlModeSemitone());
 
         // Pitch - Percent
-        setText(binding.pitchPercentMinimumText, PlayerHelper::formatPitch, MIN_PLAYBACK_VALUE);
-        setText(binding.pitchPercentMaximumText, PlayerHelper::formatPitch, MAX_PLAYBACK_VALUE);
+        setText(binding.pitchPercentMinimumText, PlayerHelper::formatPitch, MIN_PITCH_OR_SPEED);
+        setText(binding.pitchPercentMaximumText, PlayerHelper::formatPitch, MAX_PITCH_OR_SPEED);
 
-        binding.pitchPercentSeekbar.setMax(QUADRATIC_STRATEGY.progressOf(MAX_PLAYBACK_VALUE));
+        binding.pitchPercentSeekbar.setMax(QUADRATIC_STRATEGY.progressOf(MAX_PITCH_OR_SPEED));
         setAndUpdatePitch(pitchPercent);
         binding.pitchPercentSeekbar.setOnSeekBarChangeListener(
                 getTempoOrPitchSeekbarChangeListener(
@@ -557,12 +557,12 @@ private void setAndUpdatePitch(final double newPitch) {
     }
 
     private double calcValidTempo(final double newTempo) {
-        return Math.max(MIN_PLAYBACK_VALUE, Math.min(MAX_PLAYBACK_VALUE, newTempo));
+        return Math.max(MIN_PITCH_OR_SPEED, Math.min(MAX_PITCH_OR_SPEED, newTempo));
     }
 
     private double calcValidPitch(final double newPitch) {
         final double calcPitch =
-                Math.max(MIN_PLAYBACK_VALUE, Math.min(MAX_PLAYBACK_VALUE, newPitch));
+                Math.max(MIN_PITCH_OR_SPEED, Math.min(MAX_PITCH_OR_SPEED, newPitch));
 
         if (!isCurrentPitchControlModeSemitone()) {
             return calcPitch;

app/src/main/java/org/schabi/newpipe/player/helper/PlayerSemitoneHelper.java

@@ -9,7 +9,7 @@
  * </a>
  */
 public final class PlayerSemitoneHelper {
-    public static final int TONES = 12;
+    public static final int SEMITONE_COUNT = 12;
 
     private PlayerSemitoneHelper() {
         // No impl
@@ -24,14 +24,15 @@ public static String formatPitchSemitones(final int semitones) {
     }
 
     public static double semitonesToPercent(final int semitones) {
-        return Math.pow(2, ensureSemitonesInRange(semitones) / (double) TONES);
+        return Math.pow(2, ensureSemitonesInRange(semitones) / (double) SEMITONE_COUNT);
     }
 
     public static int percentToSemitones(final double percent) {
-        return ensureSemitonesInRange((int) Math.round(TONES * Math.log(percent) / Math.log(2)));
+        return ensureSemitonesInRange(
+                (int) Math.round(SEMITONE_COUNT * Math.log(percent) / Math.log(2)));
     }
 
     private static int ensureSemitonesInRange(final int semitones) {
-        return Math.max(-TONES, Math.min(TONES, semitones));
+        return Math.max(-SEMITONE_COUNT, Math.min(SEMITONE_COUNT, semitones));
     }
 }