summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2016-01-26 11:48:55 +0100
committerMartin Fietz <Martin.Fietz@gmail.com>2016-01-26 11:48:55 +0100
commitb41aaff2ddac3faca4c03c8931fbaec899f4f25c (patch)
tree2044f3a7edb5863ba5ae14e9f50c22f340636b73
parenta3fcd5efe16c411268024a2306438db4321b5167 (diff)
downloadAntennaPod-b41aaff2ddac3faca4c03c8931fbaec899f4f25c.zip
On skip, don't start playing when paused
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java5
1 files changed, 3 insertions, 2 deletions
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 aa73b17a7..a82e82506 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
@@ -24,7 +24,6 @@ import android.view.SurfaceHolder;
import android.view.WindowManager;
import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.target.Target;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
@@ -982,6 +981,8 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
playerLock.lock();
releaseWifiLockIfNecessary();
+ boolean isPlaying = playerStatus == PlayerStatus.PLAYING;
+
if (playerStatus != PlayerStatus.INDETERMINATE) {
setPlayerStatus(PlayerStatus.INDETERMINATE, media);
}
@@ -990,7 +991,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
}
audioManager.abandonAudioFocus(audioFocusChangeListener);
- callback.endPlayback(true, wasSkipped);
+ callback.endPlayback(isPlaying, wasSkipped);
playerLock.unlock();
});