Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/src/main/kotlin/com/metrolist/music/playback/MusicService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ class MusicService :
private var fadingPlayer: ExoPlayer? = null
private var isCrossfading = false
private var crossfadeJob: Job? = null

private lateinit var mediaSession: MediaLibrarySession
private var isRunning = false
private var mediaSession: MediaLibrarySession? = null

// Tracks if player has been properly initilized
private val playerInitialized = MutableStateFlow(false)
Expand Down Expand Up @@ -907,7 +907,7 @@ class MusicService :
sleepTimer.player = newPlayer

try {
(mediaSession as MediaSession).player = newPlayer
mediaSession?.let { (it as MediaSession).player = newPlayer }
} catch (e: Exception) {
Timber.tag(TAG).e(e, "Failed to swap player in MediaSession")
}
Expand Down Expand Up @@ -1408,7 +1408,7 @@ class MusicService :
}

private fun updateNotification() {
mediaSession.setCustomLayout(
mediaSession?.setCustomLayout(
listOf(
CommandButton
.Builder()
Expand Down Expand Up @@ -3824,7 +3824,7 @@ class MusicService :
abandonAudioFocus()
closeAudioEffectSession()
mediaLibrarySessionCallback.release()
mediaSession.release()
mediaSession?.release()
player.removeListener(this)
player.removeListener(sleepTimer)
playerSilenceProcessors.remove(player)
Expand Down Expand Up @@ -4403,7 +4403,7 @@ class MusicService :
sleepTimer.player = player

try {
(mediaSession as MediaSession).player = player
mediaSession?.let { (it as MediaSession).player = player }
} catch (e: Exception) {
timber.log.Timber.e(e, "Failed to swap player in MediaSession")
}
Expand Down
Loading