loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-05 22:50:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "don't call stop before preparing the player"

Browse Source 
This reverts commit 8efaf5fd7d5bdf1f55f35109a43380e8f7f6be0b.
This commit is contained in:
bachinger 2019-05-15 19:20:27 +01:00 committed by Oliver Woodman
parent 8efaf5fd7d
commit 6e581f5270
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
View File

@ -834,9 +834,10 @@ public final class MediaSessionConnector {
return player != null && mediaButtonEventHandler != null; return player != null && mediaButtonEventHandler != null;
} }
private void setPlayWhenReady(boolean playWhenReady) { private void stopPlayerForPrepare(boolean playWhenReady) {
if (player != null) { if (player != null) {
controlDispatcher.dispatchSetPlayWhenReady(player, playWhenReady); player.stop();
player.setPlayWhenReady(playWhenReady);
} }
} }
@ -1051,14 +1052,14 @@ public final class MediaSessionConnector {
} else if (player.getPlaybackState() == Player.STATE_ENDED) { } else if (player.getPlaybackState() == Player.STATE_ENDED) {
controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET); controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
} }
setPlayWhenReady(/* playWhenReady= */ true); controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ true);
} }
} }
@Override @Override
public void onPause() { public void onPause() {
if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PAUSE)) { if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_PAUSE)) {
setPlayWhenReady(/* playWhenReady= */ false); controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ false);
} }
} }
@ -1181,7 +1182,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPrepare() { public void onPrepare() {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE)) {
setPlayWhenReady(/* playWhenReady= */ false); stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepare(); playbackPreparer.onPrepare();
} }
} }
@ -1189,7 +1190,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPrepareFromMediaId(String mediaId, Bundle extras) { public void onPrepareFromMediaId(String mediaId, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID)) {
setPlayWhenReady(/* playWhenReady= */ false); stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepareFromMediaId(mediaId, extras); playbackPreparer.onPrepareFromMediaId(mediaId, extras);
} }
} }
@ -1197,7 +1198,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPrepareFromSearch(String query, Bundle extras) { public void onPrepareFromSearch(String query, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH)) {
setPlayWhenReady(/* playWhenReady= */ false); stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepareFromSearch(query, extras); playbackPreparer.onPrepareFromSearch(query, extras);
} }
} }
@ -1205,7 +1206,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPrepareFromUri(Uri uri, Bundle extras) { public void onPrepareFromUri(Uri uri, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_URI)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PREPARE_FROM_URI)) {
setPlayWhenReady(/* playWhenReady= */ false); stopPlayerForPrepare(/* playWhenReady= */ false);
playbackPreparer.onPrepareFromUri(uri, extras); playbackPreparer.onPrepareFromUri(uri, extras);
} }
} }
@ -1213,7 +1214,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPlayFromMediaId(String mediaId, Bundle extras) { public void onPlayFromMediaId(String mediaId, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID)) {
setPlayWhenReady(/* playWhenReady= */ true); stopPlayerForPrepare(/* playWhenReady= */ true);
playbackPreparer.onPrepareFromMediaId(mediaId, extras); playbackPreparer.onPrepareFromMediaId(mediaId, extras);
} }
} }
@ -1221,7 +1222,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPlayFromSearch(String query, Bundle extras) { public void onPlayFromSearch(String query, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH)) {
setPlayWhenReady(/* playWhenReady= */ true); stopPlayerForPrepare(/* playWhenReady= */ true);
playbackPreparer.onPrepareFromSearch(query, extras); playbackPreparer.onPrepareFromSearch(query, extras);
} }
} }
@ -1229,7 +1230,7 @@ public final class MediaSessionConnector {
@Override @Override
public void onPlayFromUri(Uri uri, Bundle extras) { public void onPlayFromUri(Uri uri, Bundle extras) {
if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_URI)) { if (canDispatchToPlaybackPreparer(PlaybackStateCompat.ACTION_PLAY_FROM_URI)) {
setPlayWhenReady(/* playWhenReady= */ true); stopPlayerForPrepare(/* playWhenReady= */ true);
playbackPreparer.onPrepareFromUri(uri, extras); playbackPreparer.onPrepareFromUri(uri, extras);
} }
} }