music osd lower

jurialmunkey · Jan 2, 2015 · 922e501 · 922e501
1 parent a563e4d
commit 922e501
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 1 deletion.
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
@@ -501,7 +501,27 @@
                 </control>
             </control>
 
-
+            <control type="group" description="InfoBottomMusic">
+                <visible>Window.IsVisible(visualisation) + [[[Window.IsVisible(musicosd) | Player.ShowInfo] + Skin.HasSetting(Vis.ExtraInfo)] | Window.IsVisible(script-cu-lrclyrics-main.xml)]</visible>
+                <control type="image">
+                    <top>16</top>
+                    <left>16</left>
+                    <height>248</height>
+                    <width>248</width>
+                    <texture background="true" fallback="special://skin/extras/icons/film.png">$INFO[Player.Art(thumb)]</texture>
+                    <aspectratio aligny="center" align="center">scale</aspectratio>
+                    <visible>VideoPlayer.Content(livetv) | [IsEmpty(Player.Art(poster)) + IsEmpty(Player.Art(tvshow.poster))]</visible>
+                </control>
+                <control type="grouplist">
+                    <orientation>vertical</orientation>
+                    <usecontrolcoords>true</usecontrolcoords>
+                    <itemgap>10</itemgap>
+                    <top>16</top>
+                    <left>287</left>
+                    <include>DefOSDInfoContentMusic</include>
+                </control>
+            </control>
+
             <control type="progress" id="23">
                 <description>Progress Bar</description>
                 <posy>-16</posy>

diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
@@ -53,6 +53,46 @@
             <visible>!VideoPlayer.Content(livetv)</visible>
         </control>
     </include>
+    <include name="DefOSDInfoContentMusic">
+        <control type="label">
+            <height>50</height>
+            <left>0</left>
+            <right>550</right>
+            <align>left</align>
+            <aligny>center</aligny>
+            <font>Font-Button</font>
+            <label>$INFO[MusicPlayer.Album]$INFO[MusicPlayer.Year,  (,)]</label>
+        </control>
+
+        <control type="label">
+            <height>50</height>
+            <posy>-60</posy>
+            <left>500r</left>
+            <right>16</right>
+            <align>right</align>
+            <aligny>center</aligny>
+            <font>Font-ListInfo-Small</font>
+            <label>$INFO[MusicPlayer.AudioCodec,,  •  ]$VAR[AudioChannelsOSD]</label>
+        </control>
+
+        <control type="textbox">
+            <left>0</left>
+            <right>16</right>
+            <align>justify</align>
+            <aligny>top</aligny>
+            <font>Font-ListInfo</font>
+            <height>120</height>
+            <label>$VAR[MusicOSDPlot]</label>
+            <wrapmultiline>true</wrapmultiline>
+        </control>        
+        <control type="label">
+            <left>0</left>
+            <right>16</right>
+            <align>left</align>
+            <font>Font-ListInfo-Small</font>
+            <label>[B]$LOCALIZE[209]...  [/B]$INFO[MusicPlayer.offset(1).Title]</label>
+        </control>
+    </include>
 
     <include name="50Focus">
         <defaultcontrol always="true">50</defaultcontrol>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -275,6 +275,7 @@
         <value condition="!IsEmpty(Window(Visualisation).Property(ArtistSlideshow.ArtistBiography))">$INFO[Window(Visualisation).Property(ArtistSlideshow.ArtistBiography)]</value>
         <value condition="!IsEmpty(MusicPlayer.Property(Artist_Description))">$INFO[MusicPlayer.Property(Artist_Description)]</value>
         <value condition="!IsEmpty(MusicPlayer.Property(Album_Description))">$INFO[MusicPlayer.Property(Album_Description)]</value>
+        <value>$INFO[MusicPlayer.Position(0).Title,01. ,   ]$INFO[MusicPlayer.Position(0).Duration,(,)]$INFO[MusicPlayer.Position(1).Title,     02. ,   ]$INFO[MusicPlayer.Position(1).Duration,(,)]$INFO[MusicPlayer.Position(2).Title,     03. ,   ]$INFO[MusicPlayer.Position(2).Duration,(,)]$INFO[MusicPlayer.Position(3).Title,     04. ,   ]$INFO[MusicPlayer.Position(3).Duration,(,)]$INFO[MusicPlayer.Position(4).Title,     05. ,   ]$INFO[MusicPlayer.Position(4).Duration,(,)]$INFO[MusicPlayer.Position(5).Title,     06. ,   ]$INFO[MusicPlayer.Position(5).Duration,(,)]$INFO[MusicPlayer.Position(6).Title,     07. ,   ]$INFO[MusicPlayer.Position(6).Duration,(,)]$INFO[MusicPlayer.Position(7).Title,     08. ,   ]$INFO[MusicPlayer.Position(7).Duration,(,)]$INFO[MusicPlayer.Position(8).Title,     09. ,   ]$INFO[MusicPlayer.Position(8).Duration,(,)]$INFO[MusicPlayer.Position(9).Title,     10. ,   ]$INFO[MusicPlayer.Position(9).Duration,(,)]$INFO[MusicPlayer.Position(10).Title,     11. ,   ]$INFO[MusicPlayer.Position(10).Duration,(,)]$INFO[MusicPlayer.Position(11).Title,     12. ,   ]$INFO[MusicPlayer.Position(11).Duration,(,)]$INFO[MusicPlayer.Position(12).Title,     13. ,   ]$INFO[MusicPlayer.Position(12).Duration,(,)]$INFO[MusicPlayer.Position(13).Title,     14. ,   ]$INFO[MusicPlayer.Position(13).Duration,(,)]$INFO[MusicPlayer.Position(14).Title,     15. ,   ]$INFO[MusicPlayer.Position(14).Duration,(,)]$INFO[MusicPlayer.Position(15).Title,     16. ,   ]$INFO[MusicPlayer.Position(15).Duration,(,)]$INFO[MusicPlayer.Position(16).Title,     17. ,   ]$INFO[MusicPlayer.Position(16).Duration,(,)]$INFO[MusicPlayer.Position(17).Title,     18. ,   ]$INFO[MusicPlayer.Position(17).Duration,(,)]$INFO[MusicPlayer.Position(18).Title,     19. ,   ]$INFO[MusicPlayer.Position(18).Duration,(,)]$INFO[MusicPlayer.Position(19).Title,     20. ,   ]$INFO[MusicPlayer.Position(19).Duration,(,)]</value>
         <value>$INFO[MusicPlayer.Position(0).Title,01. ,   ]$INFO[MusicPlayer.Position(0).Duration,(,)]$INFO[MusicPlayer.Position(1).Title,[CR]02. ,   ]$INFO[MusicPlayer.Position(1).Duration,(,)]$INFO[MusicPlayer.Position(2).Title,[CR]03. ,   ]$INFO[MusicPlayer.Position(2).Duration,(,)]$INFO[MusicPlayer.Position(3).Title,[CR]04. ,   ]$INFO[MusicPlayer.Position(3).Duration,(,)]$INFO[MusicPlayer.Position(4).Title,[CR]05. ,   ]$INFO[MusicPlayer.Position(4).Duration,(,)]$INFO[MusicPlayer.Position(5).Title,[CR]06. ,   ]$INFO[MusicPlayer.Position(5).Duration,(,)]$INFO[MusicPlayer.Position(6).Title,[CR]07. ,   ]$INFO[MusicPlayer.Position(6).Duration,(,)]$INFO[MusicPlayer.Position(7).Title,[CR]08. ,   ]$INFO[MusicPlayer.Position(7).Duration,(,)]$INFO[MusicPlayer.Position(8).Title,[CR]09. ,   ]$INFO[MusicPlayer.Position(8).Duration,(,)]$INFO[MusicPlayer.Position(9).Title,[CR]10. ,   ]$INFO[MusicPlayer.Position(9).Duration,(,)]$INFO[MusicPlayer.Position(10).Title,[CR]11. ,   ]$INFO[MusicPlayer.Position(10).Duration,(,)]$INFO[MusicPlayer.Position(11).Title,[CR]12. ,   ]$INFO[MusicPlayer.Position(11).Duration,(,)]$INFO[MusicPlayer.Position(12).Title,[CR]13. ,   ]$INFO[MusicPlayer.Position(12).Duration,(,)]$INFO[MusicPlayer.Position(13).Title,[CR]14. ,   ]$INFO[MusicPlayer.Position(13).Duration,(,)]$INFO[MusicPlayer.Position(14).Title,[CR]15. ,   ]$INFO[MusicPlayer.Position(14).Duration,(,)]$INFO[MusicPlayer.Position(15).Title,[CR]16. ,   ]$INFO[MusicPlayer.Position(15).Duration,(,)]$INFO[MusicPlayer.Position(16).Title,[CR]17. ,   ]$INFO[MusicPlayer.Position(16).Duration,(,)]$INFO[MusicPlayer.Position(17).Title,[CR]18. ,   ]$INFO[MusicPlayer.Position(17).Duration,(,)]$INFO[MusicPlayer.Position(18).Title,[CR]19. ,   ]$INFO[MusicPlayer.Position(18).Duration,(,)]$INFO[MusicPlayer.Position(19).Title,[CR]20. ,   ]$INFO[MusicPlayer.Position(19).Duration,(,)]</value>
     </variable>
 

diff --git a/changelog.txt b/changelog.txt
@@ -3,6 +3,7 @@ Kaitoast changes
 Fix lyrics window
 Fix pvr hub back functions
 Fix watched indicators vars
+Music osd lower
 
 [B]1.1.7[/B]
 Fully Customisable Hubs for Movies, TvShows and Music (resets previous customisations)