This commit is contained in:
daniel oeh 2013-04-21 11:10:38 +02:00
parent d086579e09
commit 83595ded9f
1 changed files with 19 additions and 17 deletions

View File

@ -73,7 +73,7 @@ public class PlaybackService extends Service {
public static final String EXTRA_PREPARE_IMMEDIATELY = "extra.de.danoeh.antennapod.service.prepareImmediately"; public static final String EXTRA_PREPARE_IMMEDIATELY = "extra.de.danoeh.antennapod.service.prepareImmediately";
public static final String ACTION_PLAYER_STATUS_CHANGED = "action.de.danoeh.antennapod.service.playerStatusChanged"; public static final String ACTION_PLAYER_STATUS_CHANGED = "action.de.danoeh.antennapod.service.playerStatusChanged";
private static final String AVRCP_ACTION_PLAYER_STATUS_CHANGED= "com.android.music.playstatechanged"; private static final String AVRCP_ACTION_PLAYER_STATUS_CHANGED = "com.android.music.playstatechanged";
public static final String ACTION_PLAYER_NOTIFICATION = "action.de.danoeh.antennapod.service.playerNotification"; public static final String ACTION_PLAYER_NOTIFICATION = "action.de.danoeh.antennapod.service.playerNotification";
public static final String EXTRA_NOTIFICATION_CODE = "extra.de.danoeh.antennapod.service.notificationCode"; public static final String EXTRA_NOTIFICATION_CODE = "extra.de.danoeh.antennapod.service.notificationCode";
@ -363,13 +363,15 @@ public class PlaybackService extends Service {
} }
// Intent values appear to be valid // Intent values appear to be valid
// check if already playing and playbackType is the same // check if already playing and playbackType is the same
} else if (media == null || playable != media } else if (media == null
|| !playable.getIdentifier().equals(media.getIdentifier())
|| playbackType != shouldStream) { || playbackType != shouldStream) {
pause(true, false); pause(true, false);
player.reset(); player.reset();
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0); sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
if (media == null if (media == null
|| playable.getIdentifier() != media.getIdentifier()) { || !playable.getIdentifier().equals(
media.getIdentifier())) {
media = playable; media = playable;
} }