summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordanieloeh <daniel.oeh@gmail.com>2013-05-06 12:17:40 -0700
committerdanieloeh <daniel.oeh@gmail.com>2013-05-06 12:17:40 -0700
commitd94e2a7670f20b60ef42435753da118b364fdbab (patch)
tree215c7394a111340f6ffc40c15f142592e8d64ac7 /src
parent47d5bf609df2e279b9e5f98647b57ec2a8fc84ca (diff)
parent2db89cb807ae06b0f59039307e20c32cd9052b57 (diff)
downloadAntennaPod-d94e2a7670f20b60ef42435753da118b364fdbab.zip
Merge pull request #186 from TheRealFalcon/playback-speed
Bug fix for trying to set speed/pitch when media is null.
Diffstat (limited to 'src')
-rw-r--r--src/de/danoeh/antennapod/service/PlaybackService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index bf90cf9c9..6c7619476 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -1524,21 +1524,21 @@ public class PlaybackService extends Service {
}
public boolean canSetSpeed() {
- if (media.getMediaType() == MediaType.AUDIO) {
+ if (media != null && media.getMediaType() == MediaType.AUDIO) {
return ((AudioPlayer) player).canSetSpeed();
}
return false;
}
public boolean canSetPitch() {
- if (media.getMediaType() == MediaType.AUDIO) {
+ if (media != null && media.getMediaType() == MediaType.AUDIO) {
return ((AudioPlayer) player).canSetPitch();
}
return false;
}
public void setSpeed(double speed) {
- if (media.getMediaType() == MediaType.AUDIO) {
+ if (media != null && media.getMediaType() == MediaType.AUDIO) {
AudioPlayer audioPlayer = (AudioPlayer) player;
if (audioPlayer.canSetSpeed()) {
audioPlayer.setPlaybackSpeed((float) speed);
@@ -1551,7 +1551,7 @@ public class PlaybackService extends Service {
}
public void setPitch(double pitch) {
- if (media.getMediaType() == MediaType.AUDIO) {
+ if (media != null && media.getMediaType() == MediaType.AUDIO) {
AudioPlayer audioPlayer = (AudioPlayer) player;
if (audioPlayer.canSetPitch()) {
audioPlayer.setPlaybackPitch((float) pitch);