diff options
Diffstat (limited to 'app')
4 files changed, 6 insertions, 37 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java index d2e929d20..2f2981dac 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -80,7 +80,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity { } float speed = 1.0f; if(controller.canSetPlaybackSpeed()) { - speed = getPlaybackSpeedForMedia(); + speed = UserPreferences.getPlaybackSpeed(controller.getMedia()); } String speedStr = new DecimalFormat("0.00x").format(speed); butPlaybackSpeed.setText(speedStr); @@ -107,7 +107,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity { float currentSpeedValue = controller.getCurrentPlaybackSpeedMultiplier(); if (currentSpeedValue == -1) { - currentSpeedValue = getPlaybackSpeedForMedia(); + currentSpeedValue = UserPreferences.getPlaybackSpeed(controller.getMedia()); } String currentSpeed = new DecimalFormat("0.00", format).format(currentSpeedValue); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index d5801265f..a907c738a 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -874,22 +874,4 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements } } } - - float getPlaybackSpeedForMedia() { - float playbackSpeed = SPEED_USE_GLOBAL; - if (controller != null) { - Playable media = controller.getMedia(); - boolean isFeedMedia = media instanceof FeedMedia; - - if (isFeedMedia) { - playbackSpeed = ((FeedMedia) media).getMediaPlaybackSpeed(); - } - } - - if (playbackSpeed == SPEED_USE_GLOBAL) { - playbackSpeed = UserPreferences.getPlaybackSpeed(); - } - - return playbackSpeed; - } } diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java index a8b58a757..3dc8abbbe 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java @@ -212,24 +212,11 @@ public class PlaybackControlsDialog extends DialogFragment { } private float getCurrentSpeed() { - float playbackSpeed = SPEED_USE_GLOBAL; + Playable media = null; if (controller != null) { - Playable media = controller.getMedia(); - boolean isFeedMedia = media instanceof FeedMedia; - - if (isFeedMedia) { - playbackSpeed = ((FeedMedia) media).getMediaPlaybackSpeed(); - } - } - - if (playbackSpeed == SPEED_USE_GLOBAL) { - if (isPlayingVideo) { - playbackSpeed = UserPreferences.getVideoPlaybackSpeed(); - } else { - playbackSpeed = UserPreferences.getPlaybackSpeed(); - } + media = controller.getMedia(); } - return playbackSpeed; + return UserPreferences.getPlaybackSpeed(media); } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 0f51d4622..19e84fb19 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -606,7 +606,7 @@ public class QueueFragment extends Fragment { playbackSpeed = feed.getPreferences().getCurrentPlaybackSpeed(); } if (playbackSpeed == SPEED_USE_GLOBAL) { - playbackSpeed = UserPreferences.getPlaybackSpeed(); + playbackSpeed = UserPreferences.getPlaybackSpeed(item.getMedia()); } if(item.getMedia() != null) { timeLeft += |