Fix parameters after merge
This commit is contained in:
parent
84bdf2d256
commit
5b79bb5a0a
|
@ -347,6 +347,7 @@ sub Main (args as dynamic) as void
|
|||
' If node allows retrying using Transcode Url, give that shot
|
||||
if node.retryWithTranscoding
|
||||
retryVideo = CreateVideoPlayerGroup(node.Id, invalid, node.audioIndex, true)
|
||||
retryVideo = CreateVideoPlayerGroup(node.Id, invalid, node.audioIndex, true, false)
|
||||
m.global.sceneManager.callFunc("popScene")
|
||||
if retryVideo <> invalid
|
||||
m.global.sceneManager.callFunc("pushScene", retryVideo)
|
||||
|
|
|
@ -458,7 +458,7 @@ end sub
|
|||
function CreateVideoPlayerGroup(video_id, mediaSourceId = invalid, audio_stream_idx = 1, forceTranscoding = false, showIntro = true)
|
||||
|
||||
' Video is Playing
|
||||
video = VideoPlayer(video_id, mediaSourceId, audio_stream_idx, defaultSubtitleTrackFromVid(video_id), showIntro)
|
||||
video = VideoPlayer(video_id, mediaSourceId, audio_stream_idx, defaultSubtitleTrackFromVid(video_id), forceTranscoding, showIntro)
|
||||
|
||||
if video = invalid then return invalid
|
||||
if video.errorMsg = "introaborted" then return video
|
||||
|
|
|
@ -288,7 +288,7 @@ function PlayIntroVideo(video_id, audio_stream_idx) as boolean
|
|||
' Bypass joke pre-roll
|
||||
if lcase(introVideos.items[0].name) = "rick roll'd" then return true
|
||||
|
||||
introVideo = VideoPlayer(introVideos.items[0].id, introVideos.items[0].id, audio_stream_idx, defaultSubtitleTrackFromVid(video_id), false)
|
||||
introVideo = VideoPlayer(introVideos.items[0].id, introVideos.items[0].id, audio_stream_idx, defaultSubtitleTrackFromVid(video_id), false, false)
|
||||
|
||||
port = CreateObject("roMessagePort")
|
||||
introVideo.observeField("state", port)
|
||||
|
@ -413,7 +413,7 @@ sub autoPlayNextEpisode(videoID as string, showID as string)
|
|||
' remove finished video node
|
||||
m.global.sceneManager.callFunc("popScene")
|
||||
' setup new video node
|
||||
nextVideo = CreateVideoPlayerGroup(data.Items[1].Id, invalid, 1, false)
|
||||
nextVideo = CreateVideoPlayerGroup(data.Items[1].Id, invalid, 1, false, false)
|
||||
if nextVideo <> invalid
|
||||
m.global.sceneManager.callFunc("pushScene", nextVideo)
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue
Block a user