diff options
author | jjd-uk <jjd-uk@kodi.tv> | 2024-02-10 23:35:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-10 23:35:46 +0000 |
commit | a1b569b38b3c86b208124d3202f499fd86ded3df (patch) | |
tree | a818f9d48aaccd8d49d85d33a4e6232f3f18c2e2 | |
parent | 85d014442846bc8b22a84e33222d476bb4c68422 (diff) | |
parent | be0a91d0f0ca6c6b6fcc9786452c805af1f6fb4d (diff) |
Merge pull request #24681 from jjd-uk/estuary_version_labels
[Estuary] Add video version name to playlist + Add 3D info + Cleanup
-rw-r--r-- | addons/skin.estuary/xml/Includes.xml | 27 | ||||
-rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 5 |
2 files changed, 9 insertions, 23 deletions
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml index e3d3fe5977..f43390f640 100644 --- a/addons/skin.estuary/xml/Includes.xml +++ b/addons/skin.estuary/xml/Includes.xml @@ -1718,21 +1718,11 @@ <left>135</left> <top>50</top> <right>20</right> - <height>35</height> + <height>65</height> <font>font12</font> <aligny>center</aligny> <textcolor>grey</textcolor> - <label>$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label> - </control> - <control type="label"> - <left>135</left> - <top>85</top> - <right>20</right> - <height>30</height> - <font>font12</font> - <aligny>center</aligny> - <textcolor>grey</textcolor> - <label>$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</label> + <label>$VAR[MediaInfoListLabel2Var]</label> </control> </itemlayout> <focusedlayout height="$PARAM[height]" width="$PARAM[width]"> @@ -1766,19 +1756,10 @@ <left>135</left> <top>50</top> <right>20</right> - <height>35</height> - <font>font12</font> - <aligny>center</aligny> - <label>$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label> - </control> - <control type="label"> - <left>135</left> - <top>85</top> - <right>20</right> - <height>30</height> + <height>65</height> <font>font12</font> <aligny>center</aligny> - <label>$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</label> + <label>$VAR[MediaInfoListLabel2Var]</label> </control> </focusedlayout> </definition> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index ed26c1247f..d2ef9a9ad9 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -80,6 +80,7 @@ <value>$INFO[ListItem.Icon]</value> </variable> <variable name="ListLabelVar"> + <value condition="ListItem.HasVideoVersions + Window.IsActive(videoplaylist)">$INFO[ListItem.Label]$INFO[ListItem.VideoVersionName, [I](,)[/I]]</value> <value condition="String.IsEqual(ListItem.DbType,episode) + Window.IsActive(videoplaylist)">$INFO[ListItem.TVShowtitle,,: ]$INFO[ListItem.Season,,x]$INFO[ListItem.Episode,,. ]$INFO[ListItem.Title]</value> <value condition="String.IsEqual(ListItem.DbType,musicvideo) + Window.IsActive(videoplaylist)">$INFO[ListItem.Artist,, - ]$INFO[ListItem.Title]</value> <value condition="[!String.IsEmpty(ListItem.Season) | !String.IsEmpty(ListItem.Episode) | !String.IsEmpty(ListItem.EpisodeName)] + Window.IsActive(videoplaylist)">$INFO[ListItem.Title,,: ]$VAR[SeasonEpisodeLabel]$INFO[ListItem.EpisodeName]</value> @@ -793,4 +794,8 @@ <value condition="Window.IsActive(selectvideoversion)">$INFO[ListItem.VideoVersionName]</value> <value>$INFO[ListItem.Label]</value> </variable> + <variable name="MediaInfoListLabel2Var"> + <value condition="ListItem.IsStereoscopic">$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]| 3D $INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</value> + <value>$INFO[ListItem.Duration,$LOCALIZE[180]: ][CR]$VAR[VideoCodecVar,, ]$INFO[ListItem.VideoResolution,| , ]$VAR[VideoResolutionTypeVar,, ]$VAR[VideoHDRVar,| , ]$INFO[ListItem.VideoAspect,| ,:1 ]$VAR[AudioCodecVar,| , ]$VAR[AudioChannelsVar]</value> + </variable> </includes> |