Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-01-31 19:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed playbackService crash when trying to seek in INITIALIZED state

Browse Source
This commit is contained in:
daniel oeh 2012-11-25 13:13:08 +01:00
parent 8c11b8e782
commit 72646abb9a
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/de/danoeh/antennapod/service/PlaybackService.java
View File

@ -938,16 +938,22 @@ public class PlaybackService extends Service {
}
public void seek(int i) {
if (AppConfig.DEBUG)
Log.d(TAG, "Seeking position " + i);
if (shouldStream) {
if (status != PlayerStatus.SEEKING) {
statusBeforeSeek = status;
}
setStatus(PlayerStatus.SEEKING);
}
player.seekTo(i);
saveCurrentPosition();
if (status == PlayerStatus.INITIALIZED) {
media.setPosition(i);
setStartWhenPrepared(true);
prepare();
} else {
if (AppConfig.DEBUG)
Log.d(TAG, "Seeking position " + i);
if (shouldStream) {
if (status != PlayerStatus.SEEKING) {
statusBeforeSeek = status;
}
setStatus(PlayerStatus.SEEKING);
}
player.seekTo(i);
}
}
public void seekToChapter(Chapter chapter) {

10
src/de/danoeh/antennapod/util/PlaybackController.java
View File

@ -355,11 +355,12 @@ public abstract class PlaybackController {
* should be used to update the GUI or start/cancel background threads.
*/
private void handleStatus() {
TypedArray res = activity.obtainStyledAttributes(new int[] {R.attr.av_play, R.attr.av_pause});
TypedArray res = activity.obtainStyledAttributes(new int[] {
R.attr.av_play, R.attr.av_pause });
final int playResource = res.getResourceId(0, R.drawable.av_play);
final int pauseResource = res.getResourceId(1, R.drawable.av_pause);
res.recycle();
switch (status) {
case ERROR:
@ -472,7 +473,7 @@ public abstract class PlaybackController {
boolean fromUser, TextView txtvPosition) {
if (fromUser && playbackService != null) {
float prog = progress / ((float) seekBar.getMax());
int duration = playbackService.getPlayer().getDuration();
int duration = media.getDuration();
txtvPosition.setText(Converter
.getDurationStringLong((int) (prog * duration)));
return prog;
@ -494,8 +495,7 @@ public abstract class PlaybackController {
*/
public void onSeekBarStopTrackingTouch(SeekBar seekBar, float prog) {
if (playbackService != null) {
playbackService.seek((int) (prog * playbackService.getPlayer()
.getDuration()));
playbackService.seek((int) (prog * media.getDuration()));
setupPositionObserver();
}
}