baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

SponsorBlock: Fixed some dumb issues related to storing video segments

Browse source
This commit is contained in:
polymorphicshade 2020-12-12 13:55:42 -07:00
parent 8e7238cd54
commit 53f9e6b0a8
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file

@ -265,7 +265,6 @@ public final class VideoDetailFragment
final MainPlayer connectedPlayerService, final MainPlayer connectedPlayerService,
final boolean playAfterConnect) { final boolean playAfterConnect) {
player = connectedPlayer; player = connectedPlayer;
player.setVideoSegments(videoSegments);
playerService = connectedPlayerService; playerService = connectedPlayerService;
@ -1156,6 +1155,7 @@ public final class VideoDetailFragment
playerService.getView().setVisibility(View.GONE); playerService.getView().setVisibility(View.GONE);
} }
addVideoPlayerView(); addVideoPlayerView();
playerService.setVideoSegments(videoSegments);
final Intent playerIntent = NavigationHelper final Intent playerIntent = NavigationHelper
.getPlayerIntent(requireContext(), MainPlayer.class, queue, true, autoPlayEnabled); .getPlayerIntent(requireContext(), MainPlayer.class, queue, true, autoPlayEnabled);

8
app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
View file

@ -117,7 +117,6 @@ public abstract class BasePlayer implements
@NonNull @NonNull
protected final SharedPreferences mPrefs; protected final SharedPreferences mPrefs;
private boolean wereSponsorsMarked;
private VideoSegment[] videoSegments; private VideoSegment[] videoSegments;
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
@ -1770,13 +1769,6 @@ public abstract class BasePlayer implements
} }
public void setVideoSegments(final VideoSegment[] videoSegments) { public void setVideoSegments(final VideoSegment[] videoSegments) {
// use a flag to ignore null values later (i.e. when the video goes fullscreen)
// TODO: there's probably a better way to deal with stuff like that
if (wereSponsorsMarked) {
return;
}
this.videoSegments = videoSegments; this.videoSegments = videoSegments;
wereSponsorsMarked = true;
} }
} }

5
app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
View file

@ -35,6 +35,7 @@ import androidx.core.content.ContextCompat;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.util.VideoSegment;
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage; import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
@ -254,6 +255,10 @@ public final class MainPlayer extends Service {
} }
} }
public void setVideoSegments(final VideoSegment[] videoSegments) {
playerImpl.setVideoSegments(videoSegments);
}
public class LocalBinder extends Binder { public class LocalBinder extends Binder {

1
app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
View file

@ -634,6 +634,7 @@ public abstract class VideoPlayer extends BasePlayer
} }
final MarkableSeekBar markableSeekBar = (MarkableSeekBar) playbackSeekBar; final MarkableSeekBar markableSeekBar = (MarkableSeekBar) playbackSeekBar;
markableSeekBar.seekBarMarkers.clear();
for (final VideoSegment segment : segments) { for (final VideoSegment segment : segments) {
final Integer color = parseSegmentCategory(segment.category); final Integer color = parseSegmentCategory(segment.category);