[estouchy] player process info

4 files changed, 259 insertions, 5 deletions

diff --git a/addons/skin.estouchy/language/resource.language.en_gb/strings.po b/addons/skin.estouchy/language/resource.language.en_gb/strings.po
index d049b46c5f..cf097d4531 100644
--- a/addons/skin.estouchy/language/resource.language.en_gb/strings.po
+++ b/addons/skin.estouchy/language/resource.language.en_gb/strings.po
@@ -68,7 +68,27 @@ msgctxt "#31016"
 msgid "Albums"
 msgstr ""
 
-#empty strings from id 31017 to 31023
+msgctxt "#31017"
+msgid "PVR info"
+msgstr ""
+
+msgctxt "#31018"
+msgid "Player process info"
+msgstr ""
+
+msgctxt "#31019"
+msgid "Video decoder"
+msgstr ""
+
+msgctxt "#31020"
+msgid "Pixel format"
+msgstr ""
+
+msgctxt "#31021"
+msgid "System memory usage"
+msgstr ""
+
+#empty strings from id 31022 to 31023
 
 msgctxt "#31024"
 msgid "Page"
diff --git a/addons/skin.estouchy/xml/DialogPlayerProcessInfo.xml b/addons/skin.estouchy/xml/DialogPlayerProcessInfo.xml
new file mode 100644
index 0000000000..fe72d2d7c0
--- /dev/null
+++ b/addons/skin.estouchy/xml/DialogPlayerProcessInfo.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<animation effect="fade" start="0" end="100" time="300">WindowOpen</animation>
+	<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+	<include>16x9_xPos_Relocation</include>
+	<onunload>ClearProperty(PlayerPVRInfo,Home)</onunload>
+	<controls>
+		<control type="group">
+			<posy>80</posy>
+			<control type="image">
+				<posx>10</posx>
+				<posy>0</posy>
+				<width>1260</width>
+				<height>370</height>
+				<texture border="10">dialogbutton-nofocus.png</texture>
+			</control>
+			<control type="group">
+				<posx>1200</posx>
+				<posy>5</posy>
+				<include>DialogCloseButtonCommons</include>
+			</control>
+			<control type="grouplist">
+				<posx>52</posx>
+				<posy>50</posy>
+				<visible>!String.IsEmpty(Window(Home).Property(PlayerPVRInfo))</visible>
+				<control type="label">
+					<width>800</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamServiceName,[COLOR blue]$LOCALIZE[19099]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>800</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamProviderName,[COLOR blue]$LOCALIZE[19101]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>800</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamClient,[COLOR blue]$LOCALIZE[19012]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>800</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamDevice,[COLOR blue]$LOCALIZE[19006]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>800</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamStatus,[COLOR blue]$LOCALIZE[19007]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>800</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamEncryptionName,[COLOR blue]$LOCALIZE[19015]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+			</control>
+			<control type="grouplist">
+				<posx>850</posx>
+				<posy>50</posy>
+				<visible>!String.IsEmpty(Window(Home).Property(PlayerPVRInfo))</visible>
+				<control type="label">
+					<width>400</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamBer,[COLOR blue]$LOCALIZE[19010]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>400</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamUnc,[COLOR blue]$LOCALIZE[19011]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>400</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamMux,[COLOR blue]$LOCALIZE[19100]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>400</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamSignal,[COLOR blue]$LOCALIZE[19008]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="progress">
+					<posy>5</posy>
+					<width>400</width>
+					<height>18</height>
+					<info>PVR.ActStreamProgrSignal</info>
+				</control>
+				<control type="label">
+					<posy>5</posy>
+					<width>400</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[PVR.ActStreamSNR,[COLOR blue]$LOCALIZE[19009]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="progress">
+					<posy>0</posy>
+					<width>400</width>
+					<height>18</height>
+					<info>PVR.ActStreamProgrSNR</info>
+				</control>
+			</control>
+			<control type="grouplist">
+				<posx>52</posx>
+				<posy>20</posy>
+				<visible>String.IsEmpty(Window(Home).Property(PlayerPVRInfo))</visible>
+				<control type="label">
+					<width>1000</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[Player.Process(videodecoder),[COLOR blue]$LOCALIZE[31019]:[/COLOR] ]$VAR[VideoHWDecoder, (,)]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+					<visible>Player.HasVideo</visible>
+				</control>
+				<control type="label">
+					<width>1000</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[Player.Process(pixformat),[COLOR blue]$LOCALIZE[31020]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+					<visible>Player.HasVideo</visible>
+				</control>
+				<control type="label">
+					<width>1000</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[Player.Process(deintmethod),[COLOR blue]$LOCALIZE[16038]:[/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+					<visible>Player.HasVideo</visible>
+				</control>
+				<control type="label">
+					<width>1000</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[Player.Process(videowidth),[COLOR blue]$LOCALIZE[38031]:[/COLOR] ,x]$INFO[Player.Process(videoheight),, px]$INFO[Player.Process(videodar),$COMMA , AR]$INFO[Player.Process(videofps),$COMMA , FPS]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+					<visible>Player.HasVideo</visible>
+				</control>
+				<control type="label">
+					<width>1000</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>[COLOR blue]$LOCALIZE[460]:[/COLOR] $INFO[Player.Process(audiochannels),,$COMMA ]$INFO[Player.Process(audiodecoder)]$INFO[Player.Process(audiobitspersample),$COMMA , bits]$INFO[Player.Process(audiosamplerate),$COMMA , Hz]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>1000</width>
+					<height>30</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[System.Memory(used.percent),[COLOR blue]$LOCALIZE[31021]:[/COLOR] ,       ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label">
+					<width>1000</width>
+					<height>60</height>
+					<aligny>bottom</aligny>
+					<label>$INFO[System.CpuUsage,[COLOR blue]$LOCALIZE[13271][/COLOR] ]</label>
+					<font>font25</font>
+					<shadowcolor>black</shadowcolor>
+					<wrapmultiline>true</wrapmultiline>
+				</control>
+			</control>
+			<control type="grouplist" id="5550">
+				<posx>10</posx>
+				<posy>300</posy>
+				<width>1260</width>
+				<height>130</height>
+				<align>center</align>
+				<orientation>horizontal</orientation>
+				<itemgap>10</itemgap>
+				<control type="button" id="5552">
+					<width>250</width>
+					<height>60</height>
+					<include>ButtonInfoDialogsCommonValues</include>
+					<onclick>ClearProperty(PlayerPVRInfo,Home)</onclick>
+					<label>$LOCALIZE[31018]</label>
+				</control>
+				<control type="button" id="5551">
+					<width>250</width>
+					<height>60</height>
+					<include>ButtonInfoDialogsCommonValues</include>
+					<label>$LOCALIZE[31017]</label>
+					<onclick>SetProperty(PlayerPVRInfo,true,Home)</onclick>
+					<visible>VideoPlayer.Content(livetv)</visible>
+				</control>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml
index aab4eb10f1..7cc0cfc056 100644
--- a/addons/skin.estouchy/xml/Includes.xml
+++ b/addons/skin.estouchy/xml/Includes.xml
@@ -83,6 +83,10 @@
 		<value condition="Player.HasAudio">[B]$INFO[MusicPlayer.Title][/B]</value>
 		<value condition="Player.HasVideo">[B]$INFO[VideoPlayer.Title][/B]</value>
 	</variable>
+	<variable name="VideoHWDecoder">
+		<value condition="Player.Process(videohwdecoder)">HW</value>
+		<value>SW</value>
+	</variable>
 
 	<include name="ScreenWidth">
 		<include condition="String.IsEqual(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include>
@@ -977,7 +981,7 @@
 					<posx>0</posx>
 					<posy>$PARAM[panel-posy]</posy>
 					<width>350</width>
-					<height>560</height>
+					<height>640</height>
 					<onleft>9000</onleft>
 					<onright>50</onright>
 					<onup>9000</onup>
@@ -2452,7 +2456,6 @@
 		<control type="button">
 			<label>31358</label>
 			<include>MenuButtonCommonValues</include>
-			<onclick>ActivateWindow(PVROSDChannels)</onclick>
 			<onclick>ActivateWindow(Teletext)</onclick>
 			<visible>VideoPlayer.Content(LiveTV)</visible>
 		</control>
@@ -2500,6 +2503,12 @@
 			<onclick>ActivateWindow(OSDAudioDSPSettings)</onclick>
 			<visible>system.getbool(audiooutput.dspaddonsenabled)</visible>
 		</control>
+		<control type="button">
+			<label>Player info</label>
+			<include>MenuButtonCommonValues</include>
+			<onclick>ClearProperty(PopupMenuVisible,Home)</onclick>
+			<onclick>ActivateWindow(playerprocessinfo)</onclick>
+		</control>
 	</include>
 	<include name="VideoPlaylistMenu">
 		<control type="radiobutton" id="20">
diff --git a/addons/skin.estouchy/xml/IncludesPlayerControls.xml b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
index b7c594cd93..ad162c1f88 100644
--- a/addons/skin.estouchy/xml/IncludesPlayerControls.xml
+++ b/addons/skin.estouchy/xml/IncludesPlayerControls.xml
@@ -347,8 +347,8 @@
 		</control>
 		<include>BottomMenu</include>
 		<include content="PopupMenu">
-			<param name="panel-posy">0</param>
-			<param name="panel-height">560</param>
+			<param name="panel-posy">-80</param>
+			<param name="panel-height">640</param>
 		</include>
 	</include>
 </includes>