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

Merge pull request #1153 from cewert/upmaster

Browse Source
This commit is contained in:
Charles Ewert 2023-04-01 14:31:39 -04:00 committed by GitHub
commit 010fed5781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/mediaPlayers/AudioPlayer.brs
View File

@ -1,5 +1,6 @@
sub init()
m.playReported = false
m.top.disableScreenSaver = true
m.top.observeField("state", "audioStateChanged")
end sub

2
components/mediaPlayers/AudioPlayer.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<component name="AudioPlayer" extends="Audio">
<component name="AudioPlayer" extends="Video">
<interface>
<field id="loopMode" type="string" value="" />
</interface>

16
components/screensaver/Screensaver.brs
View File

@ -1,16 +0,0 @@
sub init()
' backgroundUri must be set to an empty string before backgroundColor can be set
m.top.backgroundUri = ""
m.top.backgroundColor = "#000000"
m.PosterOne = m.top.findNode("PosterOne")
m.PosterOne.uri = "pkg:/images/logo.png"
m.BounceAnimation = m.top.findNode("BounceAnimation")
m.BounceAnimation.control = "start" 'Start BounceAnimation
if get_user_setting("ui.screensaver.splashBackground") = "true"
m.backdrop = m.top.findNode("backdrop")
m.backdrop.uri = buildURL("/Branding/Splashscreen?format=jpg&foregroundLayer=0.15&fillWidth=1280&width=1280&fillHeight=720&height=720&tag=splash")
end if
end sub

146
components/screensaver/Screensaver.xml
View File

@ -1,146 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<component name="Screensaver" extends="Scene">
<script type="text/brightscript" uri = "Screensaver.brs"/>
<children>
<Poster id="backdrop" loadDisplayMode="scaleToZoom" width="1920" height="1200" />
<!-- Makes 2 Posters on top of each other -->
<Poster
id = "PosterOne"
width = "389"
height = "104"
opacity = "1"
translation = "[960,540]"
/>
<!--Gigantic loop for bouncing animation -->
<SequentialAnimation
id = "BounceAnimation"
repeat = "true"
>
<Animation
id = "AnimOne"
repeat = "false"
easeFunction = "linear"
duration = "7.2"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[960,540],[1500,250]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimTwo"
repeat = "false"
easeFunction = "linear"
duration = "4.5"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[1500,250],[1350,60]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimThree"
repeat = "false"
easeFunction = "linear"
duration = "16"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[1350,60],[200,890]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimFour"
repeat = "false"
easeFunction = "linear"
duration = "3.2"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[200,890],[30,750]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimFive"
repeat = "false"
easeFunction = "linear"
duration = "13.3"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[30,750],[1200,60]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimSix"
repeat = "false"
easeFunction = "linear"
duration = "6.7"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[1200,60],[1500,300]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimSeven"
repeat = "false"
easeFunction = "linear"
duration = "15"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[1500,300],[150,935]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimEight"
repeat = "false"
easeFunction = "linear"
duration = "2"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[150,935],[10,899.3]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
<Animation
id = "AnimNine"
repeat = "false"
easeFunction = "linear"
duration = "11"
>
<Vector2DFieldInterpolator
id = "OneInterp"
key = "[0.0,1.0]"
keyValue = "[[10,899.3],[960,540]]"
fieldToInterp = "PosterOne.translation"
/>
</Animation>
</SequentialAnimation>
</children>
<script type="text/brightscript" uri="pkg:/source/api/baserequest.brs" />
<script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
</component>

18
locale/en_US/translations.ts
View File

@ -683,24 +683,6 @@
<source>If enabled, images of unwatched episodes will be blurred.</source>
<translation>If enabled, images of unwatched episodes will be blurred.</translation>
</message>
<message>
<source>Screensaver</source>
<translation>Screensaver</translation>
</message>
<message>
<source>Options for Jellyfin&apos;s screensaver.</source>
<translation>Options for Jellyfin&apos;s screensaver.</translation>
<extracomment>Description for Screensaver user settings.</extracomment>
</message>
<message>
<source>Use Splashscreen as Screensaver</source>
<translation>Use Splashscreen as Screensaver</translation>
<extracomment>Option Title in user setting screen</extracomment>
</message>
<message>
<source>Use generated splashscreen image as Jellyfin&apos;s screensaver background. Jellyfin will need to be closed and reopened for change to take effect.</source>
<translation>Use generated splashscreen image as Jellyfin&apos;s screensaver background. Jellyfin will need to be closed and reopened for change to take effect.</translation>
</message>
<message>
<source>Design Elements</source>
<translation>Design Elements</translation>

3
manifest
View File

@ -21,7 +21,4 @@ splash_min_time=1500
ui_resolutions=fhd
screensaver_private=1
screensaver_title=Jellyfin
supports_input_launch=1

13
settings/settings.json
View File

@ -145,19 +145,6 @@
}
]
},
{
"title": "Screensaver",
"description": "Options for Jellyfin's screensaver.",
"children": [
{
"title": "Use Splashscreen as Screensaver Background",
"description": "Use generated splashscreen image as Jellyfin's screensaver background. Jellyfin will need to be closed and reopened for change to take effect.",
"settingName": "ui.screensaver.splashBackground",
"type": "bool",
"default": "false"
}
]
},
{
"title": "Libraries",
"description": "Settings relating to the appearance of Library pages.",

25
source/Main.brs
View File

@ -748,31 +748,6 @@ sub DeleteFromServerList(urlToDelete)
end if
end sub
sub RunScreenSaver()
print "Starting screensaver..."
scene = ReadAsciiFile("tmp:/scene")
if scene = "nowplaying" then return
screen = createObject("roSGScreen")
m.port = createObject("roMessagePort")
screen.setMessagePort(m.port)
screen.createScene("Screensaver")
screen.Show()
while true
msg = wait(8000, m.port)
if msg <> invalid
msgType = type(msg)
if msgType = "roSGScreenEvent"
if msg.isScreenClosed() then return
end if
end if
end while
end sub
' Roku Performance monitoring
sub SendPerformanceBeacon(signalName as string)
if m.global.app_loaded = false