From 7edd8002f16ffaf2a71297906094bc701637ae5b Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Tue, 21 Jun 2022 11:42:17 -0600 Subject: [PATCH] deps: update exoplayer to 2.18.0 Update ExoPlayer to 2.18.0 and fix all of the breaking changes. --- CHANGELOG.md | 2 ++ app/build.gradle | 2 +- .../playback/system/MediaSessionComponent.kt | 2 +- .../auxio/playback/system/PlaybackService.kt | 28 +++++++++---------- app/src/main/res/values-sw600dp/styles_ui.xml | 1 - app/src/main/res/values/styles_ui.xml | 4 --- prebuild.py | 2 +- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5129549a..83a994f26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,14 @@ - Fixed broken tablet layouts - Fixed seam that would appear on some album covers - Fixed visual issue with the queue opening animation +- Fixed miscellanious startup issues - Fixed crash if settings was navigated away before playback state finished saving #### Dev/Meta - Migrated preferences from shared object to utility - Removed 2.0.0 compat code +- Updated ExoPlayer to 2.18.0 ## v2.4.0 diff --git a/app/build.gradle b/app/build.gradle index 58e3bd94d..7c32fda8c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,7 +93,7 @@ dependencies { // Exoplayer // WARNING: THE EXOPLAYER VERSION MUST BE KEPT IN LOCK-STEP WITH THE PRE-BUILD SCRIPT. // IF NOT, VERY UNFRIENDLY BUILD FAILURES AND CRASHES MAY ENSUE. - implementation "com.google.android.exoplayer:exoplayer-core:2.17.1" + implementation "com.google.android.exoplayer:exoplayer-core:2.18.0" implementation fileTree(dir: "libs", include: ["extension-*.aar"]) // Image loading diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt index ac86b2c2b..6e7f70cb4 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt @@ -166,7 +166,7 @@ class MediaSessionComponent(private val context: Context, private val player: Pl override fun onSettingChanged(key: String) { if (key == context.getString(R.string.set_key_show_covers) || - key == context.getString(R.string.set_key_show_covers)) { + key == context.getString(R.string.set_key_quality_covers)) { updateMediaMetadata(playbackManager.song) } } diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt index 0b4c729a9..080e233dc 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt @@ -31,7 +31,7 @@ import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.PlaybackException import com.google.android.exoplayer2.Player import com.google.android.exoplayer2.RenderersFactory -import com.google.android.exoplayer2.TracksInfo +import com.google.android.exoplayer2.Tracks import com.google.android.exoplayer2.audio.AudioAttributes import com.google.android.exoplayer2.audio.AudioCapabilities import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer @@ -229,14 +229,14 @@ class PlaybackService : } } - override fun onTracksInfoChanged(tracksInfo: TracksInfo) { - super.onTracksInfoChanged(tracksInfo) + override fun onTracksChanged(tracks: Tracks) { + super.onTracksChanged(tracks) - for (info in tracksInfo.trackGroupInfos) { - if (info.isSelected) { - for (i in 0 until info.trackGroup.length) { - if (info.isTrackSelected(i)) { - replayGainProcessor.applyReplayGain(info.trackGroup.getFormat(i).metadata) + for (group in tracks.groups) { + if (group.isSelected) { + for (i in 0 until group.length) { + if (group.isTrackSelected(i)) { + replayGainProcessor.applyReplayGain(group.getTrackFormat(i).metadata) break } } @@ -292,11 +292,11 @@ class PlaybackService : override fun onSettingChanged(key: String) { when (key) { - getString(R.string.set_replay_gain), - getString(R.string.set_pre_amp_with), - getString(R.string.set_pre_amp_without) -> onTracksInfoChanged(player.currentTracksInfo) - getString(R.string.set_show_covers), - getString(R.string.set_quality_covers) -> + getString(R.string.set_key_replay_gain), + getString(R.string.set_key_pre_amp_with), + getString(R.string.set_key_pre_amp_without) -> onTracksChanged(player.currentTracks) + getString(R.string.set_key_show_covers), + getString(R.string.set_key_quality_covers) -> playbackManager.song?.let { song -> notificationComponent.updateMetadata(song, playbackManager.parent) } @@ -352,7 +352,7 @@ class PlaybackService : .setAudioAttributes( AudioAttributes.Builder() .setUsage(C.USAGE_MEDIA) - .setContentType(C.CONTENT_TYPE_MUSIC) + .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC) .build(), true) .build() diff --git a/app/src/main/res/values-sw600dp/styles_ui.xml b/app/src/main/res/values-sw600dp/styles_ui.xml index 2684ab655..b7d543b59 100644 --- a/app/src/main/res/values-sw600dp/styles_ui.xml +++ b/app/src/main/res/values-sw600dp/styles_ui.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index 550c10be3..c11970a97 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -20,22 +20,18 @@ --> @dimen/spacing_tiny - \ - \ - \ - \