lgladsden/jf-roku
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0.z'

Browse Source
This commit is contained in:
Charles Ewert 2024-02-05 18:47:00 -05:00
parent 47c548fab4
commit 1999cf5e0b
6 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@
# If you want to get_images, you'll also need convert from ImageMagick # If you want to get_images, you'll also need convert from ImageMagick
########################################################################## ##########################################################################
VERSION := 2.0.2 VERSION := 2.0.3
## usage ## usage

9
components/ItemGrid/LoadVideoContentTask.bs
View File

@ -249,7 +249,14 @@ function defaultSubtitleTrackFromVid(videoID) as integer
if not isValidAndNotEmpty(meta.json.MediaSources[0].MediaStreams) then return SubtitleSelection.none if not isValidAndNotEmpty(meta.json.MediaSources[0].MediaStreams) then return SubtitleSelection.none
subtitles = sortSubtitles(meta.id, meta.json.MediaSources[0].MediaStreams) subtitles = sortSubtitles(meta.id, meta.json.MediaSources[0].MediaStreams)
selectedAudioLanguage = meta.json.MediaSources[0].MediaStreams[m.top.selectedAudioStreamIndex].Language ?? ""
selectedAudioLanguage = ""
audioMediaStream = meta.json.MediaSources[0].MediaStreams[m.top.selectedAudioStreamIndex]
' Ensure audio media stream is valid before using language property
if isValid(audioMediaStream)
selectedAudioLanguage = audioMediaStream.Language ?? ""
end if
defaultTextSubs = defaultSubtitleTrack(subtitles["text"], selectedAudioLanguage, true) ' Find correct subtitle track (forced text) defaultTextSubs = defaultSubtitleTrack(subtitles["text"], selectedAudioLanguage, true) ' Find correct subtitle track (forced text)
if defaultTextSubs <> SubtitleSelection.none if defaultTextSubs <> SubtitleSelection.none

2
manifest
View File

@ -3,7 +3,7 @@
title=Jellyfin title=Jellyfin
major_version=2 major_version=2
minor_version=0 minor_version=0
build_version=2 build_version=3
### Main Menu Icons / Channel Poster Artwork ### Main Menu Icons / Channel Poster Artwork

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "jellyfin-roku", "name": "jellyfin-roku",
"type": "module", "type": "module",
"version": "2.0.2", "version": "2.0.3",
"description": "Roku app for Jellyfin media server", "description": "Roku app for Jellyfin media server",
"dependencies": { "dependencies": {
"@rokucommunity/bslib": "0.1.1", "@rokucommunity/bslib": "0.1.1",

14
source/Main.bs
View File

@ -282,7 +282,19 @@ sub Main (args as dynamic) as void
end if end if
' Display playback options dialog ' Display playback options dialog
if selectedItem.json.userdata.PlaybackPositionTicks > 0 showPlaybackOptionDialog = false
if isValid(selectedItem.json)
if isValid(selectedItem.json.userdata)
if isValid(selectedItem.json.userdata.PlaybackPositionTicks)
if selectedItem.json.userdata.PlaybackPositionTicks > 0
showPlaybackOptionDialog = true
end if
end if
end if
end if
if showPlaybackOptionDialog
dialog.close = true dialog.close = true
m.global.queueManager.callFunc("hold", selectedItem) m.global.queueManager.callFunc("hold", selectedItem)
playbackOptionDialog(selectedItem.json.userdata.PlaybackPositionTicks, selectedItem.json) playbackOptionDialog(selectedItem.json.userdata.PlaybackPositionTicks, selectedItem.json)

10
source/static/whatsNew/2.0.3.json Normal file
View File

@ -0,0 +1,10 @@
[
{
"description": "Fix playback of movie additional parts",
"author": "1hitsong"
},
{
"description": "Fix crash if video has no audio stream",
"author": "1hitsong"
}
]