Skip to content

Commit 87bef9e

Browse files
harleykradovill1hitsongVX-101
authored
backport upstream commits, adjust vertical navigation on OSD (#102)
* Change request from GET to POST * Fix Roku subtitle menu for burned-in tracks * fix osd navigation --------- Co-authored-by: 1hitsong <3330318+1hitsong@users.noreply.github.com> Co-authored-by: Igor Vilenski <vx-101@users.noreply.github.com>
1 parent 80937cc commit 87bef9e

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

components/video/OSD.bs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ sub init()
4848
m.top.observeField("nextItemIcon", "onNextItemIconChanged")
4949
m.top.observeField("nextItemTitleText", "onNextItemTitleTextChanged")
5050

51-
m.defaultButtonIndex = 2
51+
m.defaultButtonIndex = 1
5252
m.focusedButtonIndex = 0
5353
m.currentButtonGroup = "seekbar"
5454
m.logoMoved = false
@@ -576,7 +576,8 @@ function onKeyEvent(key as string, press as boolean) as boolean
576576
if m.currentButtonGroup = "seekbar"
577577
focusOnTransportControls()
578578
else if m.currentButtonGroup = "transport"
579-
focusOnSecondaryControls()
579+
checkDisplaySiblingItem("")
580+
m.top.action = "hide"
580581
else if m.currentButtonGroup = "secondary"
581582
checkDisplaySiblingItem("")
582583
m.top.action = "hide"
@@ -587,7 +588,8 @@ function onKeyEvent(key as string, press as boolean) as boolean
587588

588589
if key = "up"
589590
if m.currentButtonGroup = "secondary"
590-
focusOnTransportControls()
591+
focusOnSeekbar()
592+
591593
else if m.currentButtonGroup = "transport"
592594
focusOnSeekbar()
593595
end if

components/video/VideoPlayerView.bs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,6 @@ sub onVideoContentLoaded()
867867

868868
if subtitle.Index = videoContent[0].selectedSubtitle
869869
selectedSubtitle = subtitle
870-
exit for
871870
end if
872871
end for
873872

@@ -890,9 +889,7 @@ sub onVideoContentLoaded()
890889
end if
891890
end if
892891

893-
if not (m.isTranscoded and burnInSubtitles)
894-
m.top.selectedSubtitle = videoContent[0].selectedSubtitle
895-
end if
892+
m.top.selectedSubtitle = videoContent[0].selectedSubtitle
896893

897894
m.top.observeField("selectedSubtitle", "onSubtitleChange")
898895

source/api/userauth.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ end sub
134134

135135
function initQuickConnect()
136136
resp = APIRequest("QuickConnect/Initiate")
137-
jsonResponse = getJson(resp)
137+
jsonResponse = postJson(resp)
138138
if jsonResponse = invalid
139139
return invalid
140140
end if

0 commit comments

Comments
 (0)