[NowPlaying] added next songs play function for music (#960)

* [NowPlaying Tracklist] added tracklist to nowplaying screen * Update Includes_NowPlaying.xml * Update Custom_NowPlaying_Stop_Helper.xml * [Code] improvements * Update Includes_NowPlaying.xml * [Code] update * Update Includes_NowPlaying.xml * Update Includes_OSD.xml * Update Includes_NowPlaying.xml * Update Includes_NowPlaying.xml * Update Includes_NowPlaying.xml * Update Includes_NowPlaying.xml * [Code] improvements * Update Includes_NowPlaying.xml * Update Includes_NowPlaying.xml
beatmasterRS · Apr 3, 2023 · 7736021 · 7736021
1 parent 59ced7a
commit 7736021
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 23 deletions.
diff --git a/1080i/Custom_NowPlaying_Stop_Helper.xml b/1080i/Custom_NowPlaying_Stop_Helper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1190">
-    <visible>[!String.IsEmpty(Window(home).Property(controlsvisible)) | Control.HasFocus(25)] + Skin.HasSetting(extended.nowplaying) + Window.IsVisible(Home) + !Player.HasMedia + Skin.HasSetting(home.nowplaying.controls)</visible>
+    <visible>[!String.IsEmpty(Window(home).Property(controlsvisible)) | Control.HasFocus(25) | Control.HasFocus(778)] + Skin.HasSetting(extended.nowplaying) + Window.IsVisible(Home) + !Player.HasMedia + Skin.HasSetting(home.nowplaying.controls)</visible>
     <onload>Dialog.Close(all,true)</onload>
     <onload>SetFocus(300)</onload>
     <onunload>ClearProperty(controlsvisible,home)</onunload>

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -5065,5 +5065,13 @@
         <value condition="Player.HasVideo + VideoPlayer.Content(episodes)">videodb://tvshows/titles/-1/-1/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22$INFO[Player.Title]%22%5D%7D%2C%7B%22field%22%3A%22filename%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B%22$INFO[Player.Filename]%22%5D%7D%5D%7D%2C%22type%22%3A%22episodes%22%7D
         </value>
     </variable>
+
+    <include name="OnDirectionAction">
+        <onleft>$PARAM[ondirection]</onleft>
+        <onright>$PARAM[ondirection]</onright>
+        <onup>$PARAM[ondirection]</onup>
+        <ondown>$PARAM[ondirection]</ondown>
+        <onback>$PARAM[ondirection]</onback>
+    </include>
 
 </includes>
diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
@@ -3542,11 +3542,7 @@
             <width>1</width>
             <height>1</height>
             <visible allowhiddenfocus="true">false</visible>
-            <onback>$PARAM[ondirection]</onback>
-            <onup>$PARAM[ondirection]</onup>
-            <ondown>$PARAM[ondirection]</ondown>
-            <onleft>$PARAM[ondirection]</onleft>
-            <onright>$PARAM[ondirection]</onright>
+            <include content="OnDirectionAction"><param name="ondirection" value="$PARAM[ondirection]" /></include>
             <onback>ClearProperty(dontautoclose,home)</onback>
             <onup>ClearProperty(dontautoclose,home)</onup>
             <ondown>ClearProperty(dontautoclose,home)</ondown>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -1748,7 +1748,6 @@
 
     <variable name="Label_NowPlaying_Plot">
         <value condition="Player.HasVideo + !String.IsEmpty(VideoPlayer.Plot)">$INFO[VideoPlayer.Plot]</value>
-        <value condition="Player.HasAudio + Skin.HasSetting(home.extended.nowplaying.tracklist)">$INFO[MusicPlayer.NextTitle,[B]$LOCALIZE[19031]:[/B] ,][CR]$INFO[MusicPlayer.offset(1).Title]$INFO[MusicPlayer.offset(1).Artist, - ,][CR]$INFO[MusicPlayer.offset(2).Title]$INFO[MusicPlayer.offset(2).Artist, - ,][CR]$INFO[MusicPlayer.offset(3).Title]$INFO[MusicPlayer.offset(3).Artist, - ,][CR]$INFO[MusicPlayer.offset(4).Title]$INFO[MusicPlayer.offset(4).Artist, - ,]</value>
         <value condition="Player.HasAudio + !String.IsEmpty(MusicPlayer.Property(Artist_Description))">$INFO[MusicPlayer.Property(Artist_Description)]</value>
         <value condition="Player.HasAudio + !String.IsEmpty(MusicPlayer.Property(Album_Description))">$INFO[MusicPlayer.Property(Album_Description)]</value>
     </variable>

diff --git a/1080i/Includes_NowPlaying.xml b/1080i/Includes_NowPlaying.xml
@@ -79,20 +79,13 @@
             </include>
             <control type="list" id="999">
                 <include>HiddenListControl</include>
-                <ondown>300</ondown>
-                <onleft>300</onleft>
-                <onright>300</onright>
-                <onup>300</onup>
-                <onback>300</onback>
+                <include content="OnDirectionAction"><param name="ondirection" value="300" /></include>
                 <onfocus>SetProperty(shownowplayinginfo,1,home)</onfocus>
                 <content limit="1">$VAR[CurrentlyPlayingItem]</content>
             </control>
             <control type="button" id="4000">
-                <ondown>300</ondown>
-                <onleft>300</onleft>
-                <onright>300</onright>
-                <onup>300</onup>
-                <onback>300</onback>
+                <include>HiddenButton</include>
+                <include content="OnDirectionAction"><param name="ondirection" value="300" /></include>
                 <onfocus>SetFocus(25)</onfocus>
             </control>
         </control>        
@@ -352,13 +345,13 @@
                     <param name="label" value="$INFO[Player.Title]$INFO[VideoPlayer.StartTime,  •  ,]$INFO[VideoPlayer.EndTime, - ]$INFO[VideoPlayer.Duration(mins),  •  , $LOCALIZE[31102]]" />
                     <param name="visible" value="VideoPlayer.Content(livetv)" />
                 </include>
+                <include condition="Skin.HasSetting(homemenu.netflix) + !Skin.HasSetting(home.netflix.clearlogo) | Skin.HasSetting(homemenu.clean.flix)">IntentButton</include>
                 <control type="grouplist">
                     <width>100%</width>
                     <orientation>vertical</orientation>
                     <visible>Player.HasVideo</visible>
                     <itemgap>15</itemgap>
                     <usecontrolcoords>true</usecontrolcoords>
-                    <include condition="Skin.HasSetting(homemenu.netflix) + !Skin.HasSetting(home.netflix.clearlogo) | Skin.HasSetting(homemenu.clean.flix)">IntentButton</include>
                     <control type="textbox">
                         <include condition="Skin.HasSetting(homemenu.netflix)">MultiWidgetsPlotLabelDefinitionNetflix</include>
                         <include condition="!Skin.HasSetting(homemenu.netflix)">MultiWidgetsPlotLabelDefinition</include>
@@ -373,21 +366,112 @@
                 <control type="grouplist">
                     <width>100%</width>
                     <orientation>vertical</orientation>
-                    <visible>!Skin.HasSetting(home.extended.nowplaying.scrolling.text) + Player.HasAudio</visible>
+                    <visible>!Skin.HasSetting(home.extended.nowplaying.scrolling.text) + Player.HasAudio + !Skin.HasSetting(home.extended.nowplaying.tracklist)</visible>
                     <itemgap>15</itemgap>
-                    <include condition="Skin.HasSetting(homemenu.netflix) + !Skin.HasSetting(home.netflix.clearlogo) | Skin.HasSetting(homemenu.clean.flix)">IntentButton</include>
                     <control type="textbox">
                         <include condition="Skin.HasSetting(homemenu.netflix)">MultiWidgetsPlotLabelDefinitionNetflix</include>
                         <include condition="!Skin.HasSetting(homemenu.netflix)">MultiWidgetsPlotLabelDefinition</include>
                         <label>$VAR[Label_NowPlaying_Plot]</label>
-                        <visible>!String.IsEmpty(MusicPlayer.Property(Artist_Description)) | !String.IsEmpty(MusicPlayer.Property(Album_Description)) | Skin.HasSetting(home.extended.nowplaying.tracklist)</visible>
+                        <visible>!String.IsEmpty(MusicPlayer.Property(Artist_Description)) | !String.IsEmpty(MusicPlayer.Property(Album_Description))</visible>
                     </control>
                     <control type="label">
                         <include>MultiWidgetsSubLabelDefinition</include>
                         <label>$VAR[Label_NowPlaying_MusicSubInfo]</label>
                         <visible>!Skin.HasSetting(home.extended.nowplaying.tracklist)</visible>
                     </control>
                 </control>
+                <control type="label">
+                    <include>MultiWidgetsSubLabelDefinition</include>
+                    <label>[B]$LOCALIZE[19031]:[/B]</label>
+                    <visible>Skin.HasSetting(home.extended.nowplaying.tracklist)</visible>
+                </control>
+                <control type="button" id="779">
+                    <include>HiddenButton</include>
+                    <onfocus>SetFocus(301)</onfocus>
+                    <include content="OnDirectionAction"><param name="ondirection" value="300" /></include>
+                    <visible allowhiddenfocus="true">false</visible>
+                </control>
+                <control type="list" id="778">
+                    <visible>Skin.HasSetting(home.extended.nowplaying.tracklist)</visible>
+                    <height>200</height>
+                    <width>100%</width>
+                    <onleft>777</onleft>
+                    <onright>777</onright>
+                    <onup>779</onup>
+                    <ondown>780</ondown>
+                    <onback>300</onback>
+                    <orientation>vertical</orientation>
+                    <itemlayout height="35">
+                        <control type="label">
+                            <height>100%</height>
+                            <width>600</width>
+                            <aligny>center</aligny>
+                            <align>left</align>
+                            <font>Tiny</font>
+                            <textcolor>Dark2</textcolor>
+                            <label>$INFO[ListItem.Label]</label>
+                        </control>
+                    </itemlayout>
+                    <focusedlayout height="35">
+                        <control type="group">
+                            <visible>!Control.HasFocus(778)</visible>
+                            <control type="label">
+                                <height>100%</height>
+                                <width>600</width>
+                                <aligny>center</aligny>
+                                <align>left</align>
+                                <font>Tiny</font>
+                                <textcolor>Dark2</textcolor>
+                                <label>$INFO[ListItem.Label]</label>
+                            </control>
+                        </control>
+                        <control type="group">
+                            <visible>Control.HasFocus(778)</visible>
+                            <control type="label">
+                                <height>100%</height>
+                                <width>600</width>
+                                <aligny>center</aligny>
+                                <align>left</align>
+                                <font>Tiny</font>
+                                <textcolor>$VAR[ColorHighlight]</textcolor>
+                                <label>$INFO[ListItem.Label]</label>
+                            </control>
+                        </control>
+                    </focusedlayout>
+                    <content>
+                        <item id="1">
+                            <label>$INFO[MusicPlayer.offset(1).Title]$INFO[MusicPlayer.offset(1).Artist, - ,]</label>
+                            <onclick>Playlist.PlayOffset(1)</onclick>
+                            <visible>MusicPlayer.offset(1).Exists</visible>
+                        </item>
+                        <item id="2">
+                            <label>$INFO[MusicPlayer.offset(2).Title]$INFO[MusicPlayer.offset(2).Artist, - ,]</label>
+                            <onclick>Playlist.PlayOffset(2)</onclick>
+                            <visible>MusicPlayer.offset(2).Exists</visible>
+                        </item>
+                        <item id="3">
+                            <label>$INFO[MusicPlayer.offset(3).Title]$INFO[MusicPlayer.offset(3).Artist, - ,]</label>
+                            <onclick>Playlist.PlayOffset(3)</onclick>
+                            <visible>MusicPlayer.offset(3).Exists</visible>
+                        </item>
+                        <item id="4">
+                            <label>$INFO[MusicPlayer.offset(4).Title]$INFO[MusicPlayer.offset(4).Artist, - ,]</label>
+                            <onclick>Playlist.PlayOffset(4)</onclick>
+                            <visible>MusicPlayer.offset(4).Exists</visible>
+                        </item>
+                        <item id="5">
+                            <label>$INFO[MusicPlayer.offset(5).Title]$INFO[MusicPlayer.offset(5).Artist, - ,]</label>
+                            <onclick>Playlist.PlayOffset(5)</onclick>
+                            <visible>MusicPlayer.offset(5).Exists</visible>
+                        </item>
+                    </content>   
+                </control>
+                <control type="button" id="780">
+                    <include>HiddenButton</include>
+                    <onfocus>SetFocus(777)</onfocus>
+                    <include content="OnDirectionAction"><param name="ondirection" value="300" /></include>
+                    <visible allowhiddenfocus="true">false</visible>
+                </control>
             </control>
 
             <!-- Scrolling Text -->
@@ -476,11 +560,11 @@
             <animation type="WindowOpen" reversible="false" condition="$EXP[ExtendedNowPlayingIsVisible]">
                 <effect type="slide" start="-145,0" end="0,0" tween="sine" easing="out" time="600" delay="500"/>
             </animation>
-            <animation type="Conditional" condition="!Control.HasFocus(300) + !Control.HasFocus(302) + !Control.HasFocus(2011) + !ControlGroup(777).HasFocus()" reversible="false">
+            <animation type="Conditional" condition="!Control.HasFocus(300) + !Control.HasFocus(302) + !Control.HasFocus(2011) + !ControlGroup(777).HasFocus() + !Control.HasFocus(778) + !Control.HasFocus(779) + !Control.HasFocus(780)" reversible="false">
                 <effect type="slide" start="0,0" end="-115,0" tween="sine" easing="out" time="300" delay="0"/>
                 <effect type="fade" start="100" end="0" time="150" delay="0"/>
             </animation>
-            <animation type="Conditional" condition="Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011) | ControlGroup(777).HasFocus()" reversible="false">
+            <animation type="Conditional" condition="Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011) | ControlGroup(777).HasFocus() | Control.HasFocus(778) | Control.HasFocus(779) | Control.HasFocus(780)" reversible="false">
                 <effect type="slide" start="-145,0" end="0,0" tween="sine" easing="out" time="600" delay="500"/>
                 <effect type="fade" start="0" end="100" time="1" delay="500"/>
             </animation>

diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
@@ -1083,6 +1083,7 @@
     </include>
 
     <include name="DefControlsHomeUpDown">
+        <onup condition="Skin.HasSetting(home.extended.nowplaying.tracklist) + Integer.IsGreater(Container(778).NumItems,0) + Player.HasAudio">778</onup>
         <onup>301</onup>
         <ondown>300</ondown>
         <onback>300</onback>