summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorDomingos Lopes <domingos86lopes+github@gmail.com>2016-04-16 11:29:17 -0400
committerDomingos Lopes <domingos86lopes+github@gmail.com>2016-04-23 21:39:58 -0400
commitb3a78d47f945006070120c8dd12d3b5fdc2ad3be (patch)
treec801ec712851d5f9529ddc25f5458f5719cafe22 /core/src
parent8a18adf50c85de94d6fab036f2066c1c4dd56e74 (diff)
downloadAntennaPod-b3a78d47f945006070120c8dd12d3b5fdc2ad3be.zip
update PlaybackServiceCallbacks to be able to handle a cast player activity
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java3
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java8
2 files changed, 6 insertions, 5 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java b/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
index 08ccb6d71..13a32ab8a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/PlaybackServiceCallbacks.java
@@ -15,9 +15,10 @@ public interface PlaybackServiceCallbacks {
* type of media that is being played.
*
* @param mediaType The type of media that is being played.
+ * @param remotePlayback true if the media is played on a remote device.
* @return A non-null activity intent.
*/
- Intent getPlayerActivityIntent(Context context, MediaType mediaType);
+ Intent getPlayerActivityIntent(Context context, MediaType mediaType, boolean remotePlayback);
/**
* Returns true if the PlaybackService should load new episodes from the queue when playback ends
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 6ea9dadeb..00c107f67 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -235,12 +235,12 @@ public class PlaybackService extends Service {
*/
public static Intent getPlayerActivityIntent(Context context) {
if (isRunning) {
- return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, currentMediaType);
+ return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, currentMediaType, isCasting);
} else {
if (PlaybackPreferences.getCurrentEpisodeIsVideo()) {
- return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, MediaType.VIDEO);
+ return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, MediaType.VIDEO, isCasting);
} else {
- return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, MediaType.AUDIO);
+ return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, MediaType.AUDIO, isCasting);
}
}
}
@@ -251,7 +251,7 @@ public class PlaybackService extends Service {
*/
public static Intent getPlayerActivityIntent(Context context, Playable media) {
MediaType mt = media.getMediaType();
- return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, mt);
+ return ClientConfig.playbackServiceCallbacks.getPlayerActivityIntent(context, mt, isCasting);
}
@Override