Merge branch 'playback-speed' of git://github.com/TheRealFalcon/AntennaPod into playback-speed-tmp

Conflicts:
	src/de/danoeh/antennapod/activity/AudioplayerActivity.java
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/service/PlaybackService.java
	src/de/danoeh/antennapod/util/playback/PlaybackController.java

1 files changed, 17 insertions, 16 deletions

diff --git a/src/de/danoeh/antennapod/util/playback/PlaybackController.java b/src/de/danoeh/antennapod/util/playback/PlaybackController.java
index 22c78cc07..f5d1847b3 100644
--- a/src/de/danoeh/antennapod/util/playback/PlaybackController.java
+++ b/src/de/danoeh/antennapod/util/playback/PlaybackController.java
@@ -668,30 +668,31 @@ public abstract class PlaybackController {
         return status;
     }
 
-    public boolean isPlayingVideo() {
-        if (playbackService != null) {
-            return PlaybackService.isPlayingVideo();
-        }
-        return false;
-    }
-
     public boolean canSetPlaybackSpeed() {
         return playbackService != null && playbackService.canSetSpeed();
     }
 
-    public void setPlaybackSpeed(double speed) {
+	public void setPlaybackSpeed(float speed) {
+		if (playbackService != null) {
+			playbackService.setSpeed(speed);
+		}
+	}
+    
+	public float getCurrentPlaybackSpeedMultiplier() {
+		if (canSetPlaybackSpeed()) {
+			return playbackService.getCurrentPlaybackSpeed();
+		} else {
+			return -1;
+		}
+	}
+
+    public boolean isPlayingVideo() {
         if (playbackService != null) {
-            playbackService.setSpeed(speed);
+            return PlaybackService.isPlayingVideo();
         }
+        return false;
     }
 
-    public double getCurrentPlaybackSpeedMultiplier() {
-        if (canSetPlaybackSpeed()) {
-            return playbackService.getCurrentPlaybackSpeed();
-        } else {
-            return -1;
-        }
-    }
 
     /**
      * Returns true if PlaybackController can communicate with the playback