⚡ Standardise codec info order

jurialmunkey · Oct 18, 2024 · 5cee599 · 5cee599
1 parent 500279c
commit 5cee599
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/1080i/Includes_DialogInfo.xml b/1080i/Includes_DialogInfo.xml
@@ -873,7 +873,7 @@
                 <control type="grouplist">
                     <orientation>vertical</orientation>
                     <itemgap>0</itemgap>
-                    <width>400</width>
+                    <width>480</width>
                     <height>320</height>
 
                     <!-- Director -->
@@ -958,7 +958,7 @@
 
                     <!-- Codecs -->
                     <include content="Object_InfoCircle" condition="![$PARAM[is_player]]">
-                        <param name="name">$INFO[ListItem.VideoCodec]$INFO[ListItem.VideoAspect, • ,:1]$INFO[ListItem.VideoResolution, • ,]$INFO[ListItem.AudioCodec, • ,]$INFO[ListItem.AudioChannels, • ,ch]</param>
+                        <param name="name">[UPPERCASE]$INFO[ListItem.VideoResolution,, • ]$INFO[ListItem.VideoCodec]$INFO[ListItem.VideoAspect, • ,:1]$INFO[ListItem.AudioCodec, • ,]$VAR[Label_ListItem_AudioChannels, • ,][/UPPERCASE]</param>
                         <param name="role">$INFO[ListItem.VideoVersionName]</param>
                         <param name="icon">special://skin/extras/icons/photo-film.png</param>
                         <param name="fallback_role">$LOCALIZE[31207]</param>
@@ -969,7 +969,7 @@
                         <visible>!String.IsEmpty(ListItem.VideoCodec)</visible>
                     </include>
                     <include content="Object_InfoCircle" condition="[$PARAM[is_player]]">
-                        <param name="name">$INFO[VideoPlayer.VideoCodec]$INFO[VideoPlayer.VideoAspect, • ,:1]$INFO[VideoPlayer.VideoResolution, • ,]$INFO[VideoPlayer.AudioCodec, • ,]$INFO[VideoPlayer.AudioChannels, • ,ch]</param>
+                        <param name="name">[UPPERCASE]$INFO[VideoPlayer.VideoResolution,, • ]$INFO[VideoPlayer.VideoCodec]$INFO[VideoPlayer.VideoAspect, • ,:1]$INFO[VideoPlayer.AudioCodec, • ,]$VAR[Label_VideoPlayer_AudioChannels, • ,][/UPPERCASE]</param>
                         <param name="role">$INFO[VideoPlayer.VideoVersionName]</param>
                         <param name="icon">special://skin/extras/icons/photo-film.png</param>
                         <param name="fallback_role">$LOCALIZE[31207]</param>
@@ -985,7 +985,7 @@
                     <orientation>vertical</orientation>
                     <itemgap>0</itemgap>
                     <height>320</height>
-                    <left>400</left>
+                    <left>480</left>
 
                     <!-- Genre -->
                     <include content="Object_InfoCircle" condition="![$PARAM[is_player]]">

diff --git a/1080i/Includes_Layouts.xml b/1080i/Includes_Layouts.xml
@@ -1126,7 +1126,7 @@
                             <include condition="$PARAM[selected]">Color_SelectedText</include>
                             <textcolor>$PARAM[textcolor]_70</textcolor>
                             <selectedcolor>$PARAM[textcolor]_70</selectedcolor>
-                            <label>[UPPERCASE]$INFO[ListItem.VideoResolution]$INFO[ListItem.VideoCodec,  •  ,]$INFO[ListItem.VideoAspect,  •  ,]$VAR[Label_ListItem_AudioChannels,  •  ,]$INFO[ListItem.AudioCodec,  •  ,][/UPPERCASE]</label>
+                            <label>[UPPERCASE]$INFO[ListItem.VideoResolution]$INFO[ListItem.VideoCodec,  •  ,]$INFO[ListItem.VideoAspect,  •  ,:1]$INFO[ListItem.AudioCodec,  •  ,]$VAR[Label_ListItem_AudioChannels,  •  ,][/UPPERCASE]</label>
                             <haspath>true</haspath>
                             <font>font_tiny</font>
                             <height>35</height>
@@ -1323,7 +1323,7 @@
                                 <include condition="$PARAM[selected]">Color_SelectedText</include>
                                 <textcolor>dialog_fg_70</textcolor>
                                 <selectedcolor>dialog_fg_70</selectedcolor>
-                                <label>$INFO[ListItem.Duration]$INFO[ListItem.VideoCodec,  ,]$INFO[ListItem.VideoResolution,  ,]$INFO[ListItem.VideoAspect,  ,]$INFO[ListItem.AudioCodec,  ,]$VAR[Label_ListItem_AudioChannels,  ,]</label>
+                                <label>[UPPERCASE]$INFO[ListItem.Duration]$INFO[ListItem.VideoResolution,  •  ,]$INFO[ListItem.VideoCodec,  •  ,]$INFO[ListItem.VideoAspect,  •  ,:1]$INFO[ListItem.AudioCodec,  •  ,]$VAR[Label_ListItem_AudioChannels,  •  ,][/UPPERCASE]</label>
                             </control>
                         </control>
                     </control>

diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
@@ -757,16 +757,12 @@
                 <centertop>50%</centertop>
                 <height>80</height>
                 <include content="Object_InfoCircle">
-                    <param name="name">$INFO[VideoPlayer.VideoCodec]$INFO[VideoPlayer.VideoAspect, • ,:1]$INFO[VideoPlayer.VideoResolution, • ,]$INFO[VideoPlayer.AudioCodec, • ,]$INFO[VideoPlayer.AudioChannels, • ,ch]</param>
+                    <param name="name">[UPPERCASE]$INFO[VideoPlayer.VideoResolution]$INFO[VideoPlayer.VideoCodec, • ,]$INFO[VideoPlayer.VideoAspect, • ,:1]$INFO[VideoPlayer.AudioCodec, • ,]$VAR[Label_VideoPlayer_AudioChannels, • ,][/UPPERCASE]</param>
                     <param name="role">$INFO[VideoPlayer.VideoVersionName]</param>
                     <param name="icon">special://skin/extras/icons/photo-film.png</param>
                     <param name="fallback_role">$LOCALIZE[31207]</param>
                     <param name="textcolor_top">$PARAM[textcolor_top]</param>
                     <param name="textcolor_sub">$PARAM[textcolor_sub]</param>
-                    <!-- <include content="Object_InfoCircle_Image">
-                        <param name="colordiffuse">white</param>
-                        <param name="icon">$INFO[VideoPlayer.Art(poster)]</param>
-                    </include> -->
                 </include>
             </control>
         </definition>