summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2014-02-10 20:28:16 +0100
committerdaniel oeh <daniel.oeh@gmail.com>2014-02-10 20:28:16 +0100
commitff285c5ad539acce1baea45c05b064009f70c1e9 (patch)
tree93f0288204078e953343fc93d8fac7a3eae89bc0 /src/de/danoeh/antennapod
parent1a5949e03088e4d754ceebe38c3e78af03cf615b (diff)
downloadAntennaPod-ff285c5ad539acce1baea45c05b064009f70c1e9.zip
PLAY and PLAY_PAUSE keycode was not handled correctly in prepared state
Diffstat (limited to 'src/de/danoeh/antennapod')
-rw-r--r--src/de/danoeh/antennapod/service/playback/PlaybackService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackService.java b/src/de/danoeh/antennapod/service/playback/PlaybackService.java
index 1d65c631e..68034ceb9 100644
--- a/src/de/danoeh/antennapod/service/playback/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/playback/PlaybackService.java
@@ -278,7 +278,7 @@ public class PlaybackService extends Service {
case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
if (status == PlayerStatus.PLAYING) {
mediaPlayer.pause(true, true);
- } else if (status == PlayerStatus.PAUSED) {
+ } else if (status == PlayerStatus.PAUSED || status == PlayerStatus.PREPARED) {
mediaPlayer.resume();
} else if (status == PlayerStatus.PREPARING) {
mediaPlayer.setStartWhenPrepared(!mediaPlayer.isStartWhenPrepared());
@@ -288,7 +288,7 @@ public class PlaybackService extends Service {
}
break;
case KeyEvent.KEYCODE_MEDIA_PLAY:
- if (status == PlayerStatus.PAUSED) {
+ if (status == PlayerStatus.PAUSED || status == PlayerStatus.PREPARED) {
mediaPlayer.resume();
} else if (status == PlayerStatus.INITIALIZED) {
mediaPlayer.setStartWhenPrepared(true);