Skip to content

Change playback speed gesture scrollbar strategy to quadratic #259

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

Merged
polymorphicshade merged 1 commit into from
Aug 3, 2025
Merged

Change playback speed gesture scrollbar strategy to quadratic #259

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
26 changes: 19 additions & 7 deletions app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import org.schabi.newpipe.player.helper.PlaybackParameterDialog
import org.schabi.newpipe.player.helper.PlayerHelper
import org.schabi.newpipe.player.helper.PlayerSemitoneHelper
import org.schabi.newpipe.player.ui.MainPlayerUi
import org.schabi.newpipe.util.SliderStrategy
import org.schabi.newpipe.util.ThemeHelper.getAndroidDimenPx
import kotlin.math.abs
import kotlin.math.roundToInt
Expand Down Expand Up @@ -158,27 +159,38 @@ class MainPlayerGestureListener(
val bar: ProgressBar = binding.playbackSpeedProgressBar
val maxPlaybackSpeed: Float = PlaybackParameterDialog.getMaxPitchOrSpeed()
val minPlaybackSpeed: Float = PlaybackParameterDialog.getMinPitchOrSpeed()
val playbackSpeedStep: Float = PlaybackParameterDialog.getCurrentStepSize(player.context) / maxPlaybackSpeed
val playbackSpeedStep: Float = PlaybackParameterDialog.getCurrentStepSize(player.context)

val quadraticStrategy: SliderStrategy = SliderStrategy.Quadratic(
PlaybackParameterDialog.getMinPitchOrSpeed().toDouble(),
PlaybackParameterDialog.getMaxPitchOrSpeed().toDouble(),
1.0,
bar.max
)

// If we just started sliding, change the progress bar to match the current playback speed
if (!binding.playbackSpeedRelativeLayout.isVisible) {
val playbackSpeedPercent: Float = player.playbackSpeed / maxPlaybackSpeed
bar.progress = (playbackSpeedPercent * bar.max).toInt()
bar.progress = quadraticStrategy.progressOf(player.playbackSpeed.toDouble()).coerceIn(0, bar.max)
}

// Update progress bar
bar.incrementProgressBy(distanceY.toInt())

// Update playback speed
val currentProgressPercent: Float = (bar.progress / bar.max.toFloat() / playbackSpeedStep).roundToInt() * playbackSpeedStep
val currentPlaybackSpeed: Float = (currentProgressPercent * maxPlaybackSpeed).coerceIn(minPlaybackSpeed, maxPlaybackSpeed)
// Use quadratic strategy to convert progress back to playback speed
val currentPlaybackSpeed: Float =
(
(quadraticStrategy.valueOf(bar.progress).toFloat() / playbackSpeedStep).roundToInt() *
playbackSpeedStep
).coerceIn(minPlaybackSpeed, maxPlaybackSpeed)

player.playbackSpeed = currentPlaybackSpeed
if (!PlaybackParameterDialog.getPlaybackUnhooked(player.context)) {
if (!PlaybackParameterDialog.getPitchControlModeSemitone(player.context)) {
player.playbackPitch = currentPlaybackSpeed
} else {
player.playbackPitch = PlayerSemitoneHelper.semitonesToPercent(PlayerSemitoneHelper.percentToSemitones(currentPlaybackSpeed.toDouble())).toFloat()
player.playbackPitch = PlayerSemitoneHelper.semitonesToPercent(
PlayerSemitoneHelper.percentToSemitones(currentPlaybackSpeed.toDouble())
).toFloat()
}
}

Expand Down