pvr wip

realcopacetic · Aug 21, 2024 · 73ffcb3 · 73ffcb3
1 parent d6f12dd
commit 73ffcb3
Show file tree

Hide file tree

Showing 16 changed files with 228 additions and 109 deletions.
diff --git a/16x9/Animations.xml b/16x9/Animations.xml
@@ -313,12 +313,41 @@
 			<param name="reversible" value="true" />
 		</include>
 	</include>
-
+
+	<include name="VideoPlayer_Mask_Fade_Animation">
+		<param name="fadein_condition" default="[Window.Previous(VideoFullScreen.xml) + !Player.Paused + !$EXP[TransparentDialog_IsVisible]] | Window.Previous(MyPVRChannels.xml) | Window.Previous(MyPVRGuide.xml) | Window.Previous(MyPVRRecordings.xml) | Window.Previous(MyPVRSearch.xml) | Window.Previous(MyPVRTimers.xml)" />
+		<param name="fadeout_condition" default="[Window.Next(VideoFullScreen.xml) + !Player.Paused + !$EXP[TransparentDialog_IsVisible]] | Window.Next(MyPVRChannels.xml) | Window.Next(MyPVRGuide.xml) | Window.Next(MyPVRRecordings.xml) | Window.Next(MyPVRSearch.xml) | Window.Next(MyPVRTimers.xml)" />
+		<definition>
+			<include content="fade_animation">
+				<param name="type" value="WindowOpen" />
+				<param name="time" value="1x" />
+				<param name="condition" value="$PARAM[fadein_condition]" />
+				<param name="reversible" value="true" />
+			</include>
+			<include content="fade_animation">
+				<param name="type" value="WindowClose" />
+				<param name="time" value="1x" />
+				<param name="condition" value="$PARAM[fadeout_condition]" />
+				<param name="reversible" value="true" />
+			</include>
+			<include content="fade_animation">
+				<param name="type" value="Visible" />
+				<param name="time" value="1x" />
+				<param name="reversible" value="true" />
+			</include>
+			<include content="fade_animation">
+				<param name="type" value="Visible" />
+				<param name="time" value="1x" />
+				<param name="reversible" value="true" />
+			</include>
+		</definition>
+	</include>
+
 	<include name="Multiart_Fade_Animation">
 		<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="4000" tween="sine" easing="inout" reversible="false">WindowOpen</animation>
 		<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="1500" tween="sine" easing="inout" reversible="false">Visible</animation>
 	</include>
-	
+
 	<include name="MusicPlayer_Fade_Animation">
 		<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="true">VisibleChange</animation>
 	</include>
@@ -337,7 +366,7 @@
 		<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="!Container.Scrolling">Visible</animation>
 		<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="Container.Scrolling">Visible</animation>
 	</include>
-	
+
 	<include name="Secondary_List_Scroll_Animation">
 		<param name="fadeout" default="true" />
 		<definition>
@@ -369,7 +398,7 @@
 		<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="false" condition="![!Skin.TimerIsRunning(video_playback_label_interruptor) + Integer.IsGreater(Skin.TimerElapsedSecs(video_playback),2) + Integer.IsLess(Skin.TimerElapsedSecs(video_playback),11)]">Visible</animation>
 		<animation effect="fade" start="100" end="0" time="Default_Transition_0.5x" tween="sine" easing="inout" reversible="false" condition="![!Skin.TimerIsRunning(video_playback_label_interruptor) + Integer.IsGreater(Skin.TimerElapsedSecs(video_playback),2) + Integer.IsLess(Skin.TimerElapsedSecs(video_playback),11)]">Hidden</animation>
 	</include>
-	
+
 	<include name="Widget_Breadcrumb_Animation">
 		<include content="fade_Visible" condition="!Skin.HasSetting(Quick_Transitions)">
 			<param name="time" value="Default_Transition_1x" />

diff --git a/16x9/Colors.xml b/16x9/Colors.xml
@@ -189,6 +189,7 @@
 	<variable name="Dropshadow_Diffuse">
 		<value>$VAR[Brightness_0]</value>
 	</variable>
+
 	<!-- Alpha overlay masks -->
 	<variable name="Grid_Mask">
 		<value>$VAR[Alpha_66]$VAR[Dark_Hex]</value>
@@ -218,22 +219,19 @@
 		<value condition="Skin.String(Background_Opacity,50)">$VAR[Alpha_50]$VAR[Dark_Grey_Hex]</value>
 		<value>$VAR[Alpha_75]$VAR[Dark_Grey_Hex]</value>
 	</variable>
-	<variable name="OSD_Background_Diffuse">
+	<variable name="OSD_Background_Mask">
 		<value condition="Skin.String(OSD_Background_Brightness,50)">$VAR[Alpha_50]$VAR[Dark_Hex]</value>
 		<value condition="Skin.String(OSD_Background_Brightness,33)">$VAR[Alpha_66]$VAR[Dark_Hex]</value>
 		<value>$VAR[Alpha_75]$VAR[Dark_Hex]</value>
 	</variable>
 	<variable name="Transparent_Dialog_Mask">
-		<value condition="VideoPlayer.IsFullscreen">$VAR[OSD_Background_Diffuse]</value>
+		<value condition="VideoPlayer.IsFullscreen">$VAR[OSD_Background_Mask]</value>
 		<value>$VAR[Alpha_50]$VAR[Dark_Hex]</value>
 	</variable>
 	<variable name="visualisation_Mask">
 		<value condition="!Skin.HasSetting(visualisation_Disable_Background)">$VAR[Dark_Color]</value>
 		<value>$VAR[Secondary_Color]</value>
 	</variable>
-	<variable name="videoplayer_Mask">
-		<value>$VAR[Alpha_50]$VAR[Dark_Hex]</value>
-	</variable>
 
 	<!-- Labels -->
 	<variable name="Breadcrumb_Label_Color">
@@ -966,7 +964,8 @@
 	</variable>
 	<variable name="tvguide_Icon_Focused_Color">
 		<value condition="ListItem.IsRecording">$VAR[Alpha_100]$VAR[Accent_Hex]</value>
-		<value>$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(10)">$VAR[Light_Color]</value>
+		<value>$VAR[Unfocused_Color]</value>
 	</variable>
 	<variable name="tvguide_Icon_Unfocused_Color">
 		<value condition="ListItem.IsRecording">$VAR[Alpha_100]$VAR[Accent_Hex]</value>

diff --git a/16x9/Components.xml b/16x9/Components.xml
@@ -171,6 +171,7 @@
 				</include>
 				<include content="Embedded_VideoPlayer">
 					<param name="visible" value="VideoPlayer.Content(livetv)" />
+					<param name="mask_visible" value="VideoPlayer.Content(livetv)" />
 				</include>
 				<nested />
 			</control>
@@ -277,20 +278,22 @@
 
 	<include name="VideoPlayer_Mask">
 		<control type="image">
-			<texture colordiffuse="$VAR[videoplayer_Mask]">views/white_100.png</texture>
-			<visible>$EXP[TransparentDialog_IsVisible]</visible>
-			<include content="VisibleHidden_Fade_Animation" />
+			<texture colordiffuse="$VAR[OSD_Background_Mask]">views/white_100.png</texture>
+			<visible>$EXP[TransparentDialog_IsVisible] | $PARAM[visible]</visible>
+			<include content="VideoPlayer_Mask_Fade_Animation" />
 		</control>
 	</include>
 
 	<include name="Embedded_VideoPlayer">
+		<param name="mask_visible" default="false" />
 		<definition>
 			<control type="group">
 				<visible>$PARAM[visible]</visible>
 				<include content="Visible_Fade_Animation" />
-				<nested />
 				<control type="videowindow" />
-				<include content="VideoPlayer_Mask" condition="Window.Is(tvchannels) | Window.Is(tvguide) | Window.Is(home)" />
+				<include content="VideoPlayer_Mask" condition="Window.Is(home) | $EXP[Settings_Window_IsVisible] | $EXP[PVR_IsVisible]">
+					<param name="visible" value="$PARAM[mask_visible]" />
+				</include>
 			</control>
 		</definition>
 	</include>

diff --git a/16x9/Components_Dialogs.xml b/16x9/Components_Dialogs.xml
@@ -150,19 +150,24 @@
 
 	<!-- playerprocessinfo -->
 	<include name="playerprocessinfo_Grouplist">
-		<control type="grouplist">
-			<description>$PARAM[description]</description>
-			<visible>$PARAM[visible]</visible>
-			<include content="Visible_Fade_Animation" />
-			<width>1200</width>
-			<centerleft>50%</centerleft>
-			<bottom>60</bottom>
-			<height>420</height>
-			<itemgap>0</itemgap>
-			<align>top</align>
-			<pagecontrol>60</pagecontrol>
-			<nested />
-		</control>
+		<param name="bottom" default="150" />
+		<param name="height" default="400" />
+		<param name="align" default="center" />
+		<definition>
+			<control type="grouplist">
+				<description>$PARAM[description]</description>
+				<visible>$PARAM[visible]</visible>
+				<include content="Visible_Fade_Animation" />
+				<width>1200</width>
+				<centerleft>50%</centerleft>
+				<bottom>$PARAM[bottom]</bottom>
+				<height>$PARAM[height]</height>
+				<itemgap>0</itemgap>
+				<align>$PARAM[align]</align>
+				<pagecontrol>60</pagecontrol>
+				<nested />
+			</control>
+		</definition>
 	</include>
 
 	<include name="playerprocessinfo_Button">

diff --git a/16x9/Components_PVR.xml b/16x9/Components_PVR.xml
@@ -23,7 +23,9 @@
 		<param name="bottom" />
 		<param name="height" />
 		<param name="align" default="center" />
+		<param name="aligny" default="center" />
 		<param name="textalign" default="center" />
+		<param name="title_padding" default="0" />
 		<param name="title_font" default="Grid_Title_Medium" />
 		<param name="title_label" default="$VAR[PVR_Info_Box_Title_Label]" />
 		<param name="info_label" default="$VAR[PVR_Info_Box_Info_Label]" />
@@ -41,26 +43,29 @@
 				<align>$PARAM[align]</align>
 				<usecontrolcoords>true</usecontrolcoords>
 				<nested />
-				<control type="textbox">
-					<height min="45" max="90">auto</height>
-					<font>$PARAM[title_font]</font>
+				<control type="textbox" id="6005">
+					<top>$PARAM[title_padding]</top>
+					<height min="45" max="85">auto</height>
+					<visible>!String.IsEmpty(ListItem.Title)</visible>
 					<label>$PARAM[title_label]</label>
+					<font>$PARAM[title_font]</font>
 					<textcolor>$VAR[Light_Color]</textcolor>
-					<visible>!String.IsEmpty(ListItem.Label)</visible>
 					<align>$PARAM[textalign]</align>
 					<aligny>bottom</aligny>
+					<autoscroll>false</autoscroll>
 				</control>
 				<include content="PVR_Info_Label">
+					<param name="visible" value="!String.IsEmpty(ListItem.Duration)" />
 					<param name="label">$PARAM[info_label]</param>
 					<align>$PARAM[textalign]</align>
 				</include>
 				<control type="textbox">
 					<top>$PARAM[plot_padding]</top>
 					<height>$PARAM[plot_height_max]</height>
+					<visible>!String.IsEmpty(ListItem.Plot)</visible>
+					<label>$INFO[ListItem.Plot]</label>
 					<aligny>top</aligny>
 					<font>PVR_Description</font>
-					<label>$INFO[ListItem.Plot]</label>
-					<visible>!String.IsEmpty(ListItem.Plot)</visible>
 					<align>$PARAM[textalign]</align>
 					<aligny>center</aligny>
 				</control>
@@ -107,14 +112,27 @@
 	</include>
 
 	<include name="PVR_Channel_Number_Label">
+		<param name="visible" default="!String.IsEqual(VideoPlayer.ChannelName,ListItem.Label)" />
 		<param name="color" default="$VAR[Light_Color]" />
 		<definition>
-			<control type="label">
+			<control type="group">
 				<width>90</width>
-				<label>$INFO[ListItem.ChannelNumberLabel]</label>
-				<align>center</align>
-				<textcolor>$PARAM[color]</textcolor>
-				<font>PVR_Channel</font>
+				<height>90</height>
+				<control type="label">
+					<visible>$PARAM[visible]</visible>
+					<width>100%</width>
+					<height>100%</height>
+					<label>$INFO[ListItem.ChannelNumberLabel]</label>
+					<align>center</align>
+					<textcolor>$PARAM[color]</textcolor>
+					<font>PVR_Channel</font>
+					<selectedcolor>$PARAM[color]</selectedcolor>
+				</control>
+				<include content="Now_Playing_Icon">
+					<param name="visible" value="!$PARAM[visible]" />
+					<param name="color" value="$VAR[Light_Color]" />
+					<animation effect="slide" end="0,5" time="0" condition="Player.Paused">Conditional</animation>
+				</include>
 			</control>
 		</definition>
 	</include>
@@ -175,47 +193,50 @@
 				<include content="PVR_Channel_Number_Label" condition="$PARAM[channel_number]">
 					<param name="color" value="$PARAM[color]" />
 				</include>
+				<include content="Timer_unfocused" condition="$PARAM[timer]">
+					<param name="visible" value="!String.Contains(ListItem.Comment,$LOCALIZE[1223])" />
+					<param name="color" value="$PARAM[color]" />
+					<width>90</width>
+				</include>
 				<control type="group">
 					<animation effect="slide" end="-105" time="0" condition="Window.Is(tvrecordings) | Window.Is(radiorecordings) | Window.Is(tvtimers) | Window.Is(radiotimers) | Window.is(tvtimerrules) | Window.Is(radiotimerrules)">Conditional</animation>
-					<control type="label">
-						<height>40</height>
+					<control type="group">
 						<top>10</top>
-						<left>105</left>
-						<right>120</right>
-						<label>$PARAM[title_label]</label>
-						<font>PVR_Channel</font>
-						<textcolor>$PARAM[color]</textcolor>
-						<scroll>$PARAM[title_scroll]</scroll>
-					</control>
-					<control type="label">
-						<height>30</height>
 						<bottom>10</bottom>
-						<left>105</left>
-						<right>120</right>
-						<label>[UPPERCASE]$PARAM[info_label][/UPPERCASE]</label>
-						<font>PVR_Info</font>
-						<textcolor>$PARAM[color]</textcolor>
+						<left>90</left>
+						<right>240</right>
+						<control type="label">
+							<height>40</height>
+							<label>$PARAM[title_label]</label>
+							<font>PVR_Channel</font>
+							<textcolor>$PARAM[color]</textcolor>
+							<scroll>$PARAM[title_scroll]</scroll>
+							<selectedcolor>$PARAM[color]</selectedcolor>
+						</control>
+						<control type="label">
+							<height>30</height>
+							<bottom>0</bottom>
+							<label>[UPPERCASE]$PARAM[info_label][/UPPERCASE]</label>
+							<font>PVR_Info</font>
+							<textcolor>$PARAM[color]</textcolor>
+							<selectedcolor>$PARAM[color]</selectedcolor>
+						</control>
 					</control>
 				</control>
 				<include content="PVR_icon">
 					<param name="visible" value="$PARAM[icon]" />
 					<param name="texture" value="$VAR[tvchannels_Icon_Texture]" />
 					<param name="color" value="$VAR[tvchannels_Icon_Color]" />
-					<right>10</right>
+					<right>15</right>
 					<centertop>50%</centertop>
 				</include>
 				<include content="PVR_logo" condition="$PARAM[logo]">
 					<param name="color" value="ffffffff" />
-					<param name="right" value="30" />
+					<param name="right" value="60" />
 					<param name="top" value="15" />
 					<param name="width" value="120" />
 					<param name="aligny" value="center" />
 				</include>
-				<include content="Timer_unfocused" condition="$PARAM[timer]">
-					<param name="visible" value="!String.Contains(ListItem.Comment,$LOCALIZE[1223])" />
-					<param name="color" value="$PARAM[color]" />
-					<width>90</width>
-				</include>
 				<nested />
 			</control>
 		</definition>

diff --git a/16x9/Content.xml b/16x9/Content.xml
@@ -142,6 +142,58 @@
 		</definition>
 	</include>
 
+	<include name="playerprocessinfo_PVR_List_Content">
+		<control type="button">
+			<description>PVR backend</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19012]</label>
+			<label2>$INFO[PVR.ActStreamClient]</label2>
+		</control>
+		<control type="button">
+			<description>PVR receiving device</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19006]</label>
+			<label2>$INFO[PVR.ActStreamDevice]</label2>
+		</control>
+		<control type="button">
+			<description>PVR stream status</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19007]</label>
+			<label2>$INFO[PVR.ActStreamStatus]</label2>
+		</control>
+		<control type="button">
+			<description>PVR stream service name / provider name</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19099]$VAR[Copacetic_Divider_Bold, , $LOCALIZE[19101]]</label>
+			<label2>$INFO[PVR.ActStreamServiceName]$VAR[Copacetic_Divider_Bold, ]$INFO[PVR.ActStreamProviderName, ]</label2>
+		</control>
+		<control type="button">
+			<description>PVR stream signal / SNR</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19008]$VAR[Copacetic_Divider_Bold, , $LOCALIZE[19009]]</label>
+			<label2>$INFO[PVR.ActStreamSignal]$VAR[Copacetic_Divider_Bold, ]$INFO[PVR.ActStreamSNR, ]</label2>
+		</control>
+		<control type="button">
+			<description>PVR stream BER</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19010]$VAR[Copacetic_Divider_Bold, , $LOCALIZE[19011]]</label>
+			<label2>$INFO[PVR.ActStreamBER]$VAR[Copacetic_Divider_Bold, ]$INFO[PVR.ActStreamUNC, ]</label2>
+		</control>
+		<control type="button">
+			<description>PVR stream encryption</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19015]</label>
+			<label2>$INFO[PVR.ActStreamEncryptionName]</label2>
+		</control>
+		<control type="button">
+			<description>PVR stream mux</description>
+			<include content="playerprocessinfo_Button" />
+			<label>$LOCALIZE[19100]</label>
+			<label2>$INFO[PVR.ActStreamMux]</label2>
+		</control>
+	</include>
+
+
 	<include name="playerprocessinfo_Media_List_Content">
 		<control type="button">
 			<description>Video codec</description>