From 8f3f0c30c620548bb983624e311763306e95ae62 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 18 Feb 2016 08:38:57 +0100
Subject: Delay control hiding when button pressed

---
 .../core/util/playback/PlaybackController.java     | 54 +++++++++++-----------
 1 file changed, 26 insertions(+), 28 deletions(-)

(limited to 'core/src/main/java/de')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 27935978c..0a1a0540c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -574,34 +574,32 @@ public abstract class PlaybackController {
 
     }
 
-    public OnClickListener newOnPlayButtonClickListener() {
-        return v -> {
-            if (playbackService == null) {
-                Log.w(TAG, "Play/Pause button was pressed, but playbackservice was null!");
-                return;
-            }
-            switch (status) {
-                case PLAYING:
-                    playbackService.pause(true, reinitOnPause);
-                    break;
-                case PAUSED:
-                case PREPARED:
-                    playbackService.resume();
-                    break;
-                case PREPARING:
-                    playbackService.setStartWhenPrepared(!playbackService
-                            .isStartWhenPrepared());
-                    if (reinitOnPause
-                            && playbackService.isStartWhenPrepared() == false) {
-                        playbackService.reinit();
-                    }
-                    break;
-                case INITIALIZED:
-                    playbackService.setStartWhenPrepared(true);
-                    playbackService.prepare();
-                    break;
-            }
-        };
+    public void playPause() {
+        if (playbackService == null) {
+            Log.w(TAG, "Play/Pause button was pressed, but playbackservice was null!");
+            return;
+        }
+        switch (status) {
+            case PLAYING:
+                playbackService.pause(true, reinitOnPause);
+                break;
+            case PAUSED:
+            case PREPARED:
+                playbackService.resume();
+                break;
+            case PREPARING:
+                playbackService.setStartWhenPrepared(!playbackService
+                        .isStartWhenPrepared());
+                if (reinitOnPause
+                        && playbackService.isStartWhenPrepared() == false) {
+                    playbackService.reinit();
+                }
+                break;
+            case INITIALIZED:
+                playbackService.setStartWhenPrepared(true);
+                playbackService.prepare();
+                break;
+        }
     }
 
     public boolean serviceAvailable() {
-- 
cgit v1.2.3


From d818901b80fb29c6e80d553ef258e431696603c2 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 18 Feb 2016 08:40:15 +0100
Subject: Give it some time to read current position

---
 .../core/service/playback/PlaybackServiceMediaPlayer.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/src/main/java/de')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index a82e82506..d3a7fdee4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -604,7 +604,11 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
      * Returns the position of the current media object or INVALID_TIME if the position could not be retrieved.
      */
     public int getPosition() {
-        if (!playerLock.tryLock()) {
+        try {
+            if (!playerLock.tryLock(50, TimeUnit.MILLISECONDS)) {
+                return INVALID_TIME;
+            }
+        } catch (InterruptedException e) {
             return INVALID_TIME;
         }
 
-- 
cgit v1.2.3


From 202f211230ad20bfc539fa5a5fff080e2e1ac623 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 18 Feb 2016 08:43:51 +0100
Subject: Also update position when paused

---
 .../de/danoeh/antennapod/core/util/playback/PlaybackController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/main/java/de')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 0a1a0540c..1a011a90b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -19,7 +19,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.view.SurfaceHolder;
-import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -424,6 +423,7 @@ public abstract class PlaybackController {
                 clearStatusMsg();
                 checkMediaInfoLoaded();
                 cancelPositionObserver();
+                onPositionObserverUpdate();
                 updatePlayButtonAppearance(playResource, playText);
                 if (PlaybackService.getCurrentMediaType() == MediaType.VIDEO) {
                     setScreenOn(false);
-- 
cgit v1.2.3