From a10fc16eb7de5a0549ede1edd219fdc67b79a555 Mon Sep 17 00:00:00 2001
From: chrisbevan <chrisbevan@Chriss-iMac.local>
Date: Sun, 31 Jul 2016 17:54:14 +0100
Subject: [PATCH] Bug fixes from Jarvis

---
 1080i/Includes_homeBackground.xml |  7 +++++--
 1080i/MyPVRChannels.xml           | 24 ++++++++++++++++++++++
 1080i/View_MusicPlaylist.xml      | 34 +++++++++++++++++++++++++++++--
 1080i/View_Songs.xml              | 30 +++++++++++++++++++++++++--
 1080i/custom_musicOverlay.xml     | 15 +++++++++++++-
 addon.xml                         |  2 +-
 changelog.txt                     |  4 ++++
 7 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/1080i/Includes_homeBackground.xml b/1080i/Includes_homeBackground.xml
index f26b23f..b394e6b 100644
--- a/1080i/Includes_homeBackground.xml
+++ b/1080i/Includes_homeBackground.xml
@@ -2,12 +2,15 @@
 <includes>
     <include name="homeBackground">
         <control type="group">
-            <animation type="conditional" condition="true" loop="true">
+            <animation type="conditional" condition="!Skin.HasSetting(lowPowerMode)" loop="true">
                 <effect type="fade" start="0" end="100" time="5000"/>
                 <effect type="zoom" start="80" end="130" time="10000" tween="sine" easing="out"/>
                 <effect type="slide" start="0,0" end="-450,0" center="0" delay="0" time="20000" tween="sine" easing="in"/>
                 <effect type="zoom" start="130" end="100" delay="12000" time="8000" tween="sine" easing="in"/>
                 <effect type="fade" start="100" end="0" time="3000" delay="16000"/>
+            </animation>
+			<animation type="conditional" condition="Skin.HasSetting(lowPowerMode)">
+                <effect type="fade" start="0" end="100" time="5000"/>
             </animation>
             <!--library based thumbs-->
             <control type="panel" id="9451">
@@ -127,7 +130,7 @@
             </control>
             <!--settings-->
             <control type="image">
-                <visible>Container(9000).HasFocus(7)</visible>
+                <visible>Container(9000).HasFocus(7) | Container(9000).HasFocus(11)</visible>
                 <include>dimensionsFullscreen</include>
                 <texture>special://skin/extras/backgrounds/settings.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 1c97c70..eaf0968 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -76,6 +76,30 @@
 
             <!--dateTime-->
             <include>dateTime</include>
+
+			<!--mini player window-->
+			<control type="group">
+				<visible>Player.HasVideo</visible>
+				<posx>col-20-begin</posx>
+				<posy>row-22-begin</posy>
+				<control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>444</width>
+                    <height>255</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture>colors/black.png</texture>
+					<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                    <bordersize>6</bordersize>
+                    <colordiffuse>overlay</colordiffuse>
+                </control>
+				<control type="videowindow">
+					<posx>6</posx>
+					<posy>6</posy>
+					<width>6-col</width>
+					<height>243</height>
+				</control>
+			</control>
         </control>
 
         <!--hub menu-->
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
index 87a841c..37db248 100644
--- a/1080i/View_MusicPlaylist.xml
+++ b/1080i/View_MusicPlaylist.xml
@@ -35,13 +35,26 @@
                         <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="image">
-                        <visible>ListItem.IsPlaying + !player.paused</visible>
+                        <visible>ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi</visible>
                         <posx>12</posx>
                         <posy>0</posy>
                         <width>1-col-gutter</width>
                         <height>1-col-gutter</height>
                         <texture>equaliser.gif</texture>
                     </control>
+                    <control type="label">
+                        <visible>ListItem.IsPlaying + !player.paused + System.Platform.Linux.RaspberryPi</visible>
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>symbolLarge</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label></label>
+                    </control>
                     <control type="label">
                         <visible>ListItem.IsPlaying + player.paused</visible>
                         <posx>0</posx>
@@ -120,7 +133,7 @@
                         <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="image">
-                        <visible>ListItem.IsPlaying + !player.paused</visible>
+                        <visible>ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi</visible>
                         <posx>12</posx>
                         <posy>0</posy>
                         <width>1-col-gutter</width>
@@ -131,6 +144,23 @@
                             <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
                         </animation>
                     </control>
+                    <control type="label">
+                        <visible>ListItem.IsPlaying + !player.paused + System.Platform.Linux.RaspberryPi</visible>
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>symbolLarge</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label></label>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="fade" time="500"/>
+                            <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                        </animation>
+                    </control>
                     <control type="label">
                         <visible>ListItem.IsPlaying + player.paused</visible>
                         <posx>0</posx>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index bf6dea6..865b185 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -87,13 +87,26 @@
                     <colordiffuse>textboxInactive</colordiffuse>
                 </control>
                 <control type="image">
-                    <visible>ListItem.IsPlaying + !player.paused</visible>
+                    <visible>ListItem.IsPlaying + !player.paused  + !System.Platform.Linux.RaspberryPi</visible>
                     <posx>12</posx>
                     <posy>0</posy>
                     <width>1-col-gutter</width>
                     <height>1-col-gutter</height>
                     <texture>equaliser.gif</texture>
                 </control>
+                <control type="label">
+                    <visible>ListItem.IsPlaying + !player.paused  + System.Platform.Linux.RaspberryPi</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>1-col-textbox</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>symbolLarge</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label></label>
+                </control>
                 <control type="label">
                     <visible>ListItem.IsPlaying + player.paused</visible>
                     <posx>0</posx>
@@ -189,13 +202,26 @@
                     <include>spinFocusIcon</include>
                 </control>
                 <control type="image">
-                    <visible>ListItem.IsPlaying + !player.paused</visible>
+                    <visible>ListItem.IsPlaying + !player.paused  + !System.Platform.Linux.RaspberryPi</visible>
                     <posx>12</posx>
                     <posy>0</posy>
                     <width>1-col-gutter</width>
                     <height>1-col-gutter</height>
                     <texture>equaliser.gif</texture>
                 </control>
+                <control type="label">
+                    <visible>ListItem.IsPlaying + !player.paused  + System.Platform.Linux.RaspberryPi</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>1-col-textbox</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>symbolLarge</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label></label>
+                </control>
                 <control type="label">
                     <visible>ListItem.IsPlaying + player.paused</visible>
                     <posx>0</posx>
diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml
index 1d9ab43..1ddc1d6 100644
--- a/1080i/custom_musicOverlay.xml
+++ b/1080i/custom_musicOverlay.xml
@@ -19,13 +19,26 @@
                 <colordiffuse>highlight</colordiffuse>
             </control>
             <control type="image">
-                <visible>!player.paused</visible>
+                <visible>!player.paused + !System.Platform.Linux.RaspberryPi</visible>
                 <posx>12</posx>
                 <posy>0</posy>
                 <width>1-col-gutter</width>
                 <height>1-col-gutter</height>
                 <texture>equaliser.gif</texture>
             </control>
+            <control type="label">
+                <visible>!player.paused + System.Platform.Linux.RaspberryPi</visible>
+                <posx>3</posx>
+                <posy>0</posy>
+                <width>1-col-textbox</width>
+                <height>2-row</height>
+                <align>center</align>
+                <aligny>center</aligny>
+                <font>symbolLarge</font>
+                <textcolor>textActive</textcolor>
+                <shadowcolor>-</shadowcolor>
+                <label></label>
+            </control>
             <control type="label">
                 <visible>player.paused</visible>
                 <posx>3</posx>
diff --git a/addon.xml b/addon.xml
index 317b107..7fc43e0 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="1.1.0" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="1.1.1" name="Pellucid" provider-name="theDeadman">
     <requires>
         <import addon="xbmc.gui" version="5.12.0"/>
         <import addon="script.skin.helper.service" version="1.0.0"/>
diff --git a/changelog.txt b/changelog.txt
index d241711..4bf443f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+[B]1.1.1[/B]
+
+- [NEW] RPI bugfixes from Jarvis branch
+
 [B]1.1.0[/B]
 
 ***Preparing for Krypton***