Merge pull request #186 from TheRealFalcon/playback-speed

Bug fix for trying to set speed/pitch when media is null.
This commit is contained in:
danieloeh 2013-05-06 12:17:40 -07:00
commit d94e2a7670

View File

@ -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);