diff options
author | Max Bechtold <max.bechtold@andrena.de> | 2019-10-17 09:56:04 +0200 |
---|---|---|
committer | Max Bechtold <max.bechtold@andrena.de> | 2019-10-17 09:56:04 +0200 |
commit | 3bc55a09b1371fbb6086e290369cfe048e1df25e (patch) | |
tree | 79e13eab2b28d0fb7b83cc8d281a144d1d5fd93c /core/src/main/java | |
parent | f9cf013b16dc98b5b1ff333c363317d350c8dc24 (diff) | |
download | AntennaPod-3bc55a09b1371fbb6086e290369cfe048e1df25e.zip |
#3248 Rename PlaybackVolumeAdaptor -> ..Updater
Diffstat (limited to 'core/src/main/java')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 4 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdater.java (renamed from core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeAdaptor.java) | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index f8990328f..d444875ad 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -1482,8 +1482,8 @@ public class PlaybackService extends MediaBrowserServiceCompat { Serializable volumeReductionExtra = intent.getSerializableExtra(EXTRA_VOLUME_REDUCTION_SETTING); VolumeReductionSetting volumeReductionSetting = (VolumeReductionSetting) volumeReductionExtra; - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, affectedFeed, volumeReductionSetting); + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, affectedFeed, volumeReductionSetting); } } }; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeAdaptor.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdater.java index 970abff33..aff742105 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeAdaptor.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdater.java @@ -5,25 +5,25 @@ import de.danoeh.antennapod.core.feed.FeedPreferences; import de.danoeh.antennapod.core.feed.VolumeReductionSetting; import de.danoeh.antennapod.core.util.playback.Playable; -class PlaybackVolumeAdaptor { +class PlaybackVolumeUpdater { - public void adaptVolumeIfNecessary(PlaybackServiceMediaPlayer mediaPlayer, String affectedFeedIdentifier, VolumeReductionSetting volumeReductionSetting) { + public void updateVolumeIfNecessary(PlaybackServiceMediaPlayer mediaPlayer, String affectedFeedIdentifier, VolumeReductionSetting volumeReductionSetting) { Playable playable = mediaPlayer.getPlayable(); boolean isFeedMedia = playable instanceof FeedMedia; boolean isPlayableLoaded = isPlayableLoaded(mediaPlayer.getPlayerStatus()); - if (isPlayableLoaded && isFeedMedia) { - adaptFeedMediaVolumeIfNecessary(mediaPlayer, affectedFeedIdentifier, volumeReductionSetting, (FeedMedia) playable); + if (isFeedMedia && isPlayableLoaded) { + updateFeedMediaVolumeIfNecessary(mediaPlayer, affectedFeedIdentifier, volumeReductionSetting, (FeedMedia) playable); } } - private void adaptFeedMediaVolumeIfNecessary(PlaybackServiceMediaPlayer mediaPlayer, String affectedFeedIdentifier, VolumeReductionSetting volumeReductionSetting, FeedMedia feedMedia) { + private void updateFeedMediaVolumeIfNecessary(PlaybackServiceMediaPlayer mediaPlayer, String affectedFeedIdentifier, VolumeReductionSetting volumeReductionSetting, FeedMedia feedMedia) { if (mediaBelongsToAffectedFeed(feedMedia, affectedFeedIdentifier)) { FeedPreferences preferences = feedMedia.getItem().getFeed().getPreferences(); preferences.setVolumeReductionSetting(volumeReductionSetting); if (mediaPlayer.getPlayerStatus() == PlayerStatus.PLAYING) { - forceAdaptVolume(mediaPlayer); + forceUpdateVolume(mediaPlayer); } } } @@ -42,7 +42,7 @@ class PlaybackVolumeAdaptor { && affectedFeedIdentifier.equals(feedMedia.getItem().getFeed().getIdentifyingValue()); } - private static void forceAdaptVolume(PlaybackServiceMediaPlayer mediaPlayer) { + private void forceUpdateVolume(PlaybackServiceMediaPlayer mediaPlayer) { mediaPlayer.pause(false, false); mediaPlayer.resume(); } |