diff options
author | ByteHamster <info@bytehamster.com> | 2021-04-22 21:49:24 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-04-22 22:08:05 +0200 |
commit | c04f36bb9fd8ba659b7e95f16f3a5cad2521bdb9 (patch) | |
tree | 009707b7ba603d6148279c5716e34c252e303c82 /core/src/main/java/de/danoeh/antennapod | |
parent | 762140bccd1d0473c63c7a767fb4457bcaa5deca (diff) | |
download | AntennaPod-c04f36bb9fd8ba659b7e95f16f3a5cad2521bdb9.zip |
Decouple FeedMedia and PlaybackService
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java | 12 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java | 11 |
2 files changed, 11 insertions, 12 deletions
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 2aa6087a2..3fcd258d5 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 @@ -15,13 +15,10 @@ import java.util.Date; import java.util.List; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; -import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.util.playback.Playable; public class FeedMedia extends FeedFile implements Playable { - private static final String TAG = "FeedMedia"; - public static final int FEEDFILETYPE_FEEDMEDIA = 2; public static final int PLAYABLE_TYPE_FEEDMEDIA = 1; public static final String FILENAME_PREFIX_EMBEDDED_COVER = "metadata-retriever:"; @@ -162,15 +159,6 @@ public class FeedMedia extends FeedFile implements Playable { && PlaybackPreferences.getCurrentlyPlayingFeedMediaId() == id; } - /** - * Reads playback preferences to determine whether this FeedMedia object is - * currently being played and the current player status is playing. - */ - public boolean isCurrentlyPlaying() { - return isPlaying() && PlaybackService.isRunning && - ((PlaybackPreferences.getCurrentPlayerStatus() == PlaybackPreferences.PLAYER_STATUS_PLAYING)); - } - @Override public int getTypeAsInt() { return FEEDFILETYPE_FEEDMEDIA; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java index 9d3edd544..438739a6f 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java @@ -4,6 +4,8 @@ import androidx.annotation.NonNull; import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.preferences.UserPreferences; +import de.danoeh.antennapod.core.preferences.PlaybackPreferences; +import de.danoeh.antennapod.core.service.playback.PlaybackService; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -73,4 +75,13 @@ public class FeedItemUtil { int smartMarkAsPlayedSecs = UserPreferences.getSmartMarkAsPlayedSecs(); return media.getDuration() > 0 && media.getPosition() >= media.getDuration() - smartMarkAsPlayedSecs * 1000; } + + /** + * Reads playback preferences to determine whether this FeedMedia object is + * currently being played and the current player status is playing. + */ + public static boolean isCurrentlyPlaying(FeedMedia item) { + return item.isPlaying() && PlaybackService.isRunning + && ((PlaybackPreferences.getCurrentPlayerStatus() == PlaybackPreferences.PLAYER_STATUS_PLAYING)); + } } |