summaryrefslogtreecommitdiff
path: root/core/src/play
diff options
context:
space:
mode:
authorHerbert Reiter <46045854+damoasda@users.noreply.github.com>2021-02-25 23:17:34 +0100
committerGitHub <noreply@github.com>2021-02-25 23:17:34 +0100
commit39f9796656ae9b37e995af8da2977fd16746bfda (patch)
treeb501d8bd872e76b6181710d3275b85f1329b1f0b /core/src/play
parent519d6ce9d699e895bf6adb00f3ec9d0238cc570b (diff)
downloadAntennaPod-39f9796656ae9b37e995af8da2977fd16746bfda.zip
Refactoring: Move inner classes PlayableUtils and PlayableException out of Playable (#4962)
Diffstat (limited to 'core/src/play')
-rw-r--r--core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java5
-rw-r--r--core/src/play/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java3
2 files changed, 5 insertions, 3 deletions
diff --git a/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java b/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java
index 6fa874eca..ab638b568 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java
+++ b/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java
@@ -10,6 +10,7 @@ import com.google.android.gms.cast.MediaInfo;
import com.google.android.gms.cast.MediaMetadata;
import com.google.android.gms.common.images.WebImage;
+import de.danoeh.antennapod.core.util.playback.PlayableException;
import de.danoeh.antennapod.core.util.playback.RemoteMedia;
import java.util.Calendar;
import java.util.List;
@@ -93,7 +94,7 @@ public class CastUtils {
MediaMetadata metadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_GENERIC);
try{
media.loadMetadata();
- } catch (Playable.PlayableException e) {
+ } catch (PlayableException e) {
Log.e(TAG, "Unable to load FeedMedia metadata", e);
}
FeedItem feedItem = media.getItem();
@@ -202,7 +203,7 @@ public class CastUtils {
} else {
Log.d(TAG, "FeedMedia object obtained does NOT match the MediaInfo provided. id=" + mediaId);
}
- } catch (Playable.PlayableException e) {
+ } catch (PlayableException e) {
Log.e(TAG, "Unable to load FeedMedia metadata to compare with MediaInfo", e);
}
} else {
diff --git a/core/src/play/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java b/core/src/play/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java
index f629793e2..e61896965 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java
+++ b/core/src/play/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java
@@ -28,6 +28,7 @@ import de.danoeh.antennapod.core.cast.CastConsumer;
import de.danoeh.antennapod.core.cast.CastManager;
import de.danoeh.antennapod.core.cast.CastUtils;
import de.danoeh.antennapod.core.cast.DefaultCastConsumer;
+import de.danoeh.antennapod.core.util.playback.PlayableException;
import de.danoeh.antennapod.core.util.playback.RemoteMedia;
import de.danoeh.antennapod.core.feed.FeedMedia;
import de.danoeh.antennapod.core.feed.MediaType;
@@ -360,7 +361,7 @@ public class RemotePSMP extends PlaybackServiceMediaPlayer {
if (prepareImmediately) {
prepare();
}
- } catch (Playable.PlayableException e) {
+ } catch (PlayableException e) {
Log.e(TAG, "Error while loading media metadata", e);
setPlayerStatus(PlayerStatus.STOPPED, null);
}