diff options
3 files changed, 22 insertions, 18 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index aca1d34e1..39d79e521 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -612,7 +612,8 @@ public class PlaybackService extends MediaBrowserServiceCompat { setupNotification(newInfo); started = true; // set sleep timer if auto-enabled - if(SleepTimerPreferences.autoEnable() && !sleepTimerActive()) { + if(newInfo.oldPlayerStatus != null && newInfo.oldPlayerStatus != PlayerStatus.SEEKING && + SleepTimerPreferences.autoEnable() && !sleepTimerActive()) { setSleepTimer(SleepTimerPreferences.timerMillis(), SleepTimerPreferences.shakeToReset(), SleepTimerPreferences.vibrate()); } 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 3b9a11610..393019fd1 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 @@ -29,9 +29,10 @@ public abstract class PlaybackServiceMediaPlayer { /** * Return value of some PSMP methods if the method call failed. */ - public static final int INVALID_TIME = -1; + static final int INVALID_TIME = -1; - protected volatile PlayerStatus playerStatus; + volatile PlayerStatus oldPlayerStatus; + volatile PlayerStatus playerStatus; /** * A wifi-lock that is acquired if the media file is being streamed. @@ -41,8 +42,8 @@ public abstract class PlaybackServiceMediaPlayer { protected final PSMPCallback callback; protected final Context context; - public PlaybackServiceMediaPlayer(@NonNull Context context, - @NonNull PSMPCallback callback){ + PlaybackServiceMediaPlayer(@NonNull Context context, + @NonNull PSMPCallback callback){ this.context = context; this.callback = callback; @@ -204,7 +205,7 @@ public abstract class PlaybackServiceMediaPlayer { * @return The PSMPInfo object. */ public final synchronized PSMPInfo getPSMPInfo() { - return new PSMPInfo(playerStatus, getPlayable()); + return new PSMPInfo(oldPlayerStatus, playerStatus, getPlayable()); } /** @@ -275,7 +276,7 @@ public abstract class PlaybackServiceMediaPlayer { */ protected abstract boolean shouldLockWifi(); - protected final synchronized void acquireWifiLockIfNecessary() { + final synchronized void acquireWifiLockIfNecessary() { if (shouldLockWifi()) { if (wifiLock == null) { wifiLock = ((WifiManager) context.getSystemService(Context.WIFI_SERVICE)) @@ -286,7 +287,7 @@ public abstract class PlaybackServiceMediaPlayer { } } - protected final synchronized void releaseWifiLockIfNecessary() { + final synchronized void releaseWifiLockIfNecessary() { if (wifiLock != null && wifiLock.isHeld()) { wifiLock.release(); } @@ -307,29 +308,28 @@ public abstract class PlaybackServiceMediaPlayer { * @param position The position to be set to the current Playable object in case playback started or paused. * Will be ignored if given the value of {@link #INVALID_TIME}. */ - protected final synchronized void setPlayerStatus(@NonNull PlayerStatus newStatus, Playable newMedia, int position) { + final synchronized void setPlayerStatus(@NonNull PlayerStatus newStatus, Playable newMedia, int position) { Log.d(TAG, this.getClass().getSimpleName() + ": Setting player status to " + newStatus); - PlayerStatus oldStatus = playerStatus; - + this.oldPlayerStatus = playerStatus; this.playerStatus = newStatus; setPlayable(newMedia); if (newMedia != null && newStatus != PlayerStatus.INDETERMINATE) { - if (oldStatus == PlayerStatus.PLAYING && newStatus != PlayerStatus.PLAYING) { + if (oldPlayerStatus == PlayerStatus.PLAYING && newStatus != PlayerStatus.PLAYING) { callback.onPlaybackPause(newMedia, position); - } else if (oldStatus != PlayerStatus.PLAYING && newStatus == PlayerStatus.PLAYING) { + } else if (oldPlayerStatus != PlayerStatus.PLAYING && newStatus == PlayerStatus.PLAYING) { callback.onPlaybackStart(newMedia, position); } } - callback.statusChanged(new PSMPInfo(playerStatus, getPlayable())); + callback.statusChanged(new PSMPInfo(oldPlayerStatus, playerStatus, getPlayable())); } /** * @see #setPlayerStatus(PlayerStatus, Playable, int) */ - protected final void setPlayerStatus(@NonNull PlayerStatus newStatus, Playable newMedia) { + final void setPlayerStatus(@NonNull PlayerStatus newStatus, Playable newMedia) { setPlayerStatus(newStatus, newMedia, INVALID_TIME); } @@ -365,10 +365,12 @@ public abstract class PlaybackServiceMediaPlayer { * Holds information about a PSMP object. */ public static class PSMPInfo { + public PlayerStatus oldPlayerStatus; public PlayerStatus playerStatus; public Playable playable; - public PSMPInfo(PlayerStatus playerStatus, Playable playable) { + PSMPInfo(PlayerStatus oldPlayerStatus, PlayerStatus playerStatus, Playable playable) { + this.oldPlayerStatus = oldPlayerStatus; this.playerStatus = playerStatus; this.playable = playable; } diff --git a/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java b/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java index c7428947b..0f493e63e 100644 --- a/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java +++ b/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java @@ -131,7 +131,8 @@ public class PlaybackServiceFlavorHelper { info = mediaPlayer.getPSMPInfo(); } if (info == null) { - info = new PlaybackServiceMediaPlayer.PSMPInfo(PlayerStatus.STOPPED, null); + info = new PlaybackServiceMediaPlayer.PSMPInfo(PlayerStatus.INDETERMINATE, + PlayerStatus.STOPPED, null); } switchMediaPlayer(new LocalPSMP(context, callback.getMediaPlayerCallback()), info, true); @@ -166,7 +167,7 @@ public class PlaybackServiceFlavorHelper { } } if (info == null) { - info = new PlaybackServiceMediaPlayer.PSMPInfo(PlayerStatus.STOPPED, null); + info = new PlaybackServiceMediaPlayer.PSMPInfo(PlayerStatus.INDETERMINATE, PlayerStatus.STOPPED, null); } callback.sendNotificationBroadcast(PlaybackService.NOTIFICATION_TYPE_RELOAD, PlaybackService.EXTRA_CODE_CAST); |