From d04456ee36e7e1815c9a553abd0ba1c0836e4e3c Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Mon, 20 Mar 2023 20:21:47 -0400
Subject: [PATCH] Fix music album loop function

---
 components/manager/ViewCreator.brs      |  1 +
 components/mediaPlayers/AudioPlayer.xml |  3 +++
 components/music/AudioPlayerView.brs    | 34 ++++++++++++++++---------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/components/manager/ViewCreator.brs b/components/manager/ViewCreator.brs
index 1b722311..fa23c26f 100644
--- a/components/manager/ViewCreator.brs
+++ b/components/manager/ViewCreator.brs
@@ -106,5 +106,6 @@ sub onStateChange()
 
         ' Playback completed, return user to previous screen
         m.global.sceneManager.callFunc("popScene")
+        m.global.audioPlayer.loopMode = ""
     end if
 end sub
diff --git a/components/mediaPlayers/AudioPlayer.xml b/components/mediaPlayers/AudioPlayer.xml
index 69a8b143..ec105757 100644
--- a/components/mediaPlayers/AudioPlayer.xml
+++ b/components/mediaPlayers/AudioPlayer.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="AudioPlayer" extends="Audio">
+  <interface>
+    <field id="loopMode" type="string" value="" />
+  </interface>
   <script type="text/brightscript" uri="AudioPlayer.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
 </component>
diff --git a/components/music/AudioPlayerView.brs b/components/music/AudioPlayerView.brs
index ec5bfacc..be217b2e 100644
--- a/components/music/AudioPlayerView.brs
+++ b/components/music/AudioPlayerView.brs
@@ -11,7 +11,6 @@ sub init()
     m.playlistTypeCount = m.global.queueManager.callFunc("getQueueUniqueTypes").count()
 
     m.shuffleEnabled = false
-    m.loopMode = ""
     m.buttonCount = m.buttons.getChildCount()
 
     m.screenSaverTimeout = 300
@@ -203,7 +202,7 @@ sub audioStateChanged()
     ' Song Finished, attempt to move to next song
     if m.global.audioPlayer.state = "finished"
         ' User has enabled single song loop, play current song again
-        if m.loopMode = "one"
+        if m.global.audioPlayer.loopMode = "one"
             playAction()
             return
         end if
@@ -214,7 +213,7 @@ sub audioStateChanged()
             ' We are at the end of the song queue
 
             ' User has enabled loop for entire song queue, move back to first song
-            if m.loopMode = "all"
+            if m.global.audioPlayer.loopMode = "all"
                 m.global.queueManager.callFunc("setPosition", -1)
                 LoadNextSong()
                 return
@@ -264,21 +263,30 @@ end function
 
 function loopClicked() as boolean
 
-    if m.loopMode = ""
-        m.loopIndicator.opacity = "1"
-        m.loopIndicator.uri = m.loopIndicator.uri.Replace("-off", "-on")
-        m.loopMode = "all"
-    else if m.loopMode = "all"
-        m.loopIndicator.uri = m.loopIndicator.uri.Replace("-on", "1-on")
-        m.loopMode = "one"
+    if m.global.audioPlayer.loopMode = ""
+        m.global.audioPlayer.loopMode = "all"
+    else if m.global.audioPlayer.loopMode = "all"
+        m.global.audioPlayer.loopMode = "one"
     else
-        m.loopIndicator.uri = m.loopIndicator.uri.Replace("1-on", "-off")
-        m.loopMode = ""
+        m.global.audioPlayer.loopMode = ""
     end if
 
+    setLoopButtonImage()
+
     return true
 end function
 
+sub setLoopButtonImage()
+    if m.global.audioPlayer.loopMode = "all"
+        m.loopIndicator.opacity = "1"
+        m.loopIndicator.uri = m.loopIndicator.uri.Replace("-off", "-on")
+    else if m.global.audioPlayer.loopMode = "one"
+        m.loopIndicator.uri = m.loopIndicator.uri.Replace("-on", "1-on")
+    else
+        m.loopIndicator.uri = m.loopIndicator.uri.Replace("1-on", "-off")
+    end if
+end sub
+
 function nextClicked() as boolean
     if m.playlistTypeCount > 1 then return false
 
@@ -408,6 +416,7 @@ sub loadButtons()
         m.shuffleIndicator.opacity = ".4"
         m.loopIndicator.opacity = ".4"
         m.displayButtonsAnimation.control = "start"
+        setLoopButtonImage()
     end if
 end sub
 
@@ -522,6 +531,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
             return playAction()
         else if key = "back"
             m.global.audioPlayer.control = "stop"
+            m.global.audioPlayer.loopMode = ""
         else if key = "rewind"
             return previousClicked()
         else if key = "fastforward"