diff options
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java | 130 |
1 files changed, 68 insertions, 62 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 df3dbfa69..4376d14d4 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 @@ -16,6 +16,7 @@ import android.support.v4.media.session.PlaybackStateCompat; import android.telephony.TelephonyManager; import android.util.Log; import android.util.Pair; +import android.view.InputDevice; import android.view.KeyEvent; import android.view.SurfaceHolder; @@ -1182,8 +1183,11 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre private final MediaSessionCompat.Callback sessionCallback = new MediaSessionCompat.Callback() { + 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) { @@ -1194,7 +1198,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre @Override public void onPause() { - super.onPause(); + Log.d(TAG, "onPause()"); if (playerStatus == PlayerStatus.PLAYING) { pause(false, true); } @@ -1207,25 +1211,24 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre @Override public void onSkipToNext() { - super.onSkipToNext(); - endPlayback(true); + Log.d(TAG, "onSkipToNext()"); } @Override public void onFastForward() { - super.onFastForward(); + Log.d(TAG, "onFastForward()"); seekDelta(UserPreferences.getFastFowardSecs() * 1000); } @Override public void onRewind() { - super.onRewind(); + Log.d(TAG, "onRewind()"); seekDelta(-UserPreferences.getRewindSecs() * 1000); } @Override public void onSeekTo(long pos) { - super.onSeekTo(pos); + Log.d(TAG, "onSeekTo()"); seekTo((int) pos); } @@ -1236,75 +1239,78 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre KeyEvent keyEvent = (KeyEvent) mediaButton.getExtras().get(Intent.EXTRA_KEY_EVENT); handleMediaKey(keyEvent); } - return super.onMediaButtonEvent(mediaButton); + return false; } }; - public boolean handleMediaKey(KeyEvent event) { - if (event != null - && event.getAction() == KeyEvent.ACTION_DOWN - && event.getRepeatCount() == 0) { - switch (event.getKeyCode()) { - case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: - case KeyEvent.KEYCODE_HEADSETHOOK: - { - Log.d(TAG, "Received Play/Pause event from RemoteControlClient"); - if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) { - resume(); - } else if (playerStatus == PlayerStatus.INITIALIZED) { - setStartWhenPrepared(true); - prepare(); - } else if (playerStatus == PlayerStatus.PLAYING) { - pause(false, true); - if (UserPreferences.isPersistNotify()) { - pause(false, true); - } else { - pause(true, true); - } - } - return true; - } - case KeyEvent.KEYCODE_MEDIA_PLAY: - { - Log.d(TAG, "Received Play event from RemoteControlClient"); - if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) { - resume(); - } else if (playerStatus == PlayerStatus.INITIALIZED) { - setStartWhenPrepared(true); - prepare(); - } - return true; - } - case KeyEvent.KEYCODE_MEDIA_PAUSE: - { - Log.d(TAG, "Received Pause event from RemoteControlClient"); - if (playerStatus == PlayerStatus.PLAYING) { - pause(false, true); - } + public boolean handleMediaKey(KeyEvent event) { + Log.d(TAG, "handleMediaKey(" + event +")"); + if (event != null + && event.getAction() == KeyEvent.ACTION_DOWN + && event.getRepeatCount() == 0) { + switch (event.getKeyCode()) { + case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: + case KeyEvent.KEYCODE_HEADSETHOOK: { + Log.d(TAG, "Received Play/Pause event from RemoteControlClient"); + if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) { + resume(); + } else if (playerStatus == PlayerStatus.INITIALIZED) { + setStartWhenPrepared(true); + prepare(); + } else if (playerStatus == PlayerStatus.PLAYING) { + pause(false, true); if (UserPreferences.isPersistNotify()) { pause(false, true); } else { pause(true, true); } - return true; } - case KeyEvent.KEYCODE_MEDIA_STOP: - { - Log.d(TAG, "Received Stop event from RemoteControlClient"); - stop(); - return true; + return true; + } + case KeyEvent.KEYCODE_MEDIA_PLAY: { + Log.d(TAG, "Received Play event from RemoteControlClient"); + if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) { + resume(); + } else if (playerStatus == PlayerStatus.INITIALIZED) { + setStartWhenPrepared(true); + prepare(); + } + return true; + } + case KeyEvent.KEYCODE_MEDIA_PAUSE: { + Log.d(TAG, "Received Pause event from RemoteControlClient"); + if (playerStatus == PlayerStatus.PLAYING) { + pause(false, true); + } + if (UserPreferences.isPersistNotify()) { + pause(false, true); + } else { + pause(true, true); } - case KeyEvent.KEYCODE_MEDIA_NEXT: - { - Log.d(TAG, "Received next event from RemoteControlClient"); + return true; + } + case KeyEvent.KEYCODE_MEDIA_STOP: { + Log.d(TAG, "Received Stop event from RemoteControlClient"); + stop(); + 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 + // a >| skip button should actually skip endPlayback(true); - return true; + } else { + // assume skip command comes from a (bluetooth) media button + // user actually wants to fast-forward + seekDelta(UserPreferences.getFastFowardSecs() * 1000); } - default: - Log.d(TAG, "Unhandled key code: " + event.getKeyCode()); - break; + return true; } + default: + Log.d(TAG, "Unhandled key code: " + event.getKeyCode()); + break; } - return false; } + return false; + } } |