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

Merge pull request #1509 from karyogamy/main-video-player-fix 

Main video player fix
This commit is contained in:
Christian Schabesberger 2018-06-28 12:00:54 +02:00 committed by GitHub
parent 2d39e65b5c ef16145695
commit 43e7be9b86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
View File

@ -1147,11 +1147,11 @@ public abstract class BasePlayer implements
@Player.RepeatMode @Player.RepeatMode
public int getRepeatMode() { public int getRepeatMode() {
return simpleExoPlayer.getRepeatMode(); return simpleExoPlayer == null ? Player.REPEAT_MODE_OFF : simpleExoPlayer.getRepeatMode();
} }
public void setRepeatMode(@Player.RepeatMode final int repeatMode) { public void setRepeatMode(@Player.RepeatMode final int repeatMode) {
simpleExoPlayer.setRepeatMode(repeatMode); if (simpleExoPlayer != null) simpleExoPlayer.setRepeatMode(repeatMode);
} }
public float getPlaybackSpeed() { public float getPlaybackSpeed() {

11
app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
View File

@ -153,8 +153,11 @@ public final class MainVideoPlayer extends AppCompatActivity
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]"); if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
super.onNewIntent(intent); super.onNewIntent(intent);
if (intent != null) {
playerState = null;
playerImpl.handleIntent(intent); playerImpl.handleIntent(intent);
} }
}
@Override @Override
protected void onResume() { protected void onResume() {
@ -219,11 +222,10 @@ public final class MainVideoPlayer extends AppCompatActivity
getWindow().getAttributes().screenBrightness); getWindow().getAttributes().screenBrightness);
if (playerImpl == null) return; if (playerImpl == null) return;
if (isBackPressed) { if (!isBackPressed) {
playerImpl.destroy();
} else {
playerImpl.minimize(); playerImpl.minimize();
} }
playerImpl.destroy();
isInMultiWindow = false; isInMultiWindow = false;
isBackPressed = false; isBackPressed = false;
@ -465,7 +467,8 @@ public final class MainVideoPlayer extends AppCompatActivity
onFullScreenButtonClicked(); onFullScreenButtonClicked();
break; break;
case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE: case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE:
destroy(); default:
// No action
break; break;
} }
} }