Press up on audio player to select artist

Fixes #24

Author: 1hitsong

components/manager/ViewCreator.bs

@@ -4,6 +4,7 @@ import "pkg:/source/enums/TaskControl.bs"
 sub CreateAudioPlayerView()
     m.view = CreateObject("roSGNode", "AudioPlayerView")
     m.view.observeField("state", "onStateChange")
+    m.view.observeField("selectedArtist", "onSelectedArtistChange")
     m.global.sceneManager.callFunc("pushScene", m.view)
 end sub
 
@@ -226,6 +227,12 @@ sub onPlaybackInfoLoaded()
     end if
 end sub
 
+sub onSelectedArtistChange()
+    if isValidAndNotEmpty(m.view.selectedArtist)
+        m.global.jumpToArtist = m.view.selectedArtist
+    end if
+end sub
+
 ' Playback state change event handlers
 sub onStateChange()
     if LCase(m.view.state) = "finished"

components/music/AudioPlayerView.bs

@@ -3,6 +3,7 @@ import "pkg:/source/api/Image.bs"
 import "pkg:/source/enums/ColorPalette.bs"
 import "pkg:/source/enums/ImageType.bs"
 import "pkg:/source/enums/KeyCode.bs"
+import "pkg:/source/enums/String.bs"
 import "pkg:/source/enums/TaskControl.bs"
 import "pkg:/source/utils/config.bs"
 import "pkg:/source/utils/misc.bs"
@@ -55,8 +56,8 @@ sub init()
     song = m.top.findNode("song")
     song.font.size = 60
 
-    artist = m.top.findNode("artist")
-    artist.font.size = 35
+    m.artist = m.top.findNode("artist")
+    m.artist.font.size = 35
 
     numberofsongs = m.top.findNode("numberofsongs")
     numberofsongs.font.size = 25
@@ -293,7 +294,7 @@ sub audioStateChanged()
         if m.global.audioPlayer.loopMode = "one"
             m.scrubTimestamp = -1
             playAction()
-            exitScrubMode()
+            exitScrubMode(m.buttons)
             return
         end if
 
@@ -355,7 +356,7 @@ function previousClicked() as boolean
         end if
     end if
 
-    exitScrubMode()
+    exitScrubMode(m.buttons)
 
     m.lastRecordedPositionTimestamp = 0
     m.positionTimestamp.text = "0:00"
@@ -415,7 +416,7 @@ function nextClicked() as boolean
         end if
     end if
 
-    exitScrubMode()
+    exitScrubMode(m.buttons)
 
     m.lastRecordedPositionTimestamp = 0
     m.positionTimestamp.text = "0:00"
@@ -482,7 +483,7 @@ sub LoadNextSong()
         m.global.audioPlayer.control = "stop"
     end if
 
-    exitScrubMode()
+    exitScrubMode(m.buttons)
 
     ' Reset playPosition bar without animation
     m.playPosition.width = 0
@@ -789,8 +790,12 @@ end sub
 
 ' exitScrubMode: Moves player out of scrub mode state,  resets back to standard play mode
 '
-sub exitScrubMode()
-    m.buttons.setFocus(true)
+sub exitScrubMode(nodeReceivingFocus = m.buttons as dynamic)
+    if not isValid(nodeReceivingFocus)
+        nodeReceivingFocus = m.buttons
+    end if
+
+    nodeReceivingFocus.setFocus(true)
     m.thumb.setFocus(false)
 
     if m.seekPosition.visible
@@ -801,7 +806,12 @@ sub exitScrubMode()
 
     m.inScrubMode = false
     m.thumb.visible = false
-    setSelectedButtonState(ButtonState.SELECTED)
+
+    if isValid(nodeReceivingFocus.id)
+        if LCase(nodeReceivingFocus.id) = "buttons"
+            setSelectedButtonState(ButtonState.SELECTED)
+        end if
+    end if
 end sub
 
 ' checkDisplaySiblingItem: Determine visible state for both previous and next item popups
@@ -848,17 +858,63 @@ sub checkDisplaySiblingItem()
     m.previousItem.visible = showPreviousItem
 end sub
 
+sub setFocusOnThumb()
+    if not m.thumb.visible
+        m.thumb.visible = true
+        setSelectedButtonState(ButtonState.DEFAULT)
+    end if
+
+    if not m.seekPosition.visible
+        m.seekPosition.visible = true
+    end if
+
+    m.thumb.setFocus(true)
+end sub
+
 ' Process key press events
 function onKeyEvent(key as string, press as boolean) as boolean
 
-    ' Key bindings for remote control buttons
     if press
         ' If user presses key to turn off screensaver, don't do anything else with it
         if screenSaverActive()
             endScreenSaver()
             return true
         end if
 
+        ' Key Event handler when m.artist is in focus
+        if m.artist.hasFocus()
+            if key = KeyCode.DOWN
+                m.artist.setFocus(false)
+                m.artist.color = ColorPalette.WHITE
+                setFocusOnThumb()
+                return true
+            end if
+
+            if key = KeyCode.OK or key = KeyCode.PLAY
+                currentItem = m.global.queueManager.callFunc("getCurrentItem")
+
+                if isChainValid(currentItem, "ArtistItems")
+                    if isValidAndNotEmpty(currentItem.ArtistItems)
+                        m.global.audioPlayer.control = "stop"
+                        m.global.audioPlayer.loopMode = ""
+                        m.top.selectedArtist = currentItem.ArtistItems[0]
+                    end if
+                end if
+
+                if not isValidAndNotEmpty(m.top.selectedArtist)
+                    if isChainValid(currentItem, "json.ArtistItems")
+                        if isValidAndNotEmpty(currentItem.json.ArtistItems)
+                            m.global.audioPlayer.control = "stop"
+                            m.global.audioPlayer.loopMode = ""
+                            m.top.selectedArtist = currentItem.json.ArtistItems[0]
+                        end if
+                    end if
+                end if
+
+                return true
+            end if
+        end if
+
         ' Key Event handler when m.thumb is in focus
         if m.thumb.hasFocus()
             if key = KeyCode.RIGHT
@@ -873,6 +929,14 @@ function onKeyEvent(key as string, press as boolean) as boolean
                 return true
             end if
 
+            if key = KeyCode.UP
+                m.artist.color = ColorPalette.HIGHLIGHT
+                if m.thumb.visible
+                    exitScrubMode(m.artist)
+                end if
+                return true
+            end if
+
             if key = KeyCode.OK or key = KeyCode.PLAY
                 if m.inScrubMode
                     startLoadingSpinner()
@@ -892,24 +956,51 @@ function onKeyEvent(key as string, press as boolean) as boolean
             return playAction()
         end if
 
-        if key = KeyCode.UP
-            if not m.thumb.visible
-                m.thumb.visible = true
-                setSelectedButtonState(ButtonState.DEFAULT)
+        if m.buttons.hasFocus()
+            if key = KeyCode.UP
+                setFocusOnThumb()
+                m.buttons.setFocus(false)
+                checkDisplaySiblingItem()
+                return true
             end if
-            if not m.seekPosition.visible
-                m.seekPosition.visible = true
+
+            if key = KeyCode.OK
+                if m.buttons.getChild(m.top.selectedButtonIndex).id = "play"
+                    return playAction()
+                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "previous"
+                    return previousClicked()
+                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "next"
+                    return nextClicked()
+                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "shuffle"
+                    return shuffleClicked()
+                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "loop"
+                    return loopClicked()
+                end if
             end if
 
-            m.thumb.setFocus(true)
-            m.buttons.setFocus(false)
-            checkDisplaySiblingItem()
-            return true
+            if key = KeyCode.RIGHT
+                if m.global.queueManager.callFunc("getCount") = 1 then return false
+                m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
+                if m.top.selectedButtonIndex < m.buttonCount - 1 then m.top.selectedButtonIndex = m.top.selectedButtonIndex + 1
+                checkDisplaySiblingItem()
+                return true
+            end if
+
+            if key = KeyCode.LEFT
+                if m.global.queueManager.callFunc("getCount") = 1 then return false
+
+                if m.top.selectedButtonIndex > 0
+                    m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
+                    m.top.selectedButtonIndex = m.top.selectedButtonIndex - 1
+                    checkDisplaySiblingItem()
+                end if
+                return true
+            end if
         end if
 
         if key = KeyCode.DOWN
             if m.thumb.visible
-                exitScrubMode()
+                exitScrubMode(m.buttons)
             end if
             checkDisplaySiblingItem()
             return true
@@ -922,40 +1013,6 @@ function onKeyEvent(key as string, press as boolean) as boolean
             return previousClicked()
         else if key = KeyCode.FASTFORWRD
             return nextClicked()
-        else if key = KeyCode.left
-            if m.buttons.hasFocus()
-                if m.global.queueManager.callFunc("getCount") = 1 then return false
-
-                if m.top.selectedButtonIndex > 0
-                    m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
-                    m.top.selectedButtonIndex = m.top.selectedButtonIndex - 1
-                    checkDisplaySiblingItem()
-                end if
-                return true
-            end if
-        else if key = KeyCode.RIGHT
-            if m.buttons.hasFocus()
-                if m.global.queueManager.callFunc("getCount") = 1 then return false
-
-                m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
-                if m.top.selectedButtonIndex < m.buttonCount - 1 then m.top.selectedButtonIndex = m.top.selectedButtonIndex + 1
-                checkDisplaySiblingItem()
-                return true
-            end if
-        else if key = KeyCode.OK
-            if m.buttons.hasFocus()
-                if m.buttons.getChild(m.top.selectedButtonIndex).id = "play"
-                    return playAction()
-                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "previous"
-                    return previousClicked()
-                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "next"
-                    return nextClicked()
-                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "shuffle"
-                    return shuffleClicked()
-                else if m.buttons.getChild(m.top.selectedButtonIndex).id = "loop"
-                    return loopClicked()
-                end if
-            end if
         end if
     end if
 

components/music/AudioPlayerView.xml

@@ -172,6 +172,7 @@
   </children>
   <interface>
     <field id="state" type="string" />
+    <field id="selectedArtist" type="assocarray" />
     <field id="selectedButtonIndex" type="integer" />
   </interface>
 </component>

source/Main.bs

@@ -44,6 +44,9 @@ sub Main (args as dynamic) as void
     m.global.addFields({ app_loaded: false, playstateTask: playstateTask, sceneManager: sceneManager })
     m.global.addFields({ queueManager: CreateObject("roSGNode", "QueueManager") })
     m.global.addFields({ audioPlayer: CreateObject("roSGNode", "AudioPlayer") })
+    m.global.addFields({ jumpToArtist: {} })
+
+    m.global.observeField("jumpToArtist", m.port)
 
     app_start:
     ' First thing to do is validate the ability to use the API
@@ -130,9 +133,20 @@ sub Main (args as dynamic) as void
     ' m.scene's children is the "previous view" stack
     while true
         msg = wait(0, m.port)
+
         if type(msg) = "roSGScreenEvent" and msg.isScreenClosed()
             print "CLOSING SCREEN"
             return
+        else if isNodeEvent(msg, "jumpToArtist")
+            selectedItem = msg.getData()
+            if isValid(selectedItem)
+                m.global.sceneManager.callFunc("clearPreviousScene")
+                group = CreateArtistView(selectedItem)
+                if not isValid(group)
+                    stopLoadingSpinner()
+                    message_dialog(tr("Unable to find any albums or songs belonging to this artist"))
+                end if
+            end if
         else if isNodeEvent(msg, "exit")
             return
         else if isNodeEvent(msg, "closeSidePanel")

source/ShowScenes.bs

@@ -712,6 +712,12 @@ function CreateArtistView(artist as object) as dynamic
     group.observeField("quickPlayNode", m.port)
     m.global.sceneManager.callFunc("pushScene", group)
 
+    overhang = group.getScene().findNode("overhang")
+    if isValid(overhang)
+        overhang.visible = true
+        overhang.isVisible = true
+    end if
+
     return group
 end function
 

source/static/whatsNew/1.0.5.json

@@ -1,4 +1,8 @@
 [
+  {
+    "description": "Press up on audio player to allow selecting playing artist",
+    "author": "1hitsong"
+  },
   {
     "description": "Add support for folders in favorites row on home screen",
     "author": "1hitsong"