Merge pull request #1153 from cewert/upmaster

jellyfin · Apr 1, 2023 · 010fed5 · 010fed5
2 parents e7d62ba + 9205ccf
commit 010fed5
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 222 deletions.
diff --git a/components/mediaPlayers/AudioPlayer.brs b/components/mediaPlayers/AudioPlayer.brs
@@ -1,5 +1,6 @@
 sub init()
     m.playReported = false
+    m.top.disableScreenSaver = true
     m.top.observeField("state", "audioStateChanged")
 end sub
 

diff --git a/components/mediaPlayers/AudioPlayer.xml b/components/mediaPlayers/AudioPlayer.xml
@@ -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>

diff --git a/components/screensaver/Screensaver.brs b/components/screensaver/Screensaver.brs
diff --git a/components/screensaver/Screensaver.xml b/components/screensaver/Screensaver.xml
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
@@ -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>

diff --git a/manifest b/manifest
@@ -21,7 +21,4 @@ splash_min_time=1500
 
 ui_resolutions=fhd
 
-screensaver_private=1
-screensaver_title=Jellyfin
-
 supports_input_launch=1
diff --git a/settings/settings.json b/settings/settings.json
@@ -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.",

diff --git a/source/Main.brs b/source/Main.brs
@@ -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