nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix player crashing when no PlayerItems are passed

Browse source
This commit is contained in:
Jarne Demeulemeester 2022-08-30 10:13:02 +02:00
parent 0399ac0bdb
commit 6ed2f2ff7b
No known key found for this signature in database
GPG key ID: B61B7B150DB6A6D2
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
View file

@ -8,10 +8,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.google.android.exoplayer2.DefaultRenderersFactory import com.google.android.exoplayer2.*
import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import dev.jdtech.jellyfin.database.DownloadDatabaseDao import dev.jdtech.jellyfin.database.DownloadDatabaseDao
@ -134,7 +131,7 @@ constructor(
Timber.e(e) Timber.e(e)
} }
player.setMediaItems(mediaItems, currentMediaItemIndex, items[0].playbackPosition) player.setMediaItems(mediaItems, currentMediaItemIndex, items.getOrNull(currentMediaItemIndex)?.playbackPosition ?: C.TIME_UNSET)
val useMpv = sp.getBoolean("mpv_player", false) val useMpv = sp.getBoolean("mpv_player", false)
if(!useMpv || !playFromDownloads) if(!useMpv || !playFromDownloads)
player.prepare() //TODO: This line causes a crash when playing from downloads with MPV player.prepare() //TODO: This line causes a crash when playing from downloads with MPV
@ -259,7 +256,7 @@ constructor(
fun switchToTrack(trackType: String, track: MPVPlayer.Companion.Track) { fun switchToTrack(trackType: String, track: MPVPlayer.Companion.Track) {
if (player is MPVPlayer) { if (player is MPVPlayer) {
player.selectTrack(trackType, isExternal = false, index = track.ffIndex) player.selectTrack(trackType, id = track.id)
disableSubtitle = track.ffIndex == -1 disableSubtitle = track.ffIndex == -1
} }
} }