summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/jar
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-09-19 09:53:53 +0200
committerYoann Lopes <yoann.lopes@digia.com>2014-09-26 14:26:58 +0200
commitec245921865eda2bc57397c1979c92fa10adfd98 (patch)
treedefd9970f1c3f8b16b69e18ff49be445c305f642 /src/plugins/android/jar
parent5c30ed55ef41ea85232f63c7ee4fd52a4e7126e2 (diff)
Android: fix some problems with the media player.
- Correctly emit positionChanged signal. One of the problems with this was that QMediaPlayer automatically sends periodic position updates while playing a media. There's no need to have the same logic in the backend. - Seeking after reaching the end of the media now correctly works Auto tests included. Change-Id: I6d5ecbae6e05f94a8aac1a0834cf57427adf219b Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/android/jar')
-rw-r--r--src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
index ade2517d2..5e6630de8 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
@@ -83,23 +83,6 @@ public class QtAndroidMediaPlayer
private volatile int mState = State.Uninitialized;
- private class ProgressWatcher
- implements Runnable
- {
- @Override
- public void run()
- {
- try {
- while ((mState & (State.Started)) != 0) {
- onProgressUpdateNative(getCurrentPosition(), mID);
- Thread.sleep(1000);
- }
- } catch (final InterruptedException e) {
- // Ignore
- }
- }
- }
-
/**
* MediaPlayer OnErrorListener
*/
@@ -257,8 +240,6 @@ public class QtAndroidMediaPlayer
try {
mMediaPlayer.start();
setState(State.Started);
- Thread progressThread = new Thread(new ProgressWatcher());
- progressThread.start();
} catch (final IllegalStateException e) {
Log.d(TAG, "" + e.getMessage());
}
@@ -309,7 +290,6 @@ public class QtAndroidMediaPlayer
try {
mMediaPlayer.seekTo(msec);
- onProgressUpdateNative(msec, mID);
} catch (final IllegalStateException e) {
Log.d(TAG, "" + e.getMessage());
}