justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 08:01:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

Reduce odds of NPE due to bad concurrency

Browse source
This commit is contained in:
Damontecres 2025-11-14 16:37:25 -05:00
parent 513302a1ed
commit 998727c6ab
No known key found for this signature in database
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
View file

@ -170,9 +170,9 @@ class MpvPlayer(
if (DEBUG) Timber.v("setMediaItems") if (DEBUG) Timber.v("setMediaItems")
mediaItems.firstOrNull()?.let { mediaItems.firstOrNull()?.let {
mediaItem = it mediaItem = it
} if (surface != null) {
if (surface != null) { loadFile(it)
loadFile() }
} }
} }
@ -465,7 +465,10 @@ class MpvPlayer(
MPVLib.attachSurface(surface) MPVLib.attachSurface(surface)
MPVLib.setOptionString("force-window", "yes") MPVLib.setOptionString("force-window", "yes")
Timber.d("Attached surface") Timber.d("Attached surface")
loadFile() mediaItem?.let(::loadFile)
if (mediaItem == null) {
Timber.w("mediaItem is null in setVideoSurfaceView")
}
} else { } else {
clearVideoSurfaceView(null) clearVideoSurfaceView(null)
} }
@ -608,11 +611,13 @@ class MpvPlayer(
isLoadingFile = false isLoadingFile = false
notifyListeners(EVENT_IS_LOADING_CHANGED) { onIsLoadingChanged(false) } notifyListeners(EVENT_IS_LOADING_CHANGED) { onIsLoadingChanged(false) }
Timber.d("event: MPV_EVENT_FILE_LOADED") Timber.d("event: MPV_EVENT_FILE_LOADED")
mediaItem!!.localConfiguration?.subtitleConfigurations?.forEach { mediaItem?.let {
val url = it.uri.toString() it.localConfiguration?.subtitleConfigurations?.forEach {
val title = it.label ?: "External Subtitles" val url = it.uri.toString()
Timber.v("Adding external subtitle track '$title'") val title = it.label ?: "External Subtitles"
MPVLib.command(arrayOf("sub-add", url, "auto", title)) Timber.v("Adding external subtitle track '$title'")
MPVLib.command(arrayOf("sub-add", url, "auto", title))
}
} }
notifyListeners(EVENT_RENDERED_FIRST_FRAME) { onRenderedFirstFrame() } notifyListeners(EVENT_RENDERED_FIRST_FRAME) { onRenderedFirstFrame() }
notifyListeners(EVENT_IS_PLAYING_CHANGED) { onIsPlayingChanged(true) } notifyListeners(EVENT_IS_PLAYING_CHANGED) { onIsPlayingChanged(true) }
@ -689,10 +694,10 @@ class MpvPlayer(
} }
} }
private fun loadFile() { private fun loadFile(mediaItem: MediaItem) {
isLoadingFile = true isLoadingFile = true
notifyListeners(EVENT_IS_LOADING_CHANGED) { onIsLoadingChanged(true) } notifyListeners(EVENT_IS_LOADING_CHANGED) { onIsLoadingChanged(true) }
val url = mediaItem!!.localConfiguration?.uri.toString() val url = mediaItem.localConfiguration?.uri.toString()
if (startPositionMs > 0) { if (startPositionMs > 0) {
MPVLib.command( MPVLib.command(
arrayOf( arrayOf(