From d0f19a2b148c0ed04dd51f88854d9696bfe3a190 Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@cowboyprogrammer.org>
Date: Fri, 13 Sep 2019 23:27:55 +0200
Subject: Inlined getFeedPlaybackSpeed method on FeedItem

---
 .../main/java/de/danoeh/antennapod/core/feed/FeedItem.java    | 11 -----------
 .../main/java/de/danoeh/antennapod/core/feed/FeedMedia.java   |  5 ++++-
 .../java/de/danoeh/antennapod/core/feed/FeedPreferences.java  |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'core/src/main/java/de/danoeh')

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)) {
-- 
cgit v1.2.3