diff options
4 files changed, 10 insertions, 14 deletions
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 238d9c7ca..0f51d4622 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -600,7 +600,11 @@ public class QueueFragment extends Fragment { if(queue.size() > 0) { long timeLeft = 0; for(FeedItem item : queue) { - float playbackSpeed = item.getFeedPlaybackSpeed(); + float playbackSpeed = SPEED_USE_GLOBAL; + Feed feed = item.getFeed(); + if (feed != null) { + playbackSpeed = feed.getPreferences().getCurrentPlaybackSpeed(); + } if (playbackSpeed == SPEED_USE_GLOBAL) { playbackSpeed = UserPreferences.getPlaybackSpeed(); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java index 70e5ea9f4..86d8f5294 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java @@ -486,15 +486,4 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, ImageR return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); } - /** - * - * @return playback speed for this feed, or the global setting if no feed-specific setting - */ - public float getFeedPlaybackSpeed() { - Feed feed = getFeed(); - if (feed != null) { - return feed.getPreferences().getCurrentPlaybackSpeed(); - } - return SPEED_USE_GLOBAL; - } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java index 9aa4dd2d0..61cafef94 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java @@ -650,7 +650,10 @@ public class FeedMedia extends FeedFile implements Playable { if (playbackSpeed == LAST_PLAYBACK_SPEED_UNSET) { FeedItem item = getItem(); if (item != null) { - playbackSpeed = item.getFeedPlaybackSpeed(); + Feed feed = item.getFeed(); + if (feed != null) { + playbackSpeed = feed.getPreferences().getCurrentPlaybackSpeed(); + } } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java index 2c840952c..b607d8b42 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java @@ -182,7 +182,7 @@ public class FeedPreferences { this.password = password; } - float getCurrentPlaybackSpeed() { + public float getCurrentPlaybackSpeed() { float speed = 0.0f; if (!"global".equals(feedPlaybackSpeed)) { |