[Android] Remote access: protect SPU track reading against released media player
Nicolas Pomepuy
git at videolan.org
Wed Sep 9 06:43:37 UTC 2026
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Sep 3 14:58:49 2026 +0200| [77908461e262a7c07966f28074a2687b28c86e46] | committer: Duncan McNamara
Remote access: protect SPU track reading against released media player
> https://code.videolan.org/videolan/vlc-android/commit/77908461e262a7c07966f28074a2687b28c86e46
---
.../java/org/videolan/vlc/remoteaccessserver/RemoteAccessServer.kt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessServer.kt b/application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessServer.kt
index 22668347b8..e90a539c11 100644
--- a/application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessServer.kt
+++ b/application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessServer.kt
@@ -776,9 +776,9 @@ class RemoteAccessServer(private val context: Context) : PlaybackService.Callbac
val waitForMediaEnd = service.waitForMediaEnd
val resetOnInteraction = service.resetOnInteraction
val audioTracks = if (isVideoPlaying) service.audioTracks?.map { WSTrack(it.getId(), it.getName()) } ?: listOf() else listOf()
- val currentAudioTrack = service.audioTrack
- val subtitleTracks = service.spuTracks?.map { WSTrack(it.getId(), it.getName()) } ?: listOf()
- val currentSubtitleTrack = service.spuTrack
+ val currentAudioTrack = if (isVideoPlaying) service.audioTrack else "-1"
+ val subtitleTracks = if (isVideoPlaying) service.spuTracks?.map { WSTrack(it.getId(), it.getName()) } ?: listOf() else listOf()
+ val currentSubtitleTrack = if (isVideoPlaying) service.spuTrack else "-1"
val nowPlaying = NowPlaying(media.title ?: "", media.artistName
?: "", service.isPlaying, isVideoPlaying, service.getTime(), service.length, media.id, media.artworkURL
?: "", media.uri.toString(), getVolume(), speed, sleepTimer, waitForMediaEnd, resetOnInteraction, service.isShuffling, service.repeatType, bookmarks = bookmarks.map { WSBookmark(it.id, it.title, it.time) }, chapters = chapters.map { WSChapter(it.name, it.duration) },
More information about the Android
mailing list