diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-11-26 08:26:54 -0500 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-11-26 08:26:54 -0500 |
commit | 67ef3febea9cf1748dc206d8298e5f10f321f91c (patch) | |
tree | de0d27be7821b93ece57f873afb53299b443d290 /core/src/main | |
parent | 3383d7c8f609bc4cfe37b8fdec8401d59e3fc164 (diff) | |
parent | 2de280cb366a073194f65ec4e8c06b99a4660c20 (diff) | |
download | AntennaPod-67ef3febea9cf1748dc206d8298e5f10f321f91c.zip |
Merge pull request #1415 from mfietz/issue/1407-media-controls
Also handle rewind/previous media buttons
Diffstat (limited to 'core/src/main')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java | 69 |
1 files changed, 13 insertions, 56 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 b04784ab3..b136de47f 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 @@ -1186,63 +1186,8 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre private static final String TAG = "MediaSessionCompat"; @Override - public void onPlay() { - Log.d(TAG, "onPlay()"); - if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) { - resume(); - } else if (playerStatus == PlayerStatus.INITIALIZED) { - setStartWhenPrepared(true); - prepare(); - } - } - - @Override - public void onPause() { - Log.d(TAG, "onPause()"); - if (playerStatus == PlayerStatus.PLAYING) { - pause(false, true); - } - if (UserPreferences.isPersistNotify()) { - pause(false, true); - } else { - pause(true, true); - } - } - - @Override - public void onSkipToPrevious() { - Log.d(TAG, "onSkipToPrevious()"); - seekDelta(-UserPreferences.getRewindSecs() * 1000); - } - - @Override - public void onRewind() { - Log.d(TAG, "onRewind()"); - seekDelta(-UserPreferences.getRewindSecs() * 1000); - } - - @Override - public void onFastForward() { - Log.d(TAG, "onFastForward()"); - seekDelta(UserPreferences.getFastFowardSecs() * 1000); - } - - @Override - public void onSkipToNext() { - Log.d(TAG, "onSkipToNext()"); - // will be handled by onMediaButtonEvent(KeyEvent.KEYCODE_MEDIA_NEXT) - } - - - @Override - public void onSeekTo(long pos) { - Log.d(TAG, "onSeekTo()"); - seekTo((int) pos); - } - - @Override public boolean onMediaButtonEvent(final Intent mediaButton) { - Log.d(TAG, "GOT MediaButton EVENT"); + Log.d(TAG, "onMediaButtonEvent(" + mediaButton + ")"); if (mediaButton != null) { KeyEvent keyEvent = (KeyEvent) mediaButton.getExtras().get(Intent.EXTRA_KEY_EVENT); handleMediaKey(keyEvent); @@ -1302,6 +1247,18 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre stop(); return true; } + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: { + seekDelta(-UserPreferences.getRewindSecs() * 1000); + return true; + } + case KeyEvent.KEYCODE_MEDIA_REWIND: { + seekDelta(-UserPreferences.getRewindSecs() * 1000); + return true; + } + case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: { + seekDelta(UserPreferences.getFastFowardSecs() * 1000); + return true; + } case KeyEvent.KEYCODE_MEDIA_NEXT: { if(event.getSource() == InputDevice.SOURCE_CLASS_NONE) { // assume the skip command comes from a notification or the lockscreen |