Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed wrong shuffle flag

This commit is contained in:
zelva 2022-09-03 13:18:12 +03:00 committed by TobiGr
parent b41f52e5d6
commit deed486159
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
View File

@ -77,19 +77,21 @@ public abstract class PlayQueue implements Serializable {
* Also starts a self reporter for logging if debug mode is enabled.
* </p>
*/
public synchronized void init() { // todo: cas mechanics
BehaviorSubject<PlayQueueEvent> b = BehaviorSubject.create();
public synchronized void init() {
if (broadcastReceiver == null || eventBroadcast == null) {
BehaviorSubject<PlayQueueEvent> b = BehaviorSubject.create();
broadcastReceiver = b.toFlowable(BackpressureStrategy.BUFFER)
.observeOn(AndroidSchedulers.mainThread())
.startWithItem(new InitEvent());
eventBroadcast = b;
broadcastReceiver = b.toFlowable(BackpressureStrategy.BUFFER)
.observeOn(AndroidSchedulers.mainThread())
.startWithItem(new InitEvent());
eventBroadcast = b;
}
}
/**
* Dispose the play queue by stopping all message buses.
*/
public synchronized void dispose() { // todo: cas mechanics
public synchronized void dispose() {
if (eventBroadcast != null) {
eventBroadcast.onComplete();
}
@ -447,9 +449,9 @@ public abstract class PlayQueue implements Serializable {
// Create a backup if it doesn't already exist
// Note: The backup-list has to be created at all cost (even when size <= 2).
// Otherwise it's not possible to enter shuffle-mode!
if (backup == null) {
backup = new ArrayList<>(streams);
}
List<PlayQueueItem> copy = backup == null ? new ArrayList<>(streams) : null;
// Can't shuffle a list that's empty or only has one element
if (size() <= 2) {
return;
@ -467,6 +469,9 @@ public abstract class PlayQueue implements Serializable {
history.add(currentItem);
if (copy != null)
backup = copy;
broadcast(new ReorderEvent(originalIndex, 0));
}
@ -488,6 +493,7 @@ public abstract class PlayQueue implements Serializable {
final PlayQueueItem current = getItem(originIndex);
streams = backup;
// storeStoreFence
backup = null;
final int newIndex = streams.indexOf(current);
@ -535,10 +541,11 @@ public abstract class PlayQueue implements Serializable {
return false;
}
synchronized (this) {
if (size() != other.size()) {
final int size = size();
if (size != other.size()) {
return false;
}
for (int i = 0; i < size(); i++) {
for (int i = 0; i < size; i++) {
final PlayQueueItem stream = streams.get(i);
final PlayQueueItem otherStream = other.streams.get(i);
// Check is based on serviceId and URL