From 817769672a1340dbdeb26066d57215b2a2642423 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Sat, 7 Jun 2014 16:26:38 -0700 Subject: Remove unnecessary braces in PlaybackService case block The other blocks in this switch don't have braces, and they would look a little silly when I add an extra case label. --- src/de/danoeh/antennapod/service/playback/PlaybackService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackService.java b/src/de/danoeh/antennapod/service/playback/PlaybackService.java index b7ff62129..1c0a15860 100644 --- a/src/de/danoeh/antennapod/service/playback/PlaybackService.java +++ b/src/de/danoeh/antennapod/service/playback/PlaybackService.java @@ -310,14 +310,12 @@ public class PlaybackService extends Service { mediaPlayer.pause(true, true); } break; - case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: { + case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: mediaPlayer.seekDelta(PlaybackController.DEFAULT_SEEK_DELTA); break; - } - case KeyEvent.KEYCODE_MEDIA_REWIND: { + case KeyEvent.KEYCODE_MEDIA_REWIND: mediaPlayer.seekDelta(-PlaybackController.DEFAULT_SEEK_DELTA); break; - } } } -- cgit v1.2.3 From 12660478a8249e55bd24d3503504dcf6b25482b3 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Sat, 7 Jun 2014 16:23:34 -0700 Subject: Support next/previous media keys The "seek" buttons in my car send "next" and "previous" media key codes, rather than "fast forward" and "rewind", so update the playback service to recognize them. fixes #386 fixes #432 --- src/de/danoeh/antennapod/service/playback/PlaybackService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackService.java b/src/de/danoeh/antennapod/service/playback/PlaybackService.java index 1c0a15860..0eb873f6f 100644 --- a/src/de/danoeh/antennapod/service/playback/PlaybackService.java +++ b/src/de/danoeh/antennapod/service/playback/PlaybackService.java @@ -310,9 +310,11 @@ public class PlaybackService extends Service { mediaPlayer.pause(true, true); } break; + case KeyEvent.KEYCODE_MEDIA_NEXT: case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: mediaPlayer.seekDelta(PlaybackController.DEFAULT_SEEK_DELTA); break; + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: case KeyEvent.KEYCODE_MEDIA_REWIND: mediaPlayer.seekDelta(-PlaybackController.DEFAULT_SEEK_DELTA); break; -- cgit v1.2.3 From a78c5173dccfe76cb2e4886e83a6a5b040375700 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Sat, 7 Jun 2014 16:24:03 -0700 Subject: Show a toast when an unknown media key is pressed This is just an idea. If people want more media keys supported, they will be able to use this toast to report exactly what key codes their hardware is generating. If you don't want to include this, just let me know and I can remove it from the pull request. --- res/values/strings.xml | 1 + src/de/danoeh/antennapod/service/playback/PlaybackService.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 8f81955e2..4f4d5d337 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -147,6 +147,7 @@ 00:00:00 Buffering Playing podcast + AntennaPod - Unknown media key: %1$d Clear queue diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackService.java b/src/de/danoeh/antennapod/service/playback/PlaybackService.java index 0eb873f6f..1165a977e 100644 --- a/src/de/danoeh/antennapod/service/playback/PlaybackService.java +++ b/src/de/danoeh/antennapod/service/playback/PlaybackService.java @@ -22,6 +22,7 @@ import android.util.Log; import android.util.Pair; import android.view.KeyEvent; import android.view.SurfaceHolder; +import android.widget.Toast; import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.R; @@ -318,6 +319,10 @@ public class PlaybackService extends Service { case KeyEvent.KEYCODE_MEDIA_REWIND: mediaPlayer.seekDelta(-PlaybackController.DEFAULT_SEEK_DELTA); break; + default: + String message = String.format(getResources().getString(R.string.unknown_media_key), keycode); + Toast.makeText(this, message, Toast.LENGTH_SHORT).show(); + break; } } -- cgit v1.2.3 From 500483ba690a36365dda1f6e00bb9c50c6357248 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Sat, 7 Jun 2014 14:13:07 -0700 Subject: Make seek time configurable A 30-second seek time is way to long for me. Make the seek duration a configurable preference. --- res/values/arrays.xml | 10 ++++++++++ res/values/strings.xml | 2 ++ res/xml/preferences.xml | 9 +++++++++ src/de/danoeh/antennapod/preferences/UserPreferences.java | 10 ++++++++++ src/de/danoeh/antennapod/service/playback/PlaybackService.java | 5 ++--- src/de/danoeh/antennapod/util/playback/PlaybackController.java | 6 +++--- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 69ea13e52..f09c76080 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,6 +1,16 @@ + + 5 + 10 + 15 + 20 + 30 + 45 + 60 + + Manual 1 hour diff --git a/res/values/strings.xml b/res/values/strings.xml index 4f4d5d337..28fb74691 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -243,6 +243,8 @@ Change the login information for your gpodder.net account. Playback Speeds Customize the speeds available for variable speed audio playback + Seek Time + Seek this many seconds when rewinding or fast-forwarding Set hostname Use default host diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 8e0b886de..0afbbaca7 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -34,6 +34,15 @@ android:key="prefPauseForFocusLoss" android:summary="@string/pref_pausePlaybackForFocusLoss_sum" android:title="@string/pref_pausePlaybackForFocusLoss_title" /> + + +