Changed from db backed item speed to preferences backed global value

3 files changed, 12 insertions, 28 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 7c26cc484..9bf2374b9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -11,8 +11,9 @@ import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.MediaType;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.preferences.PlaybackSpeedHelper;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.playback.Playable;
@@ -83,7 +84,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
         }
         float speed = 1.0f;
         if(controller.canSetPlaybackSpeed()) {
-            speed = UserPreferences.getPlaybackSpeed(controller.getMedia());
+            speed = PlaybackSpeedHelper.getCurrentPlaybackSpeed(controller.getMedia());
         }
         String speedStr = new DecimalFormat("0.00").format(speed);
         txtvPlaybackSpeed.setText(speedStr);
@@ -132,7 +133,11 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
                         }
                     }
 
-                    storeNewMediaPlaybackSpeed(newSpeed);
+                    try {
+                        PlaybackPreferences.setCurrentlyPlayingTemporaryPlaybackSpeed(Float.parseFloat(newSpeed));
+                    } catch (NumberFormatException e) {
+                        // Well this was awkward...
+                    }
                     UserPreferences.setPlaybackSpeed(newSpeed);
                     controller.setPlaybackSpeed(Float.parseFloat(newSpeed));
                     onPositionObserverUpdate();
@@ -148,15 +153,4 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             txtvPlaybackSpeed.setVisibility(View.VISIBLE);
         }
     }
-
-    private void storeNewMediaPlaybackSpeed(String speed) {
-        Playable media = controller.getMedia();
-        if (media instanceof FeedMedia) {
-            try {
-                ((FeedMedia) media).updateLastPlaybackSpeed(Float.parseFloat(speed));
-            } catch (NumberFormatException e) {
-                // Well this was awkward...
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
index 2f0caa982..4921ea70a 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
@@ -14,14 +14,12 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import java.util.Locale;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.PlaybackSpeedHelper;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 
-import static de.danoeh.antennapod.core.feed.FeedPreferences.SPEED_USE_GLOBAL;
-
 public class PlaybackControlsDialog extends DialogFragment {
     private static final float PLAYBACK_SPEED_STEP = 0.05f;
     private static final float DEFAULT_MIN_PLAYBACK_SPEED = 0.5f;
@@ -217,6 +215,6 @@ public class PlaybackControlsDialog extends DialogFragment {
             media = controller.getMedia();
         }
 
-        return UserPreferences.getPlaybackSpeed(media);
+        return PlaybackSpeedHelper.getCurrentPlaybackSpeed(media);
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index dcb16d192..b550669f3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -42,9 +42,9 @@ import de.danoeh.antennapod.core.event.DownloaderUpdate;
 import de.danoeh.antennapod.core.event.FeedItemEvent;
 import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
-import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.preferences.PlaybackSpeedHelper;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
@@ -66,7 +66,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
-import static de.danoeh.antennapod.core.feed.FeedPreferences.SPEED_USE_GLOBAL;
 import static de.danoeh.antennapod.dialog.EpisodesApplyActionFragment.ACTION_DELETE;
 import static de.danoeh.antennapod.dialog.EpisodesApplyActionFragment.ACTION_REMOVE_FROM_QUEUE;
 
@@ -638,14 +637,7 @@ public class QueueFragment extends Fragment {
         if(queue.size() > 0) {
             long timeLeft = 0;
             for(FeedItem item : queue) {
-                float playbackSpeed = SPEED_USE_GLOBAL;
-                Feed feed = item.getFeed();
-                if (feed != null) {
-                    playbackSpeed = feed.getPreferences().getFeedPlaybackSpeed();
-                }
-                if (playbackSpeed == SPEED_USE_GLOBAL) {
-                    playbackSpeed = UserPreferences.getPlaybackSpeed(item.getMedia());
-                }
+                float playbackSpeed = PlaybackSpeedHelper.getCurrentPlaybackSpeed(item.getMedia());
                 if(item.getMedia() != null) {
                     timeLeft +=
                             (long) ((item.getMedia().getDuration() - item.getMedia().getPosition())