Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3872)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java

Issue 1839013002: Distingush between displayed and remote playback state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
index 5cd60d9a26fe565bfb067688563b448fd04c4b25..009ff8ca21606d0c5c2edde1ec59117d4b19ebd6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
@@ -62,6 +62,7 @@ public class RemoteMediaPlayerBridge {
@Override
public void onSeekCompleted() {
+ mSeekRequested = false;
if (mActive && mNativeRemoteMediaPlayerBridge != 0) {
nativeOnSeekCompleted(mNativeRemoteMediaPlayerBridge);
}
@@ -81,6 +82,7 @@ public class RemoteMediaPlayerBridge {
} else if (newState == PlayerState.PLAYING) {
nativeOnPlaying(mNativeRemoteMediaPlayerBridge);
} else if (newState == PlayerState.PAUSED) {
+ mPauseRequested = false;
nativeOnPaused(mNativeRemoteMediaPlayerBridge);
}
}
@@ -281,16 +283,20 @@ public class RemoteMediaPlayerBridge {
@CalledByNative
protected void pause() throws IllegalStateException {
- mPauseRequested = true;
- if (mRouteController != null && mRouteController.isBeingCast()) mRouteController.pause();
+ if (mRouteController != null && mRouteController.isBeingCast()) {
+ mRouteController.pause();
+ } else {
+ mPauseRequested = true;
+ }
}
@CalledByNative
protected void seekTo(int msec) throws IllegalStateException {
- mSeekRequested = true;
- mSeekLocation = msec;
if (mRouteController != null && mRouteController.isBeingCast()) {
mRouteController.seekTo(msec);
+ } else {
+ mSeekRequested = true;
+ mSeekLocation = msec;
}
}

Powered by Google App Engine
This is Rietveld 408576698