diff options
| author | Joakim Plate <elupus@ecce.se> | 2013-02-03 06:20:36 -0800 |
|---|---|---|
| committer | Joakim Plate <elupus@ecce.se> | 2013-02-03 06:20:36 -0800 |
| commit | 3cbd8e71219dd96f84382e300cb71a55641d4952 (patch) | |
| tree | f693b04b72cca2a258b1eac2bc6e7094591fb439 /addons | |
| parent | f78ea47916c540798e3359e41e2f59430a14b6f1 (diff) | |
| parent | cb4d005258635d70664588dca69a7d89597a2190 (diff) | |
Merge pull request #1597 from elupus/upnp-player
Support controlling external xbmc/upnp instance over UPnP
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/Home.xml | 10 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/MusicVisualisation.xml | 2 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/MyPVR.xml | 2 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/VideoFullScreen.xml | 2 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/includes.xml | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 3184ae8e9a..c80a8dfeee 100644 --- 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 fa9f9da03a..b3c149784c 100644 --- 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 68cabee738..0c53e84d11 100644 --- 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 1d3bd216c6..43cf7144fb 100644 --- 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 8a864dde5d..d886a0bd1c 100644 --- 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> @@ -588,7 +588,7 @@ <textcolor>blue</textcolor> <align>center</align> <aligny>center</aligny> - <visible>[Player.HasAudio | Player.HasVideo]</visible> + <visible>Player.HasMedia</visible> <include>VisibleFadeEffect</include> </control> <control type="button" id="610"> @@ -681,7 +681,7 @@ </control> </control> <control type="group" id="9005"> - <visible>[Player.HasAudio | Player.HasVideo]</visible> + <visible>Player.HasMedia</visible> <visible>!VideoPlayer.Content(LiveTV)</visible> <include>VisibleFadeEffect</include> <width>250</width> |