mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-30 06:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ExoPlayer deprecations in Android client.

Browse Source
This commit is contained in:
casey langen 2022-07-22 00:40:04 -07:00
parent 5b91e0dd50
commit 3f384305e2
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/player/GaplessExoPlayerWrapper.kt
View File

@ -9,10 +9,7 @@ import com.google.android.exoplayer2.source.MediaSource
import com.google.android.exoplayer2.source.ProgressiveMediaSource import com.google.android.exoplayer2.source.ProgressiveMediaSource
import com.google.android.exoplayer2.source.TrackGroupArray import com.google.android.exoplayer2.source.TrackGroupArray
import com.google.android.exoplayer2.trackselection.TrackSelectionArray import com.google.android.exoplayer2.trackselection.TrackSelectionArray
import com.google.android.exoplayer2.upstream.DataSource import com.google.android.exoplayer2.upstream.*
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
import com.google.android.exoplayer2.util.Util import com.google.android.exoplayer2.util.Util
import io.casey.musikcube.remote.Application import io.casey.musikcube.remote.Application
import io.casey.musikcube.remote.service.playback.PlayerWrapper import io.casey.musikcube.remote.service.playback.PlayerWrapper
@ -37,16 +34,13 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
init { init {
val userAgent = Util.getUserAgent(context, "musikdroid") val userAgent = Util.getUserAgent(context, "musikdroid")
val httpFactory: DataSource.Factory = DefaultHttpDataSource.Factory().apply { val httpFactory: DataSource.Factory = DefaultHttpDataSource.Factory().apply {
setUserAgent(userAgent) setUserAgent(userAgent)
setConnectTimeoutMs(TIMEOUT) setConnectTimeoutMs(TIMEOUT)
setReadTimeoutMs(TIMEOUT) setReadTimeoutMs(TIMEOUT)
setAllowCrossProtocolRedirects(true) setAllowCrossProtocolRedirects(true)
} }
this.sourceFactory = DefaultDataSource.Factory(context, httpFactory)
this.sourceFactory = DefaultDataSourceFactory(context, null, httpFactory)
this.transcoding = prefs.getInt(Prefs.Key.TRANSCODER_BITRATE_INDEX, 0) != 0 this.transcoding = prefs.getInt(Prefs.Key.TRANSCODER_BITRATE_INDEX, 0) != 0
} }
@ -144,7 +138,7 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
this.lastPosition = -1 this.lastPosition = -1
if (gaplessPlayer?.playbackState != Player.STATE_IDLE) { if (gaplessPlayer?.playbackState != Player.STATE_IDLE) {
if (gaplessPlayer?.isCurrentWindowSeekable == true) { if (gaplessPlayer?.isCurrentMediaItemSeekable == true) {
var offset = millis.toLong() var offset = millis.toLong()
val isInitialSeek = initialOffsetMs > 0 && (millis == initialOffsetMs) val isInitialSeek = initialOffsetMs > 0 && (millis == initialOffsetMs)
@ -228,16 +222,7 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
} }
private var eventListener = object : Player.Listener { private var eventListener = object : Player.Listener {
override fun onLoadingChanged(isLoading: Boolean) { override fun onPlaybackStateChanged(playbackState: Int) {
}
override fun onSeekProcessed() {
}
override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
}
override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
Preconditions.throwIfNotOnMainThread() Preconditions.throwIfNotOnMainThread()
if (playbackState == Player.STATE_BUFFERING) { if (playbackState == Player.STATE_BUFFERING) {
@ -290,11 +275,13 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
} }
} }
override fun onPositionDiscontinuity(type: Int) { override fun onPositionDiscontinuity(
oldPosition: Player.PositionInfo, newPosition: Player.PositionInfo,type: Int)
{
/* window index corresponds to the position of the current song in /* window index corresponds to the position of the current song in
the queue. the current song should always be 0! if it's not, then the queue. the current song should always be 0! if it's not, then
that means we advanced to the next one... */ that means we advanced to the next one... */
if (gaplessPlayer?.currentWindowIndex ?: 0 != 0) { if ((gaplessPlayer?.currentMediaItemIndex ?: 0) != 0) {
promoteNext() promoteNext()
state = State.Finished state = State.Finished
} }
@ -313,7 +300,7 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
private val context: Context by lazy { Application.instance } private val context: Context by lazy { Application.instance }
private var all = mutableListOf<GaplessExoPlayerWrapper>() private var all = mutableListOf<GaplessExoPlayerWrapper>()
private lateinit var dcms: ConcatenatingMediaSource private lateinit var dcms: ConcatenatingMediaSource
private var gaplessPlayer: SimpleExoPlayer? = null private var gaplessPlayer: ExoPlayer? = null
private fun promoteNext() { private fun promoteNext() {
if (all.size > 0) { if (all.size > 0) {
@ -334,7 +321,7 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
all.clear() all.clear()
gaplessPlayer?.stop() gaplessPlayer?.stop()
gaplessPlayer?.release() gaplessPlayer?.release()
gaplessPlayer = SimpleExoPlayer.Builder(context) gaplessPlayer = ExoPlayer.Builder(context)
.setBandwidthMeter(DefaultBandwidthMeter.Builder(context).build()) .setBandwidthMeter(DefaultBandwidthMeter.Builder(context).build())
.build() .build()
dcms = ConcatenatingMediaSource() dcms = ConcatenatingMediaSource()