From 05ecab0478e39b8c355c37d72048b937ee8c9f1a Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Sat, 25 Mar 2017 13:14:51 +0000
Subject: [PATCH] Tweaks to music playlist

---
 1080i/Includes.xml           |   2 +
 1080i/MyPlaylist.xml         |   2 +-
 1080i/View_MusicPlaylist.xml | 176 ++++++++++++++++++++++-------------
 changelog.txt                |   1 +
 4 files changed, 116 insertions(+), 65 deletions(-)

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 27a6ef5..c8ce915 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -33,6 +33,8 @@
     <expression name="isEpisode">container.content(episodes) + !Substring(Container.folderpath,plugin)</expression>
     <expression name="isMusicVideo">container.content(musicvideos) + !Substring(Container.folderpath,plugin)</expression>
 
+    <expression name="isMusicPlaylist">container.content(playlists) + !Substring(Container.folderpath,plugin)</expression>
+
     <!--item fanart-->
     <include name="itemFanart">
         <control type="wraplist" id="99999">
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index 9ef170f..9856871 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -51,7 +51,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>12-col</width>
-                    <height>1-row</height>
+                    <height>2-row</height>
                     <itemgap>0</itemgap>
                     <orientation>horizontal</orientation>
                     <control type="label">
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
index 37db248..27fb26d 100644
--- a/1080i/View_MusicPlaylist.xml
+++ b/1080i/View_MusicPlaylist.xml
@@ -6,7 +6,7 @@
             <control type="panel" id="59">
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
-                <width>24-col</width>
+                <width>15-col</width>
                 <height>23-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
@@ -15,21 +15,12 @@
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="sine" easing="inout">200</scrolltime>
-                <itemlayout width="24-col" height="2-row">
+                <itemlayout width="15-col" height="90">
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>21-col-indent</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>1599</posx>
-                        <posy>0</posy>
-                        <width>2-col</width>
-                        <height>69</height>
+                        <width>14-col</width>
+                        <height>87</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
                         <colordiffuse>overlay</colordiffuse>
@@ -37,7 +28,7 @@
                     <control type="image">
                         <visible>ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi</visible>
                         <posx>12</posx>
-                        <posy>0</posy>
+                        <posy>12</posy>
                         <width>1-col-gutter</width>
                         <height>1-col-gutter</height>
                         <texture>equaliser.gif</texture>
@@ -60,7 +51,7 @@
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col-textbox</width>
-                        <height>2-row</height>
+                        <height>90</height>
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>symbolLarge</font>
@@ -71,7 +62,7 @@
                     <control type="image">
                         <visible>!ListItem.IsPlaying</visible>
                         <posx>0</posx>
-                        <posy>3</posy>
+                        <posy>12</posy>
                         <width>66</width>
                         <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
@@ -79,20 +70,42 @@
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
-                        <posy>0</posy>
-                        <width>11-col-gutter</width>
+                        <posy>-8</posy>
+                        <width>6-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>[B]$INFO[ListItem.Artist][/B]  $INFO[ListItem.Title]</label>
+                        <label>$INFO[ListItem.Title]</label>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>26</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>smallStrong</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]</label>
+                    </control>
+                    <control type="label">
+                        <posx>15-col</posx>
+                        <posy>0</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label></label>
                     </control>
                     <control type="label">
                         <right>24</right>
                         <posy>0</posy>
                         <width>3-col-gutter</width>
-                        <height>2-row</height>
+                        <height>87</height>
                         <aligny>center</aligny>
                         <align>right</align>
                         <font>itemTitle</font>
@@ -100,34 +113,13 @@
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[listitem.duration]</label>
                     </control>
-                    <control type="label">
-                        <right>2-col</right>
-                        <posy>0</posy>
-                        <width>8-col-gutter</width>
-                        <height>2-row</height>
-                        <align>right</align>
-                        <aligny>center</aligny>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Album] $INFO[listItem.year,(,)]</label>
-                    </control>
                 </itemlayout>
-                <focusedlayout width="24-col" height="2-row">
+                <focusedlayout width="15-col" height="90">
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>21-col-indent</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>1599</posx>
-                        <posy>0</posy>
-                        <width>2-col</width>
-                        <height>69</height>
+                        <width>14-col</width>
+                        <height>87</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
                         <colordiffuse>highlight</colordiffuse>
@@ -135,7 +127,7 @@
                     <control type="image">
                         <visible>ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi</visible>
                         <posx>12</posx>
-                        <posy>0</posy>
+                        <posy>12</posy>
                         <width>1-col-gutter</width>
                         <height>1-col-gutter</height>
                         <texture>equaliser.gif</texture>
@@ -149,7 +141,7 @@
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col-textbox</width>
-                        <height>2-row</height>
+                        <height>90</height>
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>symbolLarge</font>
@@ -166,7 +158,7 @@
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col-textbox</width>
-                        <height>2-row</height>
+                        <height>90</height>
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>symbolLarge</font>
@@ -181,7 +173,7 @@
                     <control type="image">
                         <visible>!ListItem.IsPlaying</visible>
                         <posx>0</posx>
-                        <posy>3</posy>
+                        <posy>12</posy>
                         <width>66</width>
                         <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
@@ -193,20 +185,42 @@
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
-                        <posy>0</posy>
-                        <width>11-col-gutter</width>
+                        <posy>-8</posy>
+                        <width>6-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>[B]$INFO[ListItem.Artist][/B]  $INFO[ListItem.Title]</label>
+                        <label>$INFO[ListItem.Title]</label>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>26</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>smallStrong</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]</label>
+                    </control>
+                    <control type="label">
+                        <posx>15-col</posx>
+                        <posy>0</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label></label>
                     </control>
                     <control type="label">
                         <right>24</right>
                         <posy>0</posy>
                         <width>3-col-gutter</width>
-                        <height>2-row</height>
+                        <height>87</height>
                         <aligny>center</aligny>
                         <align>right</align>
                         <font>itemTitle</font>
@@ -214,20 +228,54 @@
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[listitem.duration]</label>
                     </control>
-                    <control type="label">
-                        <right>2-col</right>
-                        <posy>0</posy>
-                        <width>8-col-gutter</width>
-                        <height>2-row</height>
-                        <align>right</align>
-                        <aligny>center</aligny>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Album] $INFO[listItem.year,(,)]</label>
-                    </control>
                 </focusedlayout>
             </control>
         </control>
+        <!--coverart selection-->
+        <control type="group">
+            <posx>col-17-begin</posx>
+            <posy>row-5-begin</posy>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>4-col</width>
+                <height>4-col</height>
+                <aspectratio>stretch</aspectratio>
+                <texture border="0">$INFO[container(59).listitemAbsolute(2).art(thumb)]</texture>
+            </control>
+            <control type="image">
+                <posx>4-col</posx>
+                <posy>0</posy>
+                <width>4-col</width>
+                <height>4-col</height>
+                <aspectratio>stretch</aspectratio>
+                <texture border="0">$INFO[container(59).listitemAbsolute(4).art(thumb)]</texture>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>4-col</posy>
+                <width>4-col</width>
+                <height>4-col</height>
+                <aspectratio>stretch</aspectratio>
+                <texture border="0">$INFO[container(59).listitemAbsolute(6).art(thumb)]</texture>
+            </control>
+            <control type="image">
+                <posx>4-col</posx>
+                <posy>4-col</posy>
+                <width>4-col</width>
+                <height>4-col</height>
+                <aspectratio>stretch</aspectratio>
+                <texture border="0">$INFO[container(59).listitemAbsolute(8).art(thumb)]</texture>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>8-col</width>
+                <height>8-col</height>
+                <texture>vignette.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+        </control>
     </include>
 </includes>
diff --git a/changelog.txt b/changelog.txt
index 08c9685..956c478 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,7 @@
 **Changelog**
 
 [PLANNED WORKS]
+- Improve playlist display in music view (rework as per video)
 
 [V1.2.0]
 - [NEW] Extended fanart support for video info and seasons (active by default)