diff options
author | ByteHamster <info@bytehamster.com> | 2021-03-01 21:01:48 +0100 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-03-01 21:01:48 +0100 |
commit | 2a05507902a112c7921a99afa3343e20b77e2568 (patch) | |
tree | 852cca179069efd17232dd8d3fd031162a8868af /app/src | |
parent | a476ce2f47ab9c75da607e2109f9518bcc193745 (diff) | |
download | AntennaPod-2a05507902a112c7921a99afa3343e20b77e2568.zip |
Fixed conflicting PRs
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java index d5f09858e..51f264e56 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java @@ -36,6 +36,7 @@ import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.feed.util.PlaybackSpeedUtils; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; +import de.danoeh.antennapod.core.util.ChapterUtils; import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.IntentUtils; import de.danoeh.antennapod.core.util.TimeSpeedConverter; @@ -321,7 +322,7 @@ public class AudioPlayerFragment extends Fragment implements disposable = Maybe.create(emitter -> { Playable media = controller.getMedia(); if (media != null) { - media.loadChapterMarks(getContext()); + ChapterUtils.loadChapters(media, getContext()); emitter.onSuccess(media); } else { emitter.onComplete(); |