MaintainTeam/LastPipeBender
1
0
Fork 0
mirror of https://github.com/MaintainTeam/LastPipeBender.git synced 2025-03-01 05:48:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Destroy unskip tracking variables when non-graced rewinding

Browse source 
* Also add back destroyUnskipVars() helper
This commit is contained in:
mikooomich 2024-05-12 21:42:00 -04:00
parent b25b1e2dc4
commit 02deb69e25
No known key found for this signature in database
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/schabi/newpipe/player/Player.java
View file

@ -1056,7 +1056,10 @@ public final class Player implements PlaybackListener, Listener {
seekTo(skipTarget); seekTo(skipTarget);
simpleExoPlayer.setSeekParameters(seekParams); simpleExoPlayer.setSeekParameters(seekParams);
lastSegment = sponsorBlockSegment; if (!isRewind || isGracedRewind) {
// DO NOT TRACK for non-graced rewinds to work, BUT always track for graced
lastSegment = sponsorBlockSegment;
}
if (isUnSkip) { if (isUnSkip) {
return; return;
@ -1881,6 +1884,7 @@ public final class Player implements PlaybackListener, Listener {
return; return;
} }
destroyUnskipVars(); // destroy, else rewind into segment won't skip
triggerProgressUpdate(true); triggerProgressUpdate(true);
} }
//endregion //endregion
@ -2502,12 +2506,7 @@ public final class Player implements PlaybackListener, Listener {
&& progress > lastSegment.endTime + UNSKIP_WINDOW_MILLIS) { && progress > lastSegment.endTime + UNSKIP_WINDOW_MILLIS) {
// un-skip window is over // un-skip window is over
hideUnskipButtons(); hideUnskipButtons();
lastSegment = null; destroyUnskipVars();
autoSkipGracePeriod = false;
if (DEBUG) {
Log.d("SPONSOR_BLOCK", "Destroyed last segment variables (UNSKIP)");
}
} else if (lastSegment != null } else if (lastSegment != null
&& progress < lastSegment.endTime + UNSKIP_WINDOW_MILLIS && progress < lastSegment.endTime + UNSKIP_WINDOW_MILLIS
&& progress >= lastSegment.startTime) { && progress >= lastSegment.startTime) {
@ -2528,6 +2527,15 @@ public final class Player implements PlaybackListener, Listener {
UIs.call(PlayerUi::hideAutoUnskip); UIs.call(PlayerUi::hideAutoUnskip);
} }
private void destroyUnskipVars() {
lastSegment = null;
autoSkipGracePeriod = false;
if (DEBUG) {
Log.d("SPONSOR_BLOCK", "Destroyed last segment variables (UNSKIP)");
}
}
private SponsorBlockSecondaryMode getSecondaryMode(final SponsorBlockSegment segment) { private SponsorBlockSecondaryMode getSecondaryMode(final SponsorBlockSegment segment) {
if (segment == null) { if (segment == null) {
return SponsorBlockSecondaryMode.DISABLED; return SponsorBlockSecondaryMode.DISABLED;