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

-Fixed player database and progress disposable disposed when destroying exoplayer.

Browse source 
-Fixed livestream not reloading on behind live window exception.
-Added nonnull annotation to player intent strings.
This commit is contained in:
John Zhen Mo 2018-05-23 20:18:48 -07:00
parent 0ece4851d2
commit 157b064214
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,14 +117,14 @@ public abstract class BasePlayer implements
// Intent // Intent
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
public static final String REPEAT_MODE = "repeat_mode"; @NonNull public static final String REPEAT_MODE = "repeat_mode";
public static final String PLAYBACK_PITCH = "playback_pitch"; @NonNull public static final String PLAYBACK_PITCH = "playback_pitch";
public static final String PLAYBACK_SPEED = "playback_speed"; @NonNull public static final String PLAYBACK_SPEED = "playback_speed";
public static final String PLAYBACK_SKIP_SILENCE = "playback_skip_silence"; @NonNull public static final String PLAYBACK_SKIP_SILENCE = "playback_skip_silence";
public static final String PLAYBACK_QUALITY = "playback_quality"; @NonNull public static final String PLAYBACK_QUALITY = "playback_quality";
public static final String PLAY_QUEUE_KEY = "play_queue_key"; @NonNull public static final String PLAY_QUEUE_KEY = "play_queue_key";
public static final String APPEND_ONLY = "append_only"; @NonNull public static final String APPEND_ONLY = "append_only";
public static final String SELECT_ON_APPEND = "select_on_append"; @NonNull public static final String SELECT_ON_APPEND = "select_on_append";
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
// Playback // Playback
@ -276,7 +276,6 @@ public abstract class BasePlayer implements
if (playQueue != null) playQueue.dispose(); if (playQueue != null) playQueue.dispose();
if (audioReactor != null) audioReactor.dispose(); if (audioReactor != null) audioReactor.dispose();
if (playbackManager != null) playbackManager.dispose(); if (playbackManager != null) playbackManager.dispose();
if (databaseUpdateReactor != null) databaseUpdateReactor.dispose();
if (mediaSessionManager != null) mediaSessionManager.dispose(); if (mediaSessionManager != null) mediaSessionManager.dispose();
if (playQueueAdapter != null) { if (playQueueAdapter != null) {
@ -290,9 +289,9 @@ public abstract class BasePlayer implements
destroyPlayer(); destroyPlayer();
unregisterBroadcastReceiver(); unregisterBroadcastReceiver();
if (mediaSessionManager != null) mediaSessionManager.dispose(); databaseUpdateReactor.clear();
progressUpdateReactor.set(null);
mediaSessionManager = null;
simpleExoPlayer = null; simpleExoPlayer = null;
} }
@ -635,7 +634,7 @@ public abstract class BasePlayer implements
setRecovery(); setRecovery();
final Throwable cause = error.getCause(); final Throwable cause = error.getCause();
if (cause instanceof BehindLiveWindowException) { if (error instanceof BehindLiveWindowException) {
reload(); reload();
} else if (cause instanceof UnknownHostException) { } else if (cause instanceof UnknownHostException) {
playQueue.error(/*isNetworkProblem=*/true); playQueue.error(/*isNetworkProblem=*/true);
@ -942,11 +941,12 @@ public abstract class BasePlayer implements
private void registerView() { private void registerView() {
if (currentMetadata == null) return; if (currentMetadata == null) return;
final StreamInfo currentInfo = currentMetadata.getMetadata(); final StreamInfo currentInfo = currentMetadata.getMetadata();
databaseUpdateReactor.add(recordManager.onViewed(currentInfo).onErrorComplete() final Disposable viewRegister = recordManager.onViewed(currentInfo).onErrorComplete()
.subscribe( .subscribe(
ignored -> {/* successful */}, ignored -> {/* successful */},
error -> Log.e(TAG, "Player onViewed() failure: ", error) error -> Log.e(TAG, "Player onViewed() failure: ", error)
)); );
databaseUpdateReactor.add(viewRegister);
} }
protected void reload() { protected void reload() {