summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2019-10-06 12:57:07 +0200
committerGitHub <noreply@github.com>2019-10-06 12:57:07 +0200
commitf750e06a1be5c93f7a8cffd49f56a57080583a82 (patch)
tree4977ccea8c655c6e2ee5b226da57271c0c997f62 /core/src
parent935e2ceee01fa2fb82156b22861a8193a248bc8f (diff)
parentb081e320e3e130062ef89f4af9454765b0af54a3 (diff)
downloadAntennaPod-f750e06a1be5c93f7a8cffd49f56a57080583a82.zip
Merge pull request #3498 from ByteHamster/fix-mono-switch
Fixed downmixing if service is not bound
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java13
1 files changed, 2 insertions, 11 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 39888428f..ba903eeb9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -503,16 +503,6 @@ public class PlaybackController {
PlaybackServiceMediaPlayer.PSMPInfo info = playbackService.getPSMPInfo();
status = info.playerStatus;
media = info.playable;
- /*
- if (media == null) {
- Log.w(TAG,
- "PlaybackService has no media object. Trying to restore last played media.");
- Intent serviceIntent = getPlayLastPlayedMediaIntent();
- if (serviceIntent != null) {
- ContextCompat.startForegroundService(activity, serviceIntent);
- }
- }
- */
onServiceQueried();
setupGUI();
@@ -720,7 +710,8 @@ public class PlaybackController {
}
public boolean canDownmix() {
- return playbackService != null && playbackService.canDownmix();
+ return (playbackService != null && playbackService.canDownmix())
+ || UserPreferences.useSonic();
}
public void setDownmix(boolean enable) {