mirror of
https://github.com/MaintainTeam/LastPipeBender.git
synced 2025-03-01 05:48:22 +03:00
Merge pull request #48 from mikooomich/dev
Fix unskip on certain segment
This commit is contained in:
commit
d8dd9f834a
1 changed files with 10 additions and 6 deletions
|
@ -2501,7 +2501,13 @@ public final class Player implements PlaybackListener, Listener {
|
||||||
if (lastSegment != null
|
if (lastSegment != null
|
||||||
&& progress > lastSegment.endTime + UNSKIP_WINDOW_MILLIS) {
|
&& progress > lastSegment.endTime + UNSKIP_WINDOW_MILLIS) {
|
||||||
// un-skip window is over
|
// un-skip window is over
|
||||||
destroyUnskipVars();
|
hideUnskipButtons();
|
||||||
|
lastSegment = null;
|
||||||
|
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) {
|
||||||
|
@ -2509,17 +2515,15 @@ public final class Player implements PlaybackListener, Listener {
|
||||||
return lastSegment;
|
return lastSegment;
|
||||||
}
|
}
|
||||||
|
|
||||||
destroyUnskipVars();
|
hideUnskipButtons();
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void destroyUnskipVars() {
|
private void hideUnskipButtons() {
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
Log.d("SPONSOR_BLOCK", "Destroying last segment variables, hiding manual skip buttons");
|
Log.d("SPONSOR_BLOCK", "Hiding manual skip buttons (UNSKIP)");
|
||||||
}
|
}
|
||||||
lastSegment = null;
|
|
||||||
autoSkipGracePeriod = false;
|
|
||||||
UIs.call(PlayerUi::hideAutoSkip);
|
UIs.call(PlayerUi::hideAutoSkip);
|
||||||
UIs.call(PlayerUi::hideAutoUnskip);
|
UIs.call(PlayerUi::hideAutoUnskip);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue