diff options
Diffstat (limited to 'core/src')
4 files changed, 92 insertions, 0 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/EventDistributor.java b/core/src/main/java/de/danoeh/antennapod/core/feed/EventDistributor.java index f8815dcf0..5a2cfa40e 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/EventDistributor.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/EventDistributor.java @@ -31,6 +31,7 @@ public class EventDistributor extends Observable { public static final int PLAYBACK_HISTORY_UPDATE = 16; public static final int DOWNLOAD_QUEUED = 32; public static final int DOWNLOAD_HANDLED = 64; + public static final int PLAYER_STATUS_UPDATE = 128; private Handler handler; private AbstractQueue<Integer> events; @@ -124,6 +125,10 @@ public class EventDistributor extends Observable { addEvent(DOWNLOAD_HANDLED); } + public void sendPlayerStatusUpdateBroadcast() { + addEvent(PLAYER_STATUS_UPDATE); + } + public static abstract class EventListener implements Observer { @Override 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 2434ee0cf..993578a7f 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 @@ -127,6 +127,15 @@ 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 player status is playing. + */ + public boolean isCurrentlyPlaying() { + return isPlaying() && PlaybackPreferences.getPlayerStatusIsPlaying(); + } + + @Override public int getTypeAsInt() { return FEEDFILETYPE_FEEDMEDIA; diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java index d88543f73..774a629ae 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java @@ -8,6 +8,7 @@ import android.util.Log; import org.apache.commons.lang3.Validate; import de.danoeh.antennapod.core.BuildConfig; +import de.danoeh.antennapod.core.feed.EventDistributor; /** * Provides access to preferences set by the playback service. A private @@ -43,6 +44,9 @@ public class PlaybackPreferences implements /** True if last played media was a video. */ public static final String PREF_CURRENT_EPISODE_IS_VIDEO = "de.danoeh.antennapod.preferences.lastIsVideo"; + /** True if player status is playing. */ + public static final String PREF_PLAYER_STATUS_IS_PLAYING = "de.danoeh.antennapod.preferences.playerStatusIsPlaying"; + /** Value of PREF_CURRENTLY_PLAYING_MEDIA if no media is playing. */ public static final long NO_MEDIA_PLAYING = -1; @@ -51,6 +55,7 @@ public class PlaybackPreferences implements private long currentlyPlayingMedia; private boolean currentEpisodeIsStream; private boolean currentEpisodeIsVideo; + private boolean playerStatusIsPlaying; private static PlaybackPreferences instance; private Context context; @@ -87,6 +92,7 @@ public class PlaybackPreferences implements NO_MEDIA_PLAYING); currentEpisodeIsStream = sp.getBoolean(PREF_CURRENT_EPISODE_IS_STREAM, true); currentEpisodeIsVideo = sp.getBoolean(PREF_CURRENT_EPISODE_IS_VIDEO, false); + playerStatusIsPlaying = sp.getBoolean(PREF_PLAYER_STATUS_IS_PLAYING, false); } @Override @@ -109,6 +115,11 @@ public class PlaybackPreferences implements currentlyPlayingFeedMediaId = sp.getLong( PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID, NO_MEDIA_PLAYING); } + else if (key.equals(PREF_PLAYER_STATUS_IS_PLAYING)) { + playerStatusIsPlaying = sp.getBoolean( + PREF_PLAYER_STATUS_IS_PLAYING, false); + EventDistributor.getInstance().sendPlayerStatusUpdateBroadcast(); + } } private static void instanceAvailable() { @@ -143,4 +154,10 @@ public class PlaybackPreferences implements return instance.currentEpisodeIsVideo; } + public static boolean getPlayerStatusIsPlaying() { + instanceAvailable(); + return instance.playerStatusIsPlaying; + } + + } 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 aabbcc185..a1aa176ae 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 @@ -101,6 +101,18 @@ public class PlaybackService extends Service { public static final String ACTION_SKIP_CURRENT_EPISODE = "action.de.danoeh.antennapod.core.service.skipCurrentEpisode"; /** + * If the PlaybackService receives this action, it will pause playback. + */ + public static final String ACTION_PAUSE_PLAY_CURRENT_EPISODE = "action.de.danoeh.antennapod.core.service.pausePlayCurrentEpisode"; + + + /** + * If the PlaybackService receives this action, it will resume playback. + */ + public static final String ACTION_RESUME_PLAY_CURRENT_EPISODE = "action.de.danoeh.antennapod.core.service.resumePlayCurrentEpisode"; + + + /** * Used in NOTIFICATION_TYPE_RELOAD. */ public static final int EXTRA_CODE_AUDIO = 1; @@ -216,6 +228,10 @@ public class PlaybackService extends Service { AudioManager.ACTION_AUDIO_BECOMING_NOISY)); registerReceiver(skipCurrentEpisodeReceiver, new IntentFilter( ACTION_SKIP_CURRENT_EPISODE)); + registerReceiver(pausePlayCurrentEpisodeReceiver, new IntentFilter( + ACTION_PAUSE_PLAY_CURRENT_EPISODE)); + registerReceiver(pauseResumeCurrentEpisodeReceiver, new IntentFilter( + ACTION_RESUME_PLAY_CURRENT_EPISODE)); remoteControlClient = setupRemoteControlClient(); taskManager = new PlaybackServiceTaskManager(this, taskManagerCallback); mediaPlayer = new PlaybackServiceMediaPlayer(this, mediaPlayerCallback); @@ -427,6 +443,7 @@ public class PlaybackService extends Service { // remove notifcation on pause stopForeground(true); } + writePlayerStatusPlaybackPreferences(); break; @@ -443,9 +460,11 @@ public class PlaybackService extends Service { taskManager.startPositionSaver(); taskManager.startWidgetUpdater(); + writePlayerStatusPlaybackPreferences(); setupNotification(newInfo); started = true; break; + case ERROR: writePlaybackPreferencesNoMediaPlaying(); break; @@ -634,6 +653,8 @@ public class PlaybackService extends Service { editor.putLong( PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID, PlaybackPreferences.NO_MEDIA_PLAYING); + editor.putBoolean( + PlaybackPreferences.PREF_PLAYER_STATUS_IS_PLAYING, false); editor.commit(); } @@ -647,6 +668,7 @@ public class PlaybackService extends Service { PlaybackServiceMediaPlayer.PSMPInfo info = mediaPlayer.getPSMPInfo(); MediaType mediaType = mediaPlayer.getCurrentMediaType(); boolean stream = mediaPlayer.isStreaming(); + boolean isPlaying = (info.playerStatus == PlayerStatus.PLAYING); if (info.playable != null) { editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_MEDIA, @@ -683,6 +705,23 @@ public class PlaybackService extends Service { PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID, PlaybackPreferences.NO_MEDIA_PLAYING); } + editor.putBoolean( + PlaybackPreferences.PREF_PLAYER_STATUS_IS_PLAYING, isPlaying); + + editor.commit(); + } + + private void writePlayerStatusPlaybackPreferences() { + if (BuildConfig.DEBUG) + Log.d(TAG, "Writing player status playback preferences"); + + SharedPreferences.Editor editor = PreferenceManager + .getDefaultSharedPreferences(getApplicationContext()).edit(); + PlaybackServiceMediaPlayer.PSMPInfo info = mediaPlayer.getPSMPInfo(); + boolean isPlaying = (info.playerStatus == PlayerStatus.PLAYING); + + editor.putBoolean( + PlaybackPreferences.PREF_PLAYER_STATUS_IS_PLAYING, isPlaying); editor.commit(); } @@ -1101,6 +1140,28 @@ public class PlaybackService extends Service { } }; + private BroadcastReceiver pauseResumeCurrentEpisodeReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (StringUtils.equals(intent.getAction(), ACTION_RESUME_PLAY_CURRENT_EPISODE)) { + if (BuildConfig.DEBUG) + Log.d(TAG, "Received RESUME_PLAY_CURRENT_EPISODE intent"); + mediaPlayer.resume(); + } + } + }; + + private BroadcastReceiver pausePlayCurrentEpisodeReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (StringUtils.equals(intent.getAction(), ACTION_PAUSE_PLAY_CURRENT_EPISODE)) { + if (BuildConfig.DEBUG) + Log.d(TAG, "Received PAUSE_PLAY_CURRENT_EPISODE intent"); + mediaPlayer.pause(false, false); + } + } + }; + public static MediaType getCurrentMediaType() { return currentMediaType; } |