diff options
Diffstat (limited to 'core')
-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 | ||||
-rw-r--r-- | core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdaterTest.java (renamed from core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeAdaptorTest.java) | 58 |
3 files changed, 38 insertions, 38 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(); } diff --git a/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeAdaptorTest.java b/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdaterTest.java index 501719ebe..4ebe4e5ba 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeAdaptorTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdaterTest.java @@ -16,7 +16,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class PlaybackVolumeAdaptorTest { +public class PlaybackVolumeUpdaterTest { private static final String FEED_ID = "feedId"; @@ -29,14 +29,14 @@ public class PlaybackVolumeAdaptorTest { @Test public void noChangeIfNoFeedMediaPlaying() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.PAUSED); Playable noFeedMedia = mock(Playable.class); when(mediaPlayer.getPlayable()).thenReturn(noFeedMedia); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean()); verify(mediaPlayer, never()).resume(); @@ -44,14 +44,14 @@ public class PlaybackVolumeAdaptorTest { @Test public void noChangeIfPlayerStatusIsError() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.ERROR); FeedMedia feedMedia = mock(FeedMedia.class); when(mediaPlayer.getPlayable()).thenReturn(feedMedia); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean()); verify(mediaPlayer, never()).resume(); @@ -59,14 +59,14 @@ public class PlaybackVolumeAdaptorTest { @Test public void noChangeIfPlayerStatusIsIndeterminate() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.INDETERMINATE); FeedMedia feedMedia = mock(FeedMedia.class); when(mediaPlayer.getPlayable()).thenReturn(feedMedia); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean()); verify(mediaPlayer, never()).resume(); @@ -74,14 +74,14 @@ public class PlaybackVolumeAdaptorTest { @Test public void noChangeIfPlayerStatusIsStopped() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.STOPPED); FeedMedia feedMedia = mock(FeedMedia.class); when(mediaPlayer.getPlayable()).thenReturn(feedMedia); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean()); verify(mediaPlayer, never()).resume(); @@ -89,7 +89,7 @@ public class PlaybackVolumeAdaptorTest { @Test public void noChangeIfPlayableIsNoItemOfAffectedFeed() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.PLAYING); @@ -98,15 +98,15 @@ public class PlaybackVolumeAdaptorTest { Feed feed = mockFeed(feedMedia, FEED_ID); when(feed.getIdentifyingValue()).thenReturn("wrongFeedId"); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF); verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean()); verify(mediaPlayer, never()).resume(); } @Test - public void adaptsPreferencesForLoadedFeedMediaIfPlayerStatusIsPaused() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + public void updatesPreferencesForLoadedFeedMediaIfPlayerStatusIsPaused() { + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.PAUSED); @@ -114,7 +114,7 @@ public class PlaybackVolumeAdaptorTest { when(mediaPlayer.getPlayable()).thenReturn(feedMedia); FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT); @@ -123,8 +123,8 @@ public class PlaybackVolumeAdaptorTest { } @Test - public void adaptsPreferencesForLoadedFeedMediaIfPlayerStatusIsPrepared() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + public void updatesPreferencesForLoadedFeedMediaIfPlayerStatusIsPrepared() { + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.PREPARED); @@ -132,7 +132,7 @@ public class PlaybackVolumeAdaptorTest { when(mediaPlayer.getPlayable()).thenReturn(feedMedia); FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT); @@ -141,8 +141,8 @@ public class PlaybackVolumeAdaptorTest { } @Test - public void adaptsPreferencesForLoadedFeedMediaIfPlayerStatusIsInitializing() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + public void updatesPreferencesForLoadedFeedMediaIfPlayerStatusIsInitializing() { + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.INITIALIZING); @@ -150,7 +150,7 @@ public class PlaybackVolumeAdaptorTest { when(mediaPlayer.getPlayable()).thenReturn(feedMedia); FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT); @@ -159,8 +159,8 @@ public class PlaybackVolumeAdaptorTest { } @Test - public void adaptsPreferencesForLoadedFeedMediaIfPlayerStatusIsPreparing() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + public void updatesPreferencesForLoadedFeedMediaIfPlayerStatusIsPreparing() { + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.PREPARING); @@ -168,7 +168,7 @@ public class PlaybackVolumeAdaptorTest { when(mediaPlayer.getPlayable()).thenReturn(feedMedia); FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT); @@ -177,8 +177,8 @@ public class PlaybackVolumeAdaptorTest { } @Test - public void adaptsPreferencesForLoadedFeedMediaIfPlayerStatusIsSeeking() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + public void updatesPreferencesForLoadedFeedMediaIfPlayerStatusIsSeeking() { + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.SEEKING); @@ -186,7 +186,7 @@ public class PlaybackVolumeAdaptorTest { when(mediaPlayer.getPlayable()).thenReturn(feedMedia); FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT); verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT); @@ -195,8 +195,8 @@ public class PlaybackVolumeAdaptorTest { } @Test - public void adaptsPreferencesAndForcesVolumeChangeForLoadedFeedMediaIfPlayerStatusIsPlaying() { - PlaybackVolumeAdaptor playbackVolumeAdaptor = new PlaybackVolumeAdaptor(); + public void updatesPreferencesAndForcesVolumeChangeForLoadedFeedMediaIfPlayerStatusIsPlaying() { + PlaybackVolumeUpdater playbackVolumeUpdater = new PlaybackVolumeUpdater(); when(mediaPlayer.getPlayerStatus()).thenReturn(PlayerStatus.PLAYING); @@ -204,7 +204,7 @@ public class PlaybackVolumeAdaptorTest { when(mediaPlayer.getPlayable()).thenReturn(feedMedia); FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID); - playbackVolumeAdaptor.adaptVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.HEAVY); + playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.HEAVY); verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.HEAVY); |