diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 02:16:18 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 02:16:18 +0100 |
commit | 418ac5ee222c2734af677d92cf318f2b033fd7bd (patch) | |
tree | 08e2e3db703c977325d4d0fb15d01831a888b5eb /variablespeed/src/com/android/ex/variablespeed | |
parent | aecf604ef14f07e078c309b015c2333e22640789 (diff) | |
parent | ce2b95ae200332495b348be07f77fe60b6c23dcc (diff) | |
download | android_frameworks_ex-stable/cm-11.0.tar.gz android_frameworks_ex-stable/cm-11.0.tar.bz2 android_frameworks_ex-stable/cm-11.0.zip |
Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Android 4.4.3 release 1
Diffstat (limited to 'variablespeed/src/com/android/ex/variablespeed')
3 files changed, 14 insertions, 1 deletions
diff --git a/variablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java b/variablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java index 8489dc1..3b7b576 100644 --- a/variablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java +++ b/variablespeed/src/com/android/ex/variablespeed/MediaPlayerProxy.java @@ -42,6 +42,7 @@ public interface MediaPlayerProxy { int getDuration(); void seekTo(int startPosition); void start(); + boolean isReadyToPlay(); boolean isPlaying(); int getCurrentPosition(); void pause(); diff --git a/variablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java b/variablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java index 17692f7..c9a9741 100644 --- a/variablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java +++ b/variablespeed/src/com/android/ex/variablespeed/SingleThreadedMediaPlayerProxy.java @@ -85,6 +85,11 @@ public class SingleThreadedMediaPlayerProxy implements MediaPlayerProxy { } @Override + public synchronized boolean isReadyToPlay() { + return mDelegate.isReadyToPlay(); + } + + @Override public synchronized boolean isPlaying() { return mDelegate.isPlaying(); } diff --git a/variablespeed/src/com/android/ex/variablespeed/VariableSpeed.java b/variablespeed/src/com/android/ex/variablespeed/VariableSpeed.java index 5c93d26..e44a375 100644 --- a/variablespeed/src/com/android/ex/variablespeed/VariableSpeed.java +++ b/variablespeed/src/com/android/ex/variablespeed/VariableSpeed.java @@ -337,9 +337,16 @@ public class VariableSpeed implements MediaPlayerProxy { } @Override + public boolean isReadyToPlay() { + synchronized (lock) { + return !mHasBeenReleased && mHasDuration; + } + } + + @Override public boolean isPlaying() { synchronized (lock) { - return mHasStartedPlayback && !hasPlaybackFinished(); + return isReadyToPlay() && mHasStartedPlayback && !hasPlaybackFinished(); } } |