confluence: use Player.Title instead of (Music/Video)Player.Title

This label is generic and support non video/audio players as well

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 1eb6bd6..005070f 100644 (file)
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -63,7 +63,7 @@
                                <posy>285</posy>
                                <height>30</height>
                                <width>1000</width>
-                               <label>$INFO[MusicPlayer.Title]</label>
+                               <label>$INFO[Player.Title]</label>
                                <align>left</align>
                                <aligny>center</aligny>
                                <font>font13_title</font>
@@ -254,7 +254,7 @@
                                        <posy>285</posy>
                                        <height>30</height>
                                        <width>1000</width>
-                                       <label>$INFO[VideoPlayer.Title]</label>
+                                       <label>$INFO[Player.Title]</label>
                                        <align>left</align>
                                        <aligny>center</aligny>
                                        <font>font13_title</font>
@@ -307,7 +307,7 @@
                                        <posy>285</posy>
                                        <height>30</height>
                                        <width>1000</width>
-                                       <label>$INFO[VideoPlayer.Title]</label>
+                                       <label>$INFO[Player.Title]</label>
                                        <align>left</align>
                                        <aligny>center</aligny>
                                        <font>font13_title</font>
@@ -360,7 +360,7 @@
                                        <posy>285</posy>
                                        <height>30</height>
                                        <width>1000</width>
-                                       <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
+                                       <label>$INFO[Player.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
                                        <align>left</align>
                                        <aligny>center</aligny>
                                        <font>font13_title</font>
@@ -413,7 +413,7 @@
                                        <posy>285</posy>
                                        <height>30</height>
                                        <width>1000</width>
-                                       <label>$INFO[VideoPlayer.Title]</label>
+                                       <label>$INFO[Player.Title]</label>
                                        <align>left</align>
                                        <aligny>center</aligny>
                                        <font>font13_title</font>

diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index fa9f9da..b3c1497 100644 (file)
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -133,7 +133,7 @@
                                                <font>font30</font>
                                                <align>left</align>
                                                <aligny>center</aligny>
-                                               <label>$INFO[MusicPlayer.Title]</label>
+                                               <label>$INFO[Player.Title]</label>
                                                <textcolor>orange</textcolor>
                                                <scroll>true</scroll>
                                        </control>

diff --git a/addons/skin.confluence/720p/MyPVR.xml b/addons/skin.confluence/720p/MyPVR.xml
index 68cabee..0c53e84 100644 (file)
--- a/addons/skin.confluence/720p/MyPVR.xml
+++ b/addons/skin.confluence/720p/MyPVR.xml
@@ -93,7 +93,7 @@
                                <textcolor>grey2</textcolor>
                                <align>center</align>
                                <aligny>center</aligny>
-                               <label>$INFO[VideoPlayer.Title]</label>
+                               <label>$INFO[Player.Title]</label>
                                <visible>Player.HasVideo</visible>
                        </control>
                        <!-- control type="visualisation">

diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml
index 1d3bd21..43cf714 100644 (file)
--- a/addons/skin.confluence/720p/VideoFullScreen.xml
+++ b/addons/skin.confluence/720p/VideoFullScreen.xml
@@ -190,7 +190,7 @@
                                                <font>font30</font>
                                                <align>left</align>
                                                <aligny>center</aligny>
-                                               <label>$INFO[VideoPlayer.Title]</label>
+                                               <label>$INFO[Player.Title]</label>
                                                <textcolor>orange</textcolor>
                                                <scroll>true</scroll>
                                        </control>

diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index 8a864dd..0d0b4e6 100644 (file)
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -253,7 +253,7 @@
                                <posy>53r</posy>
                                <width>700</width>
                                <height>20</height>
-                               <label>$INFO[MusicPlayer.Title]$INFO[VideoPlayer.Title] - ([COLOR=blue]$INFO[Player.Time] / $INFO[Player.Duration,][/COLOR])</label>
+                               <label>$INFO[Player.Title] - ([COLOR=blue]$INFO[Player.Time] / $INFO[Player.Duration,][/COLOR])</label>
                                <align>left</align>
                                <aligny>center</aligny>
                                <font>font12</font>
@@ -397,7 +397,7 @@
                        <posy>43</posy>
                        <height>30</height>
                        <width>325</width>
-                       <label>$INFO[MusicPlayer.Title]</label>
+                       <label>$INFO[Player.Title]</label>
                        <align>left</align>
                        <aligny>center</aligny>
                        <font>font13_title</font>
@@ -515,7 +515,7 @@
                        <posy>43</posy>
                        <height>30</height>
                        <width>325</width>
-                       <label>$INFO[VideoPlayer.Title]</label>
+                       <label>$INFO[Player.Title]</label>
                        <align>left</align>
                        <aligny>center</aligny>
                        <font>font13_title</font>