Adding audio variable speed playback support at the service level
This commit is contained in:
parent
d086579e09
commit
a86501c795
|
@ -51,9 +51,13 @@ import de.danoeh.antennapod.preferences.UserPreferences;
|
|||
import de.danoeh.antennapod.receiver.MediaButtonReceiver;
|
||||
import de.danoeh.antennapod.receiver.PlayerWidget;
|
||||
import de.danoeh.antennapod.util.BitmapDecoder;
|
||||
import de.danoeh.antennapod.util.DuckType;
|
||||
import de.danoeh.antennapod.util.flattr.FlattrUtils;
|
||||
import de.danoeh.antennapod.util.playback.AudioPlayer;
|
||||
import de.danoeh.antennapod.util.playback.IPlayer;
|
||||
import de.danoeh.antennapod.util.playback.Playable;
|
||||
import de.danoeh.antennapod.util.playback.Playable.PlayableException;
|
||||
import de.danoeh.antennapod.util.playback.VideoPlayer;
|
||||
|
||||
/** Controls the MediaPlayer that plays a FeedMedia-file */
|
||||
public class PlaybackService extends Service {
|
||||
|
@ -73,7 +77,7 @@ public class PlaybackService extends Service {
|
|||
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";
|
||||
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 EXTRA_NOTIFICATION_CODE = "extra.de.danoeh.antennapod.service.notificationCode";
|
||||
|
@ -120,7 +124,7 @@ public class PlaybackService extends Service {
|
|||
private AudioManager audioManager;
|
||||
private ComponentName mediaButtonReceiver;
|
||||
|
||||
private MediaPlayer player;
|
||||
private IPlayer player;
|
||||
private RemoteControlClient remoteControlClient;
|
||||
|
||||
private Playable media;
|
||||
|
@ -215,8 +219,7 @@ public class PlaybackService extends Service {
|
|||
status = PlayerStatus.STOPPED;
|
||||
audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
|
||||
manager = FeedManager.getInstance();
|
||||
schedExecutor = new ScheduledThreadPoolExecutor(SCHED_EX_POOL_SIZE,
|
||||
new ThreadFactory() {
|
||||
schedExecutor = new ScheduledThreadPoolExecutor(SCHED_EX_POOL_SIZE, new ThreadFactory() {
|
||||
|
||||
@Override
|
||||
public Thread newThread(Runnable r) {
|
||||
|
@ -227,43 +230,50 @@ public class PlaybackService extends Service {
|
|||
}, new RejectedExecutionHandler() {
|
||||
|
||||
@Override
|
||||
public void rejectedExecution(Runnable r,
|
||||
ThreadPoolExecutor executor) {
|
||||
public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
|
||||
Log.w(TAG, "SchedEx rejected submission of new task");
|
||||
}
|
||||
});
|
||||
player = createMediaPlayer();
|
||||
|
||||
mediaButtonReceiver = new ComponentName(getPackageName(),
|
||||
MediaButtonReceiver.class.getName());
|
||||
mediaButtonReceiver = new ComponentName(getPackageName(), MediaButtonReceiver.class.getName());
|
||||
audioManager.registerMediaButtonEventReceiver(mediaButtonReceiver);
|
||||
if (android.os.Build.VERSION.SDK_INT >= 14) {
|
||||
audioManager
|
||||
.registerRemoteControlClient(setupRemoteControlClient());
|
||||
audioManager.registerRemoteControlClient(setupRemoteControlClient());
|
||||
}
|
||||
registerReceiver(headsetDisconnected, new IntentFilter(
|
||||
Intent.ACTION_HEADSET_PLUG));
|
||||
registerReceiver(shutdownReceiver, new IntentFilter(
|
||||
ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
registerReceiver(audioBecomingNoisy, new IntentFilter(
|
||||
AudioManager.ACTION_AUDIO_BECOMING_NOISY));
|
||||
registerReceiver(skipCurrentEpisodeReceiver, new IntentFilter(
|
||||
ACTION_SKIP_CURRENT_EPISODE));
|
||||
registerReceiver(headsetDisconnected, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
|
||||
registerReceiver(shutdownReceiver, new IntentFilter(ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
registerReceiver(audioBecomingNoisy, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
|
||||
registerReceiver(skipCurrentEpisodeReceiver, new IntentFilter(ACTION_SKIP_CURRENT_EPISODE));
|
||||
|
||||
}
|
||||
|
||||
private MediaPlayer createMediaPlayer() {
|
||||
return createMediaPlayer(new MediaPlayer());
|
||||
private IPlayer createMediaPlayer() {
|
||||
IPlayer player;
|
||||
if (media == null || media.getMediaType() == MediaType.VIDEO) {
|
||||
player = new VideoPlayer();
|
||||
} else {
|
||||
player = new AudioPlayer(this);
|
||||
}
|
||||
return createMediaPlayer(player);
|
||||
}
|
||||
|
||||
private MediaPlayer createMediaPlayer(MediaPlayer mp) {
|
||||
if (mp != null) {
|
||||
mp.setOnPreparedListener(preparedListener);
|
||||
mp.setOnCompletionListener(completionListener);
|
||||
mp.setOnSeekCompleteListener(onSeekCompleteListener);
|
||||
mp.setOnErrorListener(onErrorListener);
|
||||
mp.setOnBufferingUpdateListener(onBufferingUpdateListener);
|
||||
mp.setOnInfoListener(onInfoListener);
|
||||
private IPlayer createMediaPlayer(IPlayer mp) {
|
||||
if (mp != null && media != null) {
|
||||
if (media.getMediaType() == MediaType.AUDIO) {
|
||||
((AudioPlayer) mp).setOnPreparedListener(audioPreparedListener);
|
||||
((AudioPlayer) mp).setOnCompletionListener(audioCompletionListener);
|
||||
((AudioPlayer) mp).setOnSeekCompleteListener(audioSeekCompleteListener);
|
||||
((AudioPlayer) mp).setOnErrorListener(audioErrorListener);
|
||||
((AudioPlayer) mp).setOnBufferingUpdateListener(audioBufferingUpdateListener);
|
||||
((AudioPlayer) mp).setOnInfoListener(audioInfoListener);
|
||||
} else {
|
||||
((VideoPlayer) mp).setOnPreparedListener(videoPreparedListener);
|
||||
((VideoPlayer) mp).setOnCompletionListener(videoCompletionListener);
|
||||
((VideoPlayer) mp).setOnSeekCompleteListener(videoSeekCompleteListener);
|
||||
((VideoPlayer) mp).setOnErrorListener(videoErrorListener);
|
||||
((VideoPlayer) mp).setOnBufferingUpdateListener(videoBufferingUpdateListener);
|
||||
((VideoPlayer) mp).setOnInfoListener(videoInfoListener);
|
||||
}
|
||||
}
|
||||
return mp;
|
||||
}
|
||||
|
@ -315,8 +325,7 @@ public class PlaybackService extends Service {
|
|||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Gained audio focus");
|
||||
if (pausedBecauseOfTransientAudiofocusLoss) {
|
||||
audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
|
||||
AudioManager.ADJUST_RAISE, 0);
|
||||
audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, 0);
|
||||
play();
|
||||
}
|
||||
break;
|
||||
|
@ -324,8 +333,7 @@ public class PlaybackService extends Service {
|
|||
if (status == PlayerStatus.PLAYING) {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Lost audio focus temporarily. Ducking...");
|
||||
audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
|
||||
AudioManager.ADJUST_LOWER, 0);
|
||||
audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, 0);
|
||||
pausedBecauseOfTransientAudiofocusLoss = true;
|
||||
}
|
||||
break;
|
||||
|
@ -354,8 +362,7 @@ public class PlaybackService extends Service {
|
|||
} else {
|
||||
|
||||
Playable playable = intent.getParcelableExtra(EXTRA_PLAYABLE);
|
||||
boolean playbackType = intent.getBooleanExtra(EXTRA_SHOULD_STREAM,
|
||||
true);
|
||||
boolean playbackType = intent.getBooleanExtra(EXTRA_SHOULD_STREAM, true);
|
||||
if (playable == null) {
|
||||
Log.e(TAG, "Playable extra wasn't sent to the service");
|
||||
if (media == null) {
|
||||
|
@ -363,22 +370,17 @@ public class PlaybackService extends Service {
|
|||
}
|
||||
// Intent values appear to be valid
|
||||
// check if already playing and playbackType is the same
|
||||
} else if (media == null || playable != media
|
||||
|| playbackType != shouldStream) {
|
||||
} else if (media == null || playable != media || playbackType != shouldStream) {
|
||||
pause(true, false);
|
||||
player.reset();
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
|
||||
if (media == null
|
||||
|| playable.getIdentifier() != media.getIdentifier()) {
|
||||
if (media == null || playable.getIdentifier() != media.getIdentifier()) {
|
||||
media = playable;
|
||||
}
|
||||
|
||||
if (media != null) {
|
||||
shouldStream = playbackType;
|
||||
startWhenPrepared = intent.getBooleanExtra(
|
||||
EXTRA_START_WHEN_PREPARED, false);
|
||||
prepareImmediately = intent.getBooleanExtra(
|
||||
EXTRA_PREPARE_IMMEDIATELY, false);
|
||||
startWhenPrepared = intent.getBooleanExtra(EXTRA_START_WHEN_PREPARED, false);
|
||||
prepareImmediately = intent.getBooleanExtra(EXTRA_PREPARE_IMMEDIATELY, false);
|
||||
initMediaplayer();
|
||||
|
||||
} else {
|
||||
|
@ -442,8 +444,7 @@ public class PlaybackService extends Service {
|
|||
Log.d(TAG, "Setting display");
|
||||
player.setDisplay(null);
|
||||
player.setDisplay(sh);
|
||||
if (status == PlayerStatus.STOPPED
|
||||
|| status == PlayerStatus.AWAITING_VIDEO_SURFACE) {
|
||||
if (status == PlayerStatus.STOPPED || status == PlayerStatus.AWAITING_VIDEO_SURFACE) {
|
||||
try {
|
||||
InitTask initTask = new InitTask() {
|
||||
|
||||
|
@ -453,13 +454,11 @@ public class PlaybackService extends Service {
|
|||
if (result != null) {
|
||||
try {
|
||||
if (shouldStream) {
|
||||
player.setDataSource(media
|
||||
.getStreamUrl());
|
||||
player.setDataSource(media.getStreamUrl());
|
||||
setStatus(PlayerStatus.PREPARING);
|
||||
player.prepareAsync();
|
||||
} else {
|
||||
player.setDataSource(media
|
||||
.getLocalMediaUrl());
|
||||
player.setDataSource(media.getLocalMediaUrl());
|
||||
setStatus(PlayerStatus.PREPARING);
|
||||
player.prepareAsync();
|
||||
}
|
||||
|
@ -468,8 +467,7 @@ public class PlaybackService extends Service {
|
|||
}
|
||||
} else {
|
||||
setStatus(PlayerStatus.ERROR);
|
||||
sendBroadcast(new Intent(
|
||||
ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
sendBroadcast(new Intent(ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -500,7 +498,6 @@ public class PlaybackService extends Service {
|
|||
player.setDisplay(null);
|
||||
player.reset();
|
||||
player.release();
|
||||
player = createMediaPlayer();
|
||||
status = PlayerStatus.STOPPED;
|
||||
if (media != null) {
|
||||
initMediaplayer();
|
||||
|
@ -516,6 +513,10 @@ public class PlaybackService extends Service {
|
|||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Setting up media player");
|
||||
try {
|
||||
if (player != null) {
|
||||
player.release();
|
||||
}
|
||||
player = createMediaPlayer();
|
||||
MediaType mediaType = media.getMediaType();
|
||||
if (mediaType == MediaType.AUDIO) {
|
||||
if (AppConfig.DEBUG)
|
||||
|
@ -533,11 +534,9 @@ public class PlaybackService extends Service {
|
|||
playingVideo = false;
|
||||
try {
|
||||
if (shouldStream) {
|
||||
player.setDataSource(media
|
||||
.getStreamUrl());
|
||||
player.setDataSource(media.getStreamUrl());
|
||||
} else if (media.localFileAvailable()) {
|
||||
player.setDataSource(media
|
||||
.getLocalMediaUrl());
|
||||
player.setDataSource(media.getLocalMediaUrl());
|
||||
}
|
||||
|
||||
if (prepareImmediately) {
|
||||
|
@ -550,20 +549,17 @@ public class PlaybackService extends Service {
|
|||
e.printStackTrace();
|
||||
media = null;
|
||||
setStatus(PlayerStatus.ERROR);
|
||||
sendBroadcast(new Intent(
|
||||
ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
sendBroadcast(new Intent(ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
}
|
||||
} else {
|
||||
Log.e(TAG, "InitTask could not load metadata");
|
||||
media = null;
|
||||
setStatus(PlayerStatus.ERROR);
|
||||
sendBroadcast(new Intent(
|
||||
ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
sendBroadcast(new Intent(ACTION_SHUTDOWN_PLAYBACK_SERVICE));
|
||||
}
|
||||
} else {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG,
|
||||
"Status of player has changed during initialization. Stopping init process.");
|
||||
Log.d(TAG, "Status of player has changed during initialization. Stopping init process.");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -592,14 +588,11 @@ public class PlaybackService extends Service {
|
|||
}
|
||||
|
||||
private void setupPositionSaver() {
|
||||
if (positionSaverFuture == null
|
||||
|| (positionSaverFuture.isCancelled() || positionSaverFuture
|
||||
.isDone())) {
|
||||
if (positionSaverFuture == null || (positionSaverFuture.isCancelled() || positionSaverFuture.isDone())) {
|
||||
|
||||
positionSaver = new PositionSaver();
|
||||
positionSaverFuture = schedExecutor.scheduleAtFixedRate(
|
||||
positionSaver, PositionSaver.WAITING_INTERVALL,
|
||||
PositionSaver.WAITING_INTERVALL, TimeUnit.MILLISECONDS);
|
||||
positionSaverFuture = schedExecutor.scheduleAtFixedRate(positionSaver, PositionSaver.WAITING_INTERVALL, PositionSaver.WAITING_INTERVALL,
|
||||
TimeUnit.MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -611,9 +604,22 @@ public class PlaybackService extends Service {
|
|||
}
|
||||
}
|
||||
|
||||
private MediaPlayer.OnPreparedListener preparedListener = new MediaPlayer.OnPreparedListener() {
|
||||
private final com.aocate.media.MediaPlayer.OnPreparedListener audioPreparedListener = new com.aocate.media.MediaPlayer.OnPreparedListener() {
|
||||
@Override
|
||||
public void onPrepared(MediaPlayer mp) {
|
||||
public void onPrepared(com.aocate.media.MediaPlayer mp) {
|
||||
genericOnPrepared(mp);
|
||||
}
|
||||
};
|
||||
|
||||
private final android.media.MediaPlayer.OnPreparedListener videoPreparedListener = new android.media.MediaPlayer.OnPreparedListener() {
|
||||
@Override
|
||||
public void onPrepared(android.media.MediaPlayer mp) {
|
||||
genericOnPrepared(mp);
|
||||
}
|
||||
};
|
||||
|
||||
private final void genericOnPrepared(Object inObj) {
|
||||
IPlayer mp = DuckType.coerce(inObj).to(IPlayer.class);
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Resource prepared");
|
||||
mp.seekTo(media.getPosition());
|
||||
|
@ -634,8 +640,7 @@ public class PlaybackService extends Service {
|
|||
if (media != null && media.getChapters() == null) {
|
||||
media.loadChapterMarks();
|
||||
if (!isInterrupted() && media.getChapters() != null) {
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD,
|
||||
0);
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
|
||||
}
|
||||
}
|
||||
if (AppConfig.DEBUG)
|
||||
|
@ -648,23 +653,42 @@ public class PlaybackService extends Service {
|
|||
play();
|
||||
}
|
||||
}
|
||||
|
||||
private final com.aocate.media.MediaPlayer.OnSeekCompleteListener audioSeekCompleteListener = new com.aocate.media.MediaPlayer.OnSeekCompleteListener() {
|
||||
@Override
|
||||
public void onSeekComplete(com.aocate.media.MediaPlayer mp) {
|
||||
genericSeekCompleteListener();
|
||||
}
|
||||
};
|
||||
|
||||
private MediaPlayer.OnSeekCompleteListener onSeekCompleteListener = new MediaPlayer.OnSeekCompleteListener() {
|
||||
|
||||
private final android.media.MediaPlayer.OnSeekCompleteListener videoSeekCompleteListener = new android.media.MediaPlayer.OnSeekCompleteListener() {
|
||||
@Override
|
||||
public void onSeekComplete(MediaPlayer mp) {
|
||||
public void onSeekComplete(android.media.MediaPlayer mp) {
|
||||
genericSeekCompleteListener();
|
||||
}
|
||||
};
|
||||
|
||||
private final void genericSeekCompleteListener() {
|
||||
if (status == PlayerStatus.SEEKING) {
|
||||
setStatus(statusBeforeSeek);
|
||||
}
|
||||
}
|
||||
|
||||
private final com.aocate.media.MediaPlayer.OnInfoListener audioInfoListener = new com.aocate.media.MediaPlayer.OnInfoListener() {
|
||||
@Override
|
||||
public boolean onInfo(com.aocate.media.MediaPlayer mp, int what, int extra) {
|
||||
return genericInfoListener(what);
|
||||
}
|
||||
};
|
||||
|
||||
private MediaPlayer.OnInfoListener onInfoListener = new MediaPlayer.OnInfoListener() {
|
||||
|
||||
private final android.media.MediaPlayer.OnInfoListener videoInfoListener = new android.media.MediaPlayer.OnInfoListener() {
|
||||
@Override
|
||||
public boolean onInfo(MediaPlayer mp, int what, int extra) {
|
||||
public boolean onInfo(android.media.MediaPlayer mp, int what, int extra) {
|
||||
return genericInfoListener(what);
|
||||
}
|
||||
};
|
||||
|
||||
private boolean genericInfoListener(int what) {
|
||||
switch (what) {
|
||||
case MediaPlayer.MEDIA_INFO_BUFFERING_START:
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_BUFFER_START, 0);
|
||||
|
@ -676,14 +700,25 @@ public class PlaybackService extends Service {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private final com.aocate.media.MediaPlayer.OnErrorListener audioErrorListener = new com.aocate.media.MediaPlayer.OnErrorListener() {
|
||||
@Override
|
||||
public boolean onError(com.aocate.media.MediaPlayer mp, int what, int extra) {
|
||||
return genericOnError(mp, what, extra);
|
||||
}
|
||||
};
|
||||
|
||||
private MediaPlayer.OnErrorListener onErrorListener = new MediaPlayer.OnErrorListener() {
|
||||
private static final String TAG = "PlaybackService.onErrorListener";
|
||||
|
||||
private final android.media.MediaPlayer.OnErrorListener videoErrorListener = new android.media.MediaPlayer.OnErrorListener() {
|
||||
@Override
|
||||
public boolean onError(MediaPlayer mp, int what, int extra) {
|
||||
Log.w(TAG, "An error has occured: " + what);
|
||||
public boolean onError(android.media.MediaPlayer mp, int what, int extra) {
|
||||
return genericOnError(mp, what, extra);
|
||||
}
|
||||
};
|
||||
|
||||
private boolean genericOnError(Object inObj, int what, int extra) {
|
||||
final String TAG = "PlaybackService.onErrorListener";
|
||||
Log.w(TAG, "An error has occured: " + what + " " + extra);
|
||||
IPlayer mp = DuckType.coerce(inObj).to(IPlayer.class);
|
||||
if (mp.isPlaying()) {
|
||||
pause(true, true);
|
||||
}
|
||||
|
@ -692,25 +727,43 @@ public class PlaybackService extends Service {
|
|||
stopSelf();
|
||||
return true;
|
||||
}
|
||||
|
||||
private final com.aocate.media.MediaPlayer.OnCompletionListener audioCompletionListener = new com.aocate.media.MediaPlayer.OnCompletionListener() {
|
||||
@Override
|
||||
public void onCompletion(com.aocate.media.MediaPlayer mp) {
|
||||
genericOnCompletion();
|
||||
}
|
||||
};
|
||||
|
||||
private MediaPlayer.OnCompletionListener completionListener = new MediaPlayer.OnCompletionListener() {
|
||||
|
||||
private final android.media.MediaPlayer.OnCompletionListener videoCompletionListener = new android.media.MediaPlayer.OnCompletionListener() {
|
||||
@Override
|
||||
public void onCompletion(MediaPlayer mp) {
|
||||
public void onCompletion(android.media.MediaPlayer mp) {
|
||||
genericOnCompletion();
|
||||
}
|
||||
};
|
||||
|
||||
private void genericOnCompletion() {
|
||||
endPlayback(true);
|
||||
}
|
||||
};
|
||||
|
||||
private MediaPlayer.OnBufferingUpdateListener onBufferingUpdateListener = new MediaPlayer.OnBufferingUpdateListener() {
|
||||
|
||||
private final com.aocate.media.MediaPlayer.OnBufferingUpdateListener audioBufferingUpdateListener = new com.aocate.media.MediaPlayer.OnBufferingUpdateListener() {
|
||||
@Override
|
||||
public void onBufferingUpdate(MediaPlayer mp, int percent) {
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_BUFFER_UPDATE, percent);
|
||||
|
||||
public void onBufferingUpdate(com.aocate.media.MediaPlayer mp, int percent) {
|
||||
genericOnBufferingUpdate(percent);
|
||||
}
|
||||
};
|
||||
|
||||
private final android.media.MediaPlayer.OnBufferingUpdateListener videoBufferingUpdateListener = new android.media.MediaPlayer.OnBufferingUpdateListener() {
|
||||
@Override
|
||||
public void onBufferingUpdate(android.media.MediaPlayer mp, int percent) {
|
||||
genericOnBufferingUpdate(percent);
|
||||
}
|
||||
};
|
||||
|
||||
private void genericOnBufferingUpdate(int percent) {
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_BUFFER_UPDATE, percent);
|
||||
}
|
||||
|
||||
private void endPlayback(boolean playNextEpisode) {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Playback ended");
|
||||
|
@ -727,8 +780,7 @@ public class PlaybackService extends Service {
|
|||
((FeedMedia) media).setPlaybackCompletionDate(new Date());
|
||||
manager.markItemRead(PlaybackService.this, item, true, true);
|
||||
nextItem = manager.getQueueSuccessorOfItem(item);
|
||||
isInQueue = media instanceof FeedMedia
|
||||
&& manager.isInQueue(((FeedMedia) media).getItem());
|
||||
isInQueue = media instanceof FeedMedia && manager.isInQueue(((FeedMedia) media).getItem());
|
||||
if (isInQueue) {
|
||||
manager.removeQueueItem(PlaybackService.this, item, true);
|
||||
}
|
||||
|
@ -744,8 +796,7 @@ public class PlaybackService extends Service {
|
|||
// is an episode in the queue left.
|
||||
// Start playback immediately if continuous playback is enabled
|
||||
boolean loadNextItem = isInQueue && nextItem != null;
|
||||
playNextEpisode = playNextEpisode && loadNextItem
|
||||
&& UserPreferences.isFollowQueue();
|
||||
playNextEpisode = playNextEpisode && loadNextItem && UserPreferences.isFollowQueue();
|
||||
if (loadNextItem) {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Loading next item in queue");
|
||||
|
@ -779,8 +830,7 @@ public class PlaybackService extends Service {
|
|||
if (media != null) {
|
||||
resetVideoSurface();
|
||||
refreshRemoteControlClientState();
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD,
|
||||
notificationCode);
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, notificationCode);
|
||||
} else {
|
||||
sendNotificationBroadcast(NOTIFICATION_TYPE_PLAYBACK_END, 0);
|
||||
stopSelf();
|
||||
|
@ -789,8 +839,7 @@ public class PlaybackService extends Service {
|
|||
|
||||
public void setSleepTimer(long waitingTime) {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Setting sleep timer to " + Long.toString(waitingTime)
|
||||
+ " milliseconds");
|
||||
Log.d(TAG, "Setting sleep timer to " + Long.toString(waitingTime) + " milliseconds");
|
||||
if (sleepTimerFuture != null) {
|
||||
sleepTimerFuture.cancel(true);
|
||||
}
|
||||
|
@ -819,7 +868,7 @@ public class PlaybackService extends Service {
|
|||
* file is being streamed
|
||||
*/
|
||||
public void pause(boolean abandonFocus, boolean reinit) {
|
||||
if (player.isPlaying()) {
|
||||
if (player != null && player.isPlaying()) {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Pausing playback.");
|
||||
player.pause();
|
||||
|
@ -843,9 +892,7 @@ public class PlaybackService extends Service {
|
|||
public void stop() {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Stopping playback");
|
||||
if (status == PlayerStatus.PREPARED || status == PlayerStatus.PAUSED
|
||||
|| status == PlayerStatus.STOPPED
|
||||
|| status == PlayerStatus.PLAYING) {
|
||||
if (status == PlayerStatus.PREPARED || status == PlayerStatus.PAUSED || status == PlayerStatus.STOPPED || status == PlayerStatus.PLAYING) {
|
||||
player.stop();
|
||||
}
|
||||
setCurrentlyPlayingMedia(PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
|
@ -868,18 +915,14 @@ public class PlaybackService extends Service {
|
|||
/** Resets the media player and moves into INITIALIZED state. */
|
||||
public void reinit() {
|
||||
player.reset();
|
||||
player = createMediaPlayer(player);
|
||||
prepareImmediately = false;
|
||||
initMediaplayer();
|
||||
}
|
||||
|
||||
@SuppressLint("NewApi")
|
||||
public void play() {
|
||||
if (status == PlayerStatus.PAUSED || status == PlayerStatus.PREPARED
|
||||
|| status == PlayerStatus.STOPPED) {
|
||||
int focusGained = audioManager.requestAudioFocus(
|
||||
audioFocusChangeListener, AudioManager.STREAM_MUSIC,
|
||||
AudioManager.AUDIOFOCUS_GAIN);
|
||||
if (status == PlayerStatus.PAUSED || status == PlayerStatus.PREPARED || status == PlayerStatus.STOPPED) {
|
||||
int focusGained = audioManager.requestAudioFocus(audioFocusChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
|
||||
|
||||
if (focusGained == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
|
||||
if (AppConfig.DEBUG)
|
||||
|
@ -890,7 +933,7 @@ public class PlaybackService extends Service {
|
|||
|
||||
player.start();
|
||||
if (status != PlayerStatus.PAUSED) {
|
||||
player.seekTo((int) media.getPosition());
|
||||
player.seekTo(media.getPosition());
|
||||
}
|
||||
setStatus(PlayerStatus.PLAYING);
|
||||
setupPositionSaver();
|
||||
|
@ -898,11 +941,9 @@ public class PlaybackService extends Service {
|
|||
setupNotification();
|
||||
pausedBecauseOfTransientAudiofocusLoss = false;
|
||||
if (android.os.Build.VERSION.SDK_INT >= 14) {
|
||||
audioManager
|
||||
.registerRemoteControlClient(remoteControlClient);
|
||||
audioManager.registerRemoteControlClient(remoteControlClient);
|
||||
}
|
||||
audioManager
|
||||
.registerMediaButtonEventReceiver(mediaButtonReceiver);
|
||||
audioManager.registerMediaButtonEventReceiver(mediaButtonReceiver);
|
||||
media.onPlaybackStart();
|
||||
} else {
|
||||
if (AppConfig.DEBUG)
|
||||
|
@ -915,42 +956,24 @@ public class PlaybackService extends Service {
|
|||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Writing playback preferences");
|
||||
|
||||
SharedPreferences.Editor editor = PreferenceManager
|
||||
.getDefaultSharedPreferences(getApplicationContext()).edit();
|
||||
SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit();
|
||||
if (media != null) {
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_MEDIA,
|
||||
media.getPlayableType());
|
||||
editor.putBoolean(
|
||||
PlaybackPreferences.PREF_CURRENT_EPISODE_IS_STREAM,
|
||||
shouldStream);
|
||||
editor.putBoolean(
|
||||
PlaybackPreferences.PREF_CURRENT_EPISODE_IS_VIDEO,
|
||||
playingVideo);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_MEDIA, media.getPlayableType());
|
||||
editor.putBoolean(PlaybackPreferences.PREF_CURRENT_EPISODE_IS_STREAM, shouldStream);
|
||||
editor.putBoolean(PlaybackPreferences.PREF_CURRENT_EPISODE_IS_VIDEO, playingVideo);
|
||||
if (media instanceof FeedMedia) {
|
||||
FeedMedia fMedia = (FeedMedia) media;
|
||||
editor.putLong(
|
||||
PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID,
|
||||
fMedia.getItem().getFeed().getId());
|
||||
editor.putLong(
|
||||
PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID,
|
||||
fMedia.getId());
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID, fMedia.getItem().getFeed().getId());
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID, fMedia.getId());
|
||||
} else {
|
||||
editor.putLong(
|
||||
PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID,
|
||||
PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(
|
||||
PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID,
|
||||
PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID, PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID, PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
}
|
||||
media.writeToPreferences(editor);
|
||||
} else {
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_MEDIA,
|
||||
PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID,
|
||||
PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(
|
||||
PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID,
|
||||
PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_MEDIA, PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID, PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEEDMEDIA_ID, PlaybackPreferences.NO_MEDIA_PLAYING);
|
||||
}
|
||||
|
||||
editor.commit();
|
||||
|
@ -984,8 +1007,7 @@ public class PlaybackService extends Service {
|
|||
/** Prepares notification and starts the service in the foreground. */
|
||||
@SuppressLint("NewApi")
|
||||
private void setupNotification() {
|
||||
final PendingIntent pIntent = PendingIntent.getActivity(this, 0,
|
||||
PlaybackService.getPlayerActivityIntent(this),
|
||||
final PendingIntent pIntent = PendingIntent.getActivity(this, 0, PlaybackService.getPlayerActivityIntent(this),
|
||||
PendingIntent.FLAG_UPDATE_CURRENT);
|
||||
|
||||
if (notificationSetupTask != null) {
|
||||
|
@ -1000,17 +1022,13 @@ public class PlaybackService extends Service {
|
|||
Log.d(TAG, "Starting background work");
|
||||
if (android.os.Build.VERSION.SDK_INT >= 11) {
|
||||
if (media != null && media != null) {
|
||||
int iconSize = getResources().getDimensionPixelSize(
|
||||
android.R.dimen.notification_large_icon_width);
|
||||
icon = BitmapDecoder
|
||||
.decodeBitmapFromWorkerTaskResource(iconSize,
|
||||
media);
|
||||
int iconSize = getResources().getDimensionPixelSize(android.R.dimen.notification_large_icon_width);
|
||||
icon = BitmapDecoder.decodeBitmapFromWorkerTaskResource(iconSize, media);
|
||||
}
|
||||
|
||||
}
|
||||
if (icon == null) {
|
||||
icon = BitmapFactory.decodeResource(getResources(),
|
||||
R.drawable.ic_stat_antenna);
|
||||
icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_stat_antenna);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
@ -1019,40 +1037,24 @@ public class PlaybackService extends Service {
|
|||
@Override
|
||||
protected void onPostExecute(Void result) {
|
||||
super.onPostExecute(result);
|
||||
if (!isCancelled() && status == PlayerStatus.PLAYING
|
||||
&& media != null) {
|
||||
if (!isCancelled() && status == PlayerStatus.PLAYING && media != null) {
|
||||
String contentText = media.getFeedTitle();
|
||||
String contentTitle = media.getEpisodeTitle();
|
||||
Notification notification = null;
|
||||
if (android.os.Build.VERSION.SDK_INT >= 16) {
|
||||
Intent pauseButtonIntent = new Intent(
|
||||
PlaybackService.this, PlaybackService.class);
|
||||
pauseButtonIntent.putExtra(
|
||||
MediaButtonReceiver.EXTRA_KEYCODE,
|
||||
KeyEvent.KEYCODE_MEDIA_PAUSE);
|
||||
PendingIntent pauseButtonPendingIntent = PendingIntent
|
||||
.getService(PlaybackService.this, 0,
|
||||
pauseButtonIntent,
|
||||
Intent pauseButtonIntent = new Intent(PlaybackService.this, PlaybackService.class);
|
||||
pauseButtonIntent.putExtra(MediaButtonReceiver.EXTRA_KEYCODE, KeyEvent.KEYCODE_MEDIA_PAUSE);
|
||||
PendingIntent pauseButtonPendingIntent = PendingIntent.getService(PlaybackService.this, 0, pauseButtonIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT);
|
||||
Notification.Builder notificationBuilder = new Notification.Builder(
|
||||
PlaybackService.this)
|
||||
.setContentTitle(contentTitle)
|
||||
.setContentText(contentText)
|
||||
.setOngoing(true)
|
||||
.setContentIntent(pIntent)
|
||||
.setLargeIcon(icon)
|
||||
Notification.Builder notificationBuilder = new Notification.Builder(PlaybackService.this).setContentTitle(contentTitle)
|
||||
.setContentText(contentText).setOngoing(true).setContentIntent(pIntent).setLargeIcon(icon)
|
||||
.setSmallIcon(R.drawable.ic_stat_antenna)
|
||||
.addAction(android.R.drawable.ic_media_pause,
|
||||
getString(R.string.pause_label),
|
||||
pauseButtonPendingIntent);
|
||||
.addAction(android.R.drawable.ic_media_pause, getString(R.string.pause_label), pauseButtonPendingIntent);
|
||||
notification = notificationBuilder.build();
|
||||
} else {
|
||||
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(
|
||||
PlaybackService.this)
|
||||
.setContentTitle(contentTitle)
|
||||
.setContentText(contentText).setOngoing(true)
|
||||
.setContentIntent(pIntent).setLargeIcon(icon)
|
||||
.setSmallIcon(R.drawable.ic_stat_antenna);
|
||||
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(PlaybackService.this)
|
||||
.setContentTitle(contentTitle).setContentText(contentText).setOngoing(true).setContentIntent(pIntent)
|
||||
.setLargeIcon(icon).setSmallIcon(R.drawable.ic_stat_antenna);
|
||||
notification = notificationBuilder.getNotification();
|
||||
}
|
||||
startForeground(NOTIFICATION_ID, notification);
|
||||
|
@ -1063,8 +1065,7 @@ public class PlaybackService extends Service {
|
|||
|
||||
};
|
||||
if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
|
||||
notificationSetupTask
|
||||
.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||
notificationSetupTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||
} else {
|
||||
notificationSetupTask.execute();
|
||||
}
|
||||
|
@ -1086,9 +1087,7 @@ public class PlaybackService extends Service {
|
|||
|
||||
public void seek(int i) {
|
||||
saveCurrentPosition();
|
||||
if (status == PlayerStatus.INITIALIZED
|
||||
|| status == PlayerStatus.INITIALIZING
|
||||
|| status == PlayerStatus.PREPARING) {
|
||||
if (status == PlayerStatus.INITIALIZED || status == PlayerStatus.INITIALIZING || status == PlayerStatus.PREPARING) {
|
||||
media.setPosition(i);
|
||||
setStartWhenPrepared(true);
|
||||
prepare();
|
||||
|
@ -1115,9 +1114,7 @@ public class PlaybackService extends Service {
|
|||
if (position != INVALID_TIME) {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Saving current position to " + position);
|
||||
media.saveCurrentPosition(PreferenceManager
|
||||
.getDefaultSharedPreferences(getApplicationContext()),
|
||||
position);
|
||||
media.saveCurrentPosition(PreferenceManager.getDefaultSharedPreferences(getApplicationContext()), position);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1132,22 +1129,17 @@ public class PlaybackService extends Service {
|
|||
|
||||
@SuppressLint("NewApi")
|
||||
private void setupWidgetUpdater() {
|
||||
if (widgetUpdaterFuture == null
|
||||
|| (widgetUpdaterFuture.isCancelled() || widgetUpdaterFuture
|
||||
.isDone())) {
|
||||
if (widgetUpdaterFuture == null || (widgetUpdaterFuture.isCancelled() || widgetUpdaterFuture.isDone())) {
|
||||
widgetUpdater = new WidgetUpdateWorker();
|
||||
widgetUpdaterFuture = schedExecutor.scheduleAtFixedRate(
|
||||
widgetUpdater, WidgetUpdateWorker.NOTIFICATION_INTERVALL,
|
||||
WidgetUpdateWorker.NOTIFICATION_INTERVALL,
|
||||
TimeUnit.MILLISECONDS);
|
||||
widgetUpdaterFuture = schedExecutor.scheduleAtFixedRate(widgetUpdater, WidgetUpdateWorker.NOTIFICATION_INTERVALL,
|
||||
WidgetUpdateWorker.NOTIFICATION_INTERVALL, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateWidget() {
|
||||
if (AppConfig.DEBUG)
|
||||
Log.d(TAG, "Sending widget update request");
|
||||
PlaybackService.this.sendBroadcast(new Intent(
|
||||
PlayerWidget.FORCE_WIDGET_UPDATE));
|
||||
PlaybackService.this.sendBroadcast(new Intent(PlayerWidget.FORCE_WIDGET_UPDATE));
|
||||
}
|
||||
|
||||
public boolean sleepTimerActive() {
|
||||
|
@ -1166,13 +1158,11 @@ public class PlaybackService extends Service {
|
|||
private RemoteControlClient setupRemoteControlClient() {
|
||||
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
|
||||
mediaButtonIntent.setComponent(mediaButtonReceiver);
|
||||
PendingIntent mediaPendingIntent = PendingIntent.getBroadcast(
|
||||
getApplicationContext(), 0, mediaButtonIntent, 0);
|
||||
PendingIntent mediaPendingIntent = PendingIntent.getBroadcast(getApplicationContext(), 0, mediaButtonIntent, 0);
|
||||
remoteControlClient = new RemoteControlClient(mediaPendingIntent);
|
||||
int controlFlags;
|
||||
if (android.os.Build.VERSION.SDK_INT < 16) {
|
||||
controlFlags = RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE
|
||||
| RemoteControlClient.FLAG_KEY_MEDIA_NEXT;
|
||||
controlFlags = RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE | RemoteControlClient.FLAG_KEY_MEDIA_NEXT;
|
||||
} else {
|
||||
controlFlags = RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE;
|
||||
}
|
||||
|
@ -1187,34 +1177,26 @@ public class PlaybackService extends Service {
|
|||
if (remoteControlClient != null) {
|
||||
switch (status) {
|
||||
case PLAYING:
|
||||
remoteControlClient
|
||||
.setPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
|
||||
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
|
||||
break;
|
||||
case PAUSED:
|
||||
case INITIALIZED:
|
||||
remoteControlClient
|
||||
.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
|
||||
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
|
||||
break;
|
||||
case STOPPED:
|
||||
remoteControlClient
|
||||
.setPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
|
||||
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
|
||||
break;
|
||||
case ERROR:
|
||||
remoteControlClient
|
||||
.setPlaybackState(RemoteControlClient.PLAYSTATE_ERROR);
|
||||
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_ERROR);
|
||||
break;
|
||||
default:
|
||||
remoteControlClient
|
||||
.setPlaybackState(RemoteControlClient.PLAYSTATE_BUFFERING);
|
||||
remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_BUFFERING);
|
||||
}
|
||||
if (media != null) {
|
||||
MetadataEditor editor = remoteControlClient
|
||||
.editMetadata(false);
|
||||
editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE,
|
||||
media.getEpisodeTitle());
|
||||
MetadataEditor editor = remoteControlClient.editMetadata(false);
|
||||
editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, media.getEpisodeTitle());
|
||||
|
||||
editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM,
|
||||
media.getFeedTitle());
|
||||
editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, media.getFeedTitle());
|
||||
|
||||
editor.apply();
|
||||
}
|
||||
|
@ -1247,7 +1229,7 @@ public class PlaybackService extends Service {
|
|||
* Pauses playback when the headset is disconnected and the preference is
|
||||
* set
|
||||
*/
|
||||
private BroadcastReceiver headsetDisconnected = new BroadcastReceiver() {
|
||||
private final BroadcastReceiver headsetDisconnected = new BroadcastReceiver() {
|
||||
private static final String TAG = "headsetDisconnected";
|
||||
private static final int UNPLUGGED = 0;
|
||||
|
||||
|
@ -1270,7 +1252,7 @@ public class PlaybackService extends Service {
|
|||
}
|
||||
};
|
||||
|
||||
private BroadcastReceiver audioBecomingNoisy = new BroadcastReceiver() {
|
||||
private final BroadcastReceiver audioBecomingNoisy = new BroadcastReceiver() {
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
|
@ -1284,13 +1266,12 @@ public class PlaybackService extends Service {
|
|||
|
||||
/** Pauses playback if PREF_PAUSE_ON_HEADSET_DISCONNECT was set to true. */
|
||||
private void pauseIfPauseOnDisconnect() {
|
||||
if (UserPreferences.isPauseOnHeadsetDisconnect()
|
||||
&& status == PlayerStatus.PLAYING) {
|
||||
if (UserPreferences.isPauseOnHeadsetDisconnect() && status == PlayerStatus.PLAYING) {
|
||||
pause(true, true);
|
||||
}
|
||||
}
|
||||
|
||||
private BroadcastReceiver shutdownReceiver = new BroadcastReceiver() {
|
||||
private final BroadcastReceiver shutdownReceiver = new BroadcastReceiver() {
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
|
@ -1303,7 +1284,7 @@ public class PlaybackService extends Service {
|
|||
|
||||
};
|
||||
|
||||
private BroadcastReceiver skipCurrentEpisodeReceiver = new BroadcastReceiver() {
|
||||
private final BroadcastReceiver skipCurrentEpisodeReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
if (intent.getAction().equals(ACTION_SKIP_CURRENT_EPISODE)) {
|
||||
|
@ -1329,8 +1310,7 @@ public class PlaybackService extends Service {
|
|||
try {
|
||||
saveCurrentPosition();
|
||||
} catch (IllegalStateException e) {
|
||||
Log.w(TAG,
|
||||
"saveCurrentPosition was called in illegal state");
|
||||
Log.w(TAG, "saveCurrentPosition was called in illegal state");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1419,7 +1399,7 @@ public class PlaybackService extends Service {
|
|||
return media;
|
||||
}
|
||||
|
||||
public MediaPlayer getPlayer() {
|
||||
public IPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
|
@ -1432,6 +1412,38 @@ public class PlaybackService extends Service {
|
|||
postStatusUpdateIntent();
|
||||
}
|
||||
|
||||
public boolean canSetSpeed() {
|
||||
if (media.getMediaType() == MediaType.AUDIO) {
|
||||
return ((AudioPlayer) player).canSetSpeed();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean canSetPitch() {
|
||||
if (media.getMediaType() == MediaType.AUDIO) {
|
||||
return ((AudioPlayer) player).canSetPitch();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void setSpeed(double speed) {
|
||||
if (media.getMediaType() == MediaType.AUDIO) {
|
||||
AudioPlayer audioPlayer = (AudioPlayer) player;
|
||||
if (audioPlayer.canSetSpeed()) {
|
||||
audioPlayer.setPlaybackSpeed((float) speed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void setPitch(double pitch) {
|
||||
if (media.getMediaType() == MediaType.AUDIO) {
|
||||
AudioPlayer audioPlayer = (AudioPlayer) player;
|
||||
if (audioPlayer.canSetPitch()) {
|
||||
audioPlayer.setPlaybackPitch((float) pitch);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* call getDuration() on mediaplayer or return INVALID_TIME if player is in
|
||||
* an invalid state. This method should be used instead of calling
|
||||
|
@ -1480,8 +1492,7 @@ public class PlaybackService extends Service {
|
|||
}
|
||||
|
||||
private void setCurrentlyPlayingMedia(long id) {
|
||||
SharedPreferences.Editor editor = PreferenceManager
|
||||
.getDefaultSharedPreferences(getApplicationContext()).edit();
|
||||
SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit();
|
||||
editor.putLong(PlaybackPreferences.PREF_CURRENTLY_PLAYING_MEDIA, id);
|
||||
editor.commit();
|
||||
}
|
||||
|
|
|
@ -0,0 +1,115 @@
|
|||
/* Adapted from: http://thinking-in-code.blogspot.com/2008/11/duck-typing-in-java-using-dynamic.html */
|
||||
|
||||
package de.danoeh.antennapod.util;
|
||||
|
||||
import java.lang.reflect.InvocationHandler;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Proxy;
|
||||
|
||||
/**
|
||||
* Allows "duck typing" or dynamic invocation based on method signature rather
|
||||
* than type hierarchy. In other words, rather than checking whether something
|
||||
* IS-a duck, check whether it WALKS-like-a duck or QUACKS-like a duck.
|
||||
*
|
||||
* To use first use the coerce static method to indicate the object you want to
|
||||
* do Duck Typing for, then specify an interface to the to method which you want
|
||||
* to coerce the type to, e.g:
|
||||
*
|
||||
* public interface Foo { void aMethod(); } class Bar { ... public void
|
||||
* aMethod() { ... } ... } Bar bar = ...; Foo foo =
|
||||
* DuckType.coerce(bar).to(Foo.class); foo.aMethod();
|
||||
*
|
||||
*
|
||||
*/
|
||||
public class DuckType {
|
||||
|
||||
private final Object objectToCoerce;
|
||||
|
||||
private DuckType(Object objectToCoerce) {
|
||||
this.objectToCoerce = objectToCoerce;
|
||||
}
|
||||
|
||||
private class CoercedProxy implements InvocationHandler {
|
||||
@Override
|
||||
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
|
||||
Method delegateMethod = findMethodBySignature(method);
|
||||
assert delegateMethod != null;
|
||||
return delegateMethod.invoke(DuckType.this.objectToCoerce, args);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Specify the duck typed object to coerce.
|
||||
*
|
||||
* @param object
|
||||
* the object to coerce
|
||||
* @return
|
||||
*/
|
||||
public static DuckType coerce(Object object) {
|
||||
return new DuckType(object);
|
||||
}
|
||||
|
||||
/**
|
||||
* Coerce the Duck Typed object to the given interface providing it
|
||||
* implements all the necessary methods.
|
||||
*
|
||||
* @param
|
||||
* @param iface
|
||||
* @return an instance of the given interface that wraps the duck typed
|
||||
* class
|
||||
* @throws ClassCastException
|
||||
* if the object being coerced does not implement all the
|
||||
* methods in the given interface.
|
||||
*/
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
public <T> T to(Class iface) {
|
||||
assert iface.isInterface() : "cannot coerce object to a class, must be an interface";
|
||||
if (isA(iface)) {
|
||||
return (T) iface.cast(objectToCoerce);
|
||||
}
|
||||
if (quacksLikeA(iface)) {
|
||||
return generateProxy(iface);
|
||||
}
|
||||
throw new ClassCastException("Could not coerce object of type " + objectToCoerce.getClass() + " to " + iface);
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
private boolean isA(Class iface) {
|
||||
return objectToCoerce.getClass().isInstance(iface);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the duck typed object can be used with the given
|
||||
* interface.
|
||||
*
|
||||
* @param Type
|
||||
* of the interface to check.
|
||||
* @param iface
|
||||
* Interface class to check
|
||||
* @return true if the object will support all the methods in the interface,
|
||||
* false otherwise.
|
||||
*/
|
||||
@SuppressWarnings("rawtypes")
|
||||
public boolean quacksLikeA(Class iface) {
|
||||
for (Method method : iface.getMethods()) {
|
||||
if (findMethodBySignature(method) == null) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
private <T> T generateProxy(Class iface) {
|
||||
return (T) Proxy.newProxyInstance(iface.getClassLoader(), new Class[] { iface }, new CoercedProxy());
|
||||
}
|
||||
|
||||
private Method findMethodBySignature(Method method) {
|
||||
try {
|
||||
return objectToCoerce.getClass().getMethod(method.getName(), method.getParameterTypes());
|
||||
} catch (NoSuchMethodException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
package de.danoeh.antennapod.util.playback;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.Log;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import com.aocate.media.MediaPlayer;
|
||||
|
||||
public class AudioPlayer extends MediaPlayer implements IPlayer {
|
||||
private static final String TAG = "AudioPlayer";
|
||||
|
||||
public AudioPlayer(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setScreenOnWhilePlaying(boolean screenOn) {
|
||||
Log.e(TAG, "Setting screen on while playing not supported in Audio Player");
|
||||
throw new UnsupportedOperationException("Setting screen on while playing not supported in Audio Player");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDisplay(SurfaceHolder sh) {
|
||||
if (sh != null) {
|
||||
Log.e(TAG, "Setting display not supported in Audio Player");
|
||||
throw new UnsupportedOperationException("Setting display not supported in Audio Player");
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,64 @@
|
|||
package de.danoeh.antennapod.util.playback;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
public interface IPlayer {
|
||||
boolean canSetPitch();
|
||||
|
||||
boolean canSetSpeed();
|
||||
|
||||
float getCurrentPitchStepsAdjustment();
|
||||
|
||||
int getCurrentPosition();
|
||||
|
||||
float getCurrentSpeedMultiplier();
|
||||
|
||||
int getDuration();
|
||||
|
||||
float getMaxSpeedMultiplier();
|
||||
|
||||
float getMinSpeedMultiplier();
|
||||
|
||||
boolean isLooping();
|
||||
|
||||
boolean isPlaying();
|
||||
|
||||
void pause();
|
||||
|
||||
void prepare() throws IllegalStateException, IOException;
|
||||
|
||||
void prepareAsync();
|
||||
|
||||
void release();
|
||||
|
||||
void reset();
|
||||
|
||||
void seekTo(int msec);
|
||||
|
||||
void setAudioStreamType(int streamtype);
|
||||
|
||||
void setScreenOnWhilePlaying(boolean screenOn);
|
||||
|
||||
void setDataSource(String path) throws IllegalStateException, IOException,
|
||||
IllegalArgumentException, SecurityException;
|
||||
|
||||
void setDisplay(SurfaceHolder sh);
|
||||
|
||||
void setEnableSpeedAdjustment(boolean enableSpeedAdjustment);
|
||||
|
||||
void setLooping(boolean looping);
|
||||
|
||||
void setPitchStepsAdjustment(float pitchSteps);
|
||||
|
||||
void setPlaybackPitch(float f);
|
||||
|
||||
void setPlaybackSpeed(float f);
|
||||
|
||||
void setVolume(float left, float right);
|
||||
|
||||
void start();
|
||||
|
||||
void stop();
|
||||
}
|
|
@ -0,0 +1,62 @@
|
|||
package de.danoeh.antennapod.util.playback;
|
||||
|
||||
import android.media.MediaPlayer;
|
||||
import android.util.Log;
|
||||
|
||||
public class VideoPlayer extends MediaPlayer implements IPlayer {
|
||||
private static final String TAG = "VideoPlayer";
|
||||
|
||||
@Override
|
||||
public boolean canSetPitch() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canSetSpeed() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getCurrentPitchStepsAdjustment() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getCurrentSpeedMultiplier() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getMaxSpeedMultiplier() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getMinSpeedMultiplier() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setEnableSpeedAdjustment(boolean enableSpeedAdjustment) throws UnsupportedOperationException {
|
||||
Log.e(TAG, "Setting enable speed adjustment unsupported in video player");
|
||||
throw new UnsupportedOperationException("Setting enable speed adjustment unsupported in video player");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPitchStepsAdjustment(float pitchSteps) {
|
||||
Log.e(TAG, "Setting pitch steps adjustment unsupported in video player");
|
||||
throw new UnsupportedOperationException("Setting pitch steps adjustment unsupported in video player");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPlaybackPitch(float f) {
|
||||
Log.e(TAG, "Setting playback pitch unsupported in video player");
|
||||
throw new UnsupportedOperationException("Setting playback pitch unsupported in video player");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPlaybackSpeed(float f) {
|
||||
Log.e(TAG, "Setting playback speed unsupported in video player");
|
||||
throw new UnsupportedOperationException("Setting playback speed unsupported in video player");
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue