Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Playback speed fixes (#7013) 

- Remove video-specific playback speed (no longer needed now that we have per-podcast speed)
- Respect changed speed setting on settings page even if the service is not running
- Do not change global speed when feed setting is updated
This commit is contained in:
ByteHamster 2024-03-22 19:44:14 +01:00 committed by GitHub
parent 0a6b7ed699
commit bd17373c18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 37 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
View File

@ -86,6 +86,7 @@ public class VariableSpeedDialog extends BottomSheetDialogFragment {
View root = View.inflate(getContext(), R.layout.speed_select_dialog, null);
speedSeekBar = root.findViewById(R.id.speed_seek_bar);
speedSeekBar.setProgressChangedListener(multiplier -> {
UserPreferences.setPlaybackSpeed(multiplier);
if (controller != null) {
controller.setPlaybackSpeed(multiplier);
}
@ -148,10 +149,11 @@ public class VariableSpeedDialog extends BottomSheetDialogFragment {
return true;
});
holder.chip.setOnClickListener(v -> {
UserPreferences.setPlaybackSpeed(speed);
new Handler(Looper.getMainLooper()).postDelayed(() -> {
if (controller != null) {
dismiss();
controller.setPlaybackSpeed(speed);
dismiss();
}
}, 200);
});

59
core/src/main/java/de/danoeh/antennapod/core/feed/util/PlaybackSpeedUtils.java
View File

@ -1,54 +1,36 @@
package de.danoeh.antennapod.core.feed.util;
import android.util.Log;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.model.feed.FeedPreferences;
import de.danoeh.antennapod.model.playback.MediaType;
import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
import de.danoeh.antennapod.storage.preferences.UserPreferences;
import de.danoeh.antennapod.model.playback.Playable;
import static de.danoeh.antennapod.model.feed.FeedPreferences.SPEED_USE_GLOBAL;
/**
* Utility class to use the appropriate playback speed based on {@link PlaybackPreferences}
*/
public final class PlaybackSpeedUtils {
private static final String TAG = "PlaybackSpeedUtils";
private PlaybackSpeedUtils() {
}
public abstract class PlaybackSpeedUtils {
/**
* Returns the currently configured playback speed for the specified media.
*/
public static float getCurrentPlaybackSpeed(Playable media) {
float playbackSpeed = SPEED_USE_GLOBAL;
MediaType mediaType = null;
if (media != null) {
mediaType = media.getMediaType();
playbackSpeed = PlaybackPreferences.getCurrentlyPlayingTemporaryPlaybackSpeed();
if (playbackSpeed == SPEED_USE_GLOBAL && media instanceof FeedMedia) {
FeedItem item = ((FeedMedia) media).getItem();
if (item != null) {
Feed feed = item.getFeed();
if (feed != null && feed.getPreferences() != null) {
playbackSpeed = feed.getPreferences().getFeedPlaybackSpeed();
} else {
Log.d(TAG, "Can not get feed specific playback speed: " + feed);
}
float playbackSpeed = FeedPreferences.SPEED_USE_GLOBAL;
if (media instanceof FeedMedia) {
FeedMedia feedMedia = (FeedMedia) media;
if (PlaybackPreferences.getCurrentlyPlayingFeedMediaId() == feedMedia.getId()) {
playbackSpeed = PlaybackPreferences.getCurrentlyPlayingTemporaryPlaybackSpeed();
}
if (playbackSpeed == FeedPreferences.SPEED_USE_GLOBAL && feedMedia.getItem() != null) {
Feed feed = feedMedia.getItem().getFeed();
if (feed != null && feed.getPreferences() != null) {
playbackSpeed = feed.getPreferences().getFeedPlaybackSpeed();
}
}
}
if (playbackSpeed == SPEED_USE_GLOBAL) {
playbackSpeed = UserPreferences.getPlaybackSpeed(mediaType);
if (playbackSpeed == FeedPreferences.SPEED_USE_GLOBAL) {
playbackSpeed = UserPreferences.getPlaybackSpeed();
}
return playbackSpeed;
}
@ -57,12 +39,15 @@ public final class PlaybackSpeedUtils {
*/
public static FeedPreferences.SkipSilence getCurrentSkipSilencePreference(Playable media) {
FeedPreferences.SkipSilence skipSilence = FeedPreferences.SkipSilence.GLOBAL;
if (media != null) {
skipSilence = PlaybackPreferences.getCurrentlyPlayingTemporarySkipSilence();
if (skipSilence == FeedPreferences.SkipSilence.GLOBAL && media instanceof FeedMedia) {
FeedItem item = ((FeedMedia) media).getItem();
if (item != null && item.getFeed() != null && item.getFeed().getPreferences() != null) {
skipSilence = item.getFeed().getPreferences().getFeedSkipSilence();
if (media instanceof FeedMedia) {
FeedMedia feedMedia = (FeedMedia) media;
if (PlaybackPreferences.getCurrentlyPlayingFeedMediaId() == feedMedia.getId()) {
skipSilence = PlaybackPreferences.getCurrentlyPlayingTemporarySkipSilence();
}
if (skipSilence == FeedPreferences.SkipSilence.GLOBAL && feedMedia.getItem() != null) {
Feed feed = feedMedia.getItem().getFeed();
if (feed != null && feed.getPreferences() != null) {
skipSilence = feed.getPreferences().getFeedSkipSilence();
}
}
}

30
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -1616,18 +1616,17 @@ public class PlaybackService extends MediaBrowserServiceCompat {
@SuppressWarnings("unused")
public void speedPresetChanged(SpeedPresetChangedEvent event) {
if (getPlayable() instanceof FeedMedia) {
if (((FeedMedia) getPlayable()).getItem().getFeed().getId() == event.getFeedId()) {
FeedMedia playable = (FeedMedia) getPlayable();
if (playable.getItem().getFeed().getId() == event.getFeedId()) {
if (event.getSpeed() == SPEED_USE_GLOBAL) {
setSpeed(UserPreferences.getPlaybackSpeed(getPlayable().getMediaType()));
setSkipSilence(UserPreferences.isSkipSilence());
setSpeed(UserPreferences.getPlaybackSpeed());
} else {
setSpeed(event.getSpeed());
FeedPreferences.SkipSilence skipSilence = event.getSkipSilence();
if (skipSilence == FeedPreferences.SkipSilence.GLOBAL) {
setSkipSilence(UserPreferences.isSkipSilence());
} else {
setSkipSilence(skipSilence == FeedPreferences.SkipSilence.AGGRESSIVE);
}
}
if (event.getSkipSilence() == FeedPreferences.SkipSilence.GLOBAL) {
setSkipSilence(UserPreferences.isSkipSilence());
} else {
setSkipSilence(event.getSkipSilence() == FeedPreferences.SkipSilence.AGGRESSIVE);
}
}
}
@ -1637,10 +1636,10 @@ public class PlaybackService extends MediaBrowserServiceCompat {
@SuppressWarnings("unused")
public void skipIntroEndingPresetChanged(SkipIntroEndingChangedEvent event) {
if (getPlayable() instanceof FeedMedia) {
if (((FeedMedia) getPlayable()).getItem().getFeed().getId() == event.getFeedId()) {
FeedMedia playable = (FeedMedia) getPlayable();
if (playable.getItem().getFeed().getId() == event.getFeedId()) {
if (event.getSkipEnding() != 0) {
FeedPreferences feedPreferences
= ((FeedMedia) getPlayable()).getItem().getFeed().getPreferences();
FeedPreferences feedPreferences = playable.getItem().getFeed().getPreferences();
feedPreferences.setFeedSkipIntro(event.getSkipIntro());
feedPreferences.setFeedSkipEnding(event.getSkipEnding());
}
@ -1684,18 +1683,11 @@ public class PlaybackService extends MediaBrowserServiceCompat {
public void setSpeed(float speed) {
PlaybackPreferences.setCurrentlyPlayingTemporaryPlaybackSpeed(speed);
if (currentMediaType == MediaType.VIDEO) {
UserPreferences.setVideoPlaybackSpeed(speed);
} else {
UserPreferences.setPlaybackSpeed(speed);
}
mediaPlayer.setPlaybackParams(speed, getCurrentSkipSilence());
}
public void setSkipSilence(boolean skipSilence) {
PlaybackPreferences.setCurrentlyPlayingTemporarySkipSilence(skipSilence);
UserPreferences.setSkipSilence(skipSilence);
mediaPlayer.setPlaybackParams(getCurrentPlaybackSpeed(), skipSilence);
}

28
storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java
View File

@ -33,7 +33,6 @@ import de.danoeh.antennapod.model.feed.FeedCounter;
import de.danoeh.antennapod.model.feed.FeedPreferences;
import de.danoeh.antennapod.model.feed.SortOrder;
import de.danoeh.antennapod.model.feed.SubscriptionsFilter;
import de.danoeh.antennapod.model.playback.MediaType;
/**
* Provides access to preferences set by the user in the settings screen. A
@ -118,7 +117,6 @@ public class UserPreferences {
// Mediaplayer
private static final String PREF_PLAYBACK_SPEED = "prefPlaybackSpeed";
private static final String PREF_VIDEO_PLAYBACK_SPEED = "prefVideoPlaybackSpeed";
public static final String PREF_PLAYBACK_SKIP_SILENCE = "prefSkipSilence";
private static final String PREF_FAST_FORWARD_SECS = "prefFastForwardSecs";
private static final String PREF_REWIND_SECS = "prefRewindSecs";
@ -131,8 +129,6 @@ public class UserPreferences {
public static final int EPISODE_CLEANUP_DEFAULT = 0;
// Constants
public static final int NOTIFICATION_BUTTON_REWIND = 0;
public static final int NOTIFICATION_BUTTON_FAST_FORWARD = 1;
public static final int NOTIFICATION_BUTTON_SKIP = 2;
public static final int NOTIFICATION_BUTTON_NEXT_CHAPTER = 3;
public static final int NOTIFICATION_BUTTON_PLAYBACK_SPEED = 4;
@ -406,15 +402,7 @@ public class UserPreferences {
return prefs.getBoolean(PREF_DELETE_REMOVES_FROM_QUEUE, false);
}
public static float getPlaybackSpeed(MediaType mediaType) {
if (mediaType == MediaType.VIDEO) {
return getVideoPlaybackSpeed();
} else {
return getAudioPlaybackSpeed();
}
}
private static float getAudioPlaybackSpeed() {
public static float getPlaybackSpeed() {
try {
return Float.parseFloat(prefs.getString(PREF_PLAYBACK_SPEED, "1.00"));
} catch (NumberFormatException e) {
@ -424,16 +412,6 @@ public class UserPreferences {
}
}
private static float getVideoPlaybackSpeed() {
try {
return Float.parseFloat(prefs.getString(PREF_VIDEO_PLAYBACK_SPEED, "1.00"));
} catch (NumberFormatException e) {
Log.e(TAG, Log.getStackTraceString(e));
UserPreferences.setVideoPlaybackSpeed(1.0f);
return 1.0f;
}
}
public static boolean isSkipSilence() {
return prefs.getBoolean(PREF_PLAYBACK_SKIP_SILENCE, false);
}
@ -612,10 +590,6 @@ public class UserPreferences {
prefs.edit().putString(PREF_PLAYBACK_SPEED, String.valueOf(speed)).apply();
}
public static void setVideoPlaybackSpeed(float speed) {
prefs.edit().putString(PREF_VIDEO_PLAYBACK_SPEED, String.valueOf(speed)).apply();
}
public static void setSkipSilence(boolean skipSilence) {
prefs.edit().putBoolean(PREF_PLAYBACK_SKIP_SILENCE, skipSilence).apply();
}