[confluence] Add PVR related parts to music OSD

2 files changed, 368 insertions, 6 deletions

diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml
index ce6f4e5884..49c0aa2a92 100644
--- a/addons/skin.confluence/720p/MusicOSD.xml
+++ b/addons/skin.confluence/720p/MusicOSD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol always="true">602</defaultcontrol>
+	<defaultcontrol always="true">100</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
 		<system>1</system>
@@ -25,7 +25,7 @@
 			<onup>100</onup>
 			<ondown>100</ondown>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
 		</control>
 		<control type="slider" id="87">
 			<description>Seek Slider</description>
@@ -40,7 +40,7 @@
 			<textureslidernib>osd_slider_nibNF.png</textureslidernib>
 			<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
 		</control>
 		<control type="grouplist" id="100">
 			<left>325</left>
@@ -50,7 +50,27 @@
 			<orientation>horizontal</orientation>
 			<itemgap>0</itemgap>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
+			<control type="button" id="300">
+				<width>55</width>
+				<height>55</height>
+				<label>210</label>
+				<font>-</font>
+				<texturefocus>OSDChannelUPFO.png</texturefocus>
+				<texturenofocus>OSDChannelUPNF.png</texturenofocus>
+				<onclick>PlayerControl(Previous)</onclick>
+				<visible>MusicPlayer.Content(LiveTV)</visible>
+			</control>
+			<control type="button" id="301">
+				<width>55</width>
+				<height>55</height>
+				<label>209</label>
+				<font>-</font>
+				<texturefocus>OSDChannelDownFO.png</texturefocus>
+				<texturenofocus>OSDChannelDownNF.png</texturenofocus>
+				<onclick>PlayerControl(Next)</onclick>
+				<visible>MusicPlayer.Content(LiveTV)</visible>
+			</control>
 			<control type="button" id="600">
 				<width>55</width>
 				<height>55</height>
@@ -59,6 +79,7 @@
 				<texturefocus>OSDPrevTrackFO.png</texturefocus>
 				<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 				<onclick>PlayerControl(Previous)</onclick>
+				<visible>!MusicPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="button" id="601">
 				<width>55</width>
@@ -67,7 +88,9 @@
 				<font>-</font>
 				<texturefocus>OSDRewindFO.png</texturefocus>
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
+				<animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation>
 				<onclick>PlayerControl(Rewind)</onclick>
+				<enable>Player.SeekEnabled</enable>
 			</control>
 			<control type="togglebutton" id="602">
 				<width>55</width>
@@ -80,7 +103,9 @@
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
 				<alttexturefocus>OSDPlayFO.png</alttexturefocus>
 				<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
+				<animation effect="fade" start="100" end="50" time="100" condition="!Player.PauseEnabled">Conditional</animation>
 				<onclick>PlayerControl(Play)</onclick>
+				<enable>Player.PauseEnabled</enable>
 			</control>
 			<control type="button" id="603">
 				<width>55</width>
@@ -98,7 +123,9 @@
 				<font>-</font>
 				<texturefocus>OSDForwardFO.png</texturefocus>
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
+				<animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation>
 				<onclick>PlayerControl(Forward)</onclick>
+				<enable>Player.SeekEnabled</enable>
 			</control>
 			<control type="button" id="605">
 				<width>55</width>
@@ -107,11 +134,33 @@
 				<font>-</font>
 				<texturefocus>OSDNextTrackFO.png</texturefocus>
 				<texturenofocus>OSDNextTrackNF.png</texturenofocus>
+				<visible>!MusicPlayer.Content(LiveTV)</visible>
 				<onclick>PlayerControl(Next)</onclick>
 			</control>
+			<control type="button" id="306">
+				<width>55</width>
+				<height>55</height>
+				<label>19019</label>
+				<font>-</font>
+				<texturefocus>OSDChannelListFO.png</texturefocus>
+				<texturenofocus>OSDChannelListNF.png</texturenofocus>
+				<onclick>ActivateWindow(PVROSDChannels)</onclick>
+				<visible>MusicPlayer.Content(LiveTV)</visible>
+			</control>
+			<control type="button" id="307">
+				<width>55</width>
+				<height>55</height>
+				<label>$LOCALIZE[19029]$INFO[MusicPlayer.ChannelName, - ]</label>
+				<font>-</font>
+				<texturefocus>OSDepgFO.png</texturefocus>
+				<texturenofocus>OSDepgNF.png</texturenofocus>
+				<onclick>ActivateWindow(PVROSDGuide)</onclick>
+				<visible>MusicPlayer.Content(LiveTV)</visible>
+			</control>
 			<control type="group" id="699">
 				<width>55</width>
 				<height>55</height>
+				<visible>!MusicPlayer.Content(LiveTV)</visible>
 				<control type="button" id="606">
 					<left>0</left>
 					<top>0</top>
@@ -192,12 +241,19 @@
 				<usealttexture>Playlist.IsRandom</usealttexture>
 				<alttexturefocus>OSDRandomOnFO.png</alttexturefocus>
 				<alttexturenofocus>OSDRandomOnNF.png</alttexturenofocus>
+				<visible>!MusicPlayer.Content(LiveTV)</visible>
 				<onclick>PlayerControl(Random)</onclick>
 			</control>
 			<control type="image" id="2300">
 				<width>215</width>
 				<height>55</height>
 				<texture>-</texture>
+				<visible>!MusicPlayer.Content(LiveTV)</visible>
+			</control>
+			<control type="image" id="2400">
+				<width>270</width>
+				<texture>-</texture>
+				<visible>MusicPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="togglebutton" id="701">
 				<width>55</width>
@@ -214,6 +270,7 @@
 				<altclick>Close</altclick>
 				<altclick>RunScript($INFO[Skin.String(LyricScript_Path)])</altclick>
 				<usealttexture>IsEmpty(Skin.String(LyricScript_Path))</usealttexture>
+				<visible>!MusicPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="button" id="500">
 				<width>55</width>
diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index 02dede396f..872b6e6140 100644
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -25,7 +25,7 @@
 		<!-- media infos -->
 		<control type="group">
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
 			<control type="image">
 				<left>0</left>
 				<top>-150</top>
@@ -221,7 +221,7 @@
 		<control type="group" id="0">
 			<left>0</left>
 			<top>50</top>
-			<visible>Player.ShowCodec + ![Window.IsVisible(script-cu-lrclyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<visible>Player.ShowCodec + ![Window.IsVisible(script-cu-lrclyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
 			<animation effect="fade" time="200">VisibleChange</animation>
 			<control type="image">
 				<description>media info background image</description>
@@ -270,6 +270,311 @@
 				<label>$INFO[Visualisation.Preset,$LOCALIZE[13388]: ]</label>
 				<font>font12</font>
 			</control>
+			<control type="group">
+				<visible>Player.ShowCodec + MusicPlayer.Content(LiveTV) + system.getbool(pvrplayback.signalquality)</visible>
+				<top>185</top>
+				<control type="image">
+					<description>media info background image</description>
+					<left>0</left>
+					<top>0</top>
+					<width>1280</width>
+					<height>220</height>
+					<texture>black-back.png</texture>
+				</control>
+				<control type="label">
+					<description>Header</description>
+					<left>50</left>
+					<top>5</top>
+					<width>1200</width>
+					<height>25</height>
+					<label>$LOCALIZE[19005]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13_title</font>
+					<textcolor>blue</textcolor>
+				</control>
+				<control type="label">
+					<description>Backend</description>
+					<left>50</left>
+					<top>40</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19012]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Backend value</description>
+					<left>220</left>
+					<top>40</top>
+					<width>1000</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamClient]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Device</description>
+					<left>50</left>
+					<top>65</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19006]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Device value</description>
+					<left>220</left>
+					<top>65</top>
+					<width>1000</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamDevice]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Status</description>
+					<left>50</left>
+					<top>90</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19007]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Status value</description>
+					<left>220</left>
+					<top>90</top>
+					<width>1000</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamStatus]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Signal</description>
+					<left>50</left>
+					<top>115</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19008]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="progress">
+					<description>Progressbar</description>
+					<left>220</left>
+					<top>122</top>
+					<width>910</width>
+					<height>14</height>
+					<info>PVR.ActStreamProgrSignal</info>
+				</control>
+				<control type="label">
+					<description>Signal value</description>
+					<left>1200</left>
+					<top>115</top>
+					<width>180</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamSignal]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>SNR</description>
+					<left>50</left>
+					<top>140</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19009]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="progress">
+					<description>Progressbar</description>
+					<left>220</left>
+					<top>147</top>
+					<width>910</width>
+					<height>14</height>
+					<overlaytexture>-</overlaytexture>
+					<info>PVR.ActStreamProgrSNR</info>
+				</control>
+				<control type="label">
+					<description>SNR value</description>
+					<left>1200</left>
+					<top>140</top>
+					<width>180</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamSNR]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>BER</description>
+					<left>50</left>
+					<top>165</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19010]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>BER value</description>
+					<left>220</left>
+					<top>165</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamBER]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>UNC</description>
+					<left>390</left>
+					<top>165</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19011]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>UNC value</description>
+					<left>560</left>
+					<top>165</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamUNC]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Service</description>
+					<left>730</left>
+					<top>165</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19099]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Service value</description>
+					<left>900</left>
+					<top>165</top>
+					<width>330</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamServiceName]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Encryption</description>
+					<left>50</left>
+					<top>190</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19015]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Encryption value</description>
+					<left>220</left>
+					<top>190</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamEncryptionName]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Provider</description>
+					<left>390</left>
+					<top>190</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19101]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Provider value</description>
+					<left>560</left>
+					<top>190</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamProviderName]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+				<control type="label">
+					<description>Mux</description>
+					<left>730</left>
+					<top>190</top>
+					<width>165</width>
+					<height>25</height>
+					<label>$LOCALIZE[19100]:</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+				</control>
+				<control type="label">
+					<description>Mux value</description>
+					<left>900</left>
+					<top>190</top>
+					<width>330</width>
+					<height>25</height>
+					<label>$INFO[PVR.ActStreamMux]</label>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+				</control>
+			</control>
 		</control>
 	</controls>
 </window>