summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorJonas Kalderstam <jonas@cowboyprogrammer.org>2019-09-13 23:22:13 +0200
committerJonas Kalderstam <jonas@cowboyprogrammer.org>2019-09-13 23:22:13 +0200
commit3bcb368bb31198372a4ad45a5c3d3cc72a4201e4 (patch)
tree057b9401009604f6452becced1f47a5ceee777a9 /core/src
parente5176c6a198db3401cb4779e0fe537211fb8926b (diff)
downloadAntennaPod-3bcb368bb31198372a4ad45a5c3d3cc72a4201e4.zip
Check the media's own speed before loading video speed
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
index 6a694eb6f..fe3b5223e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
@@ -307,17 +307,19 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
Log.d(TAG, "Audiofocus successfully requested");
Log.d(TAG, "Resuming/Starting playback");
acquireWifiLockIfNecessary();
- float playbackSpeed;
- if (media.getMediaType() == MediaType.VIDEO) {
- playbackSpeed = UserPreferences.getVideoPlaybackSpeed();
- } else if (media instanceof FeedMedia) {
+
+ float playbackSpeed = SPEED_USE_GLOBAL;
+ if (media instanceof FeedMedia) {
playbackSpeed = ((FeedMedia) media).getMediaPlaybackSpeed();
- } else {
- playbackSpeed = SPEED_USE_GLOBAL;
}
if (playbackSpeed == SPEED_USE_GLOBAL) {
- playbackSpeed = UserPreferences.getPlaybackSpeed();
+ if (media.getMediaType() == MediaType.VIDEO) {
+ playbackSpeed = UserPreferences.getVideoPlaybackSpeed();
+ } else {
+ playbackSpeed = UserPreferences.getPlaybackSpeed();
+ }
}
+
setPlaybackParams(playbackSpeed, UserPreferences.isSkipSilence());
setVolume(UserPreferences.getLeftVolume(), UserPreferences.getRightVolume());