diff options
Diffstat (limited to 'abs/core/linhes-theme/osd.xml.patch')
-rw-r--r-- | abs/core/linhes-theme/osd.xml.patch | 397 |
1 files changed, 327 insertions, 70 deletions
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index efe4838..3eabbfc 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ ---- osd.xml.orig 2016-10-10 19:48:08.091427236 +0000 -+++ osd.xml 2016-10-10 19:40:05.992756927 +0000 +--- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000 ++++ osd.xml 2016-11-17 19:29:17.370920531 +0000 @@ -7,13 +7,13 @@ <window name="osd_debug"> <area>0,0,1280,720</area> @@ -17,79 +17,157 @@ </fontdef> <shape name="osd-debug-backdrop"> -@@ -71,7 +71,7 @@ +@@ -63,109 +63,97 @@ + <area>1212,40,2,120</area> + </shape> + +- <textarea name="cpuload"> ++ <textarea name="file"> + <font>medium</font> +- <area>74,51,162,25</area> ++ <area>74,51,132,25</area> + <align>right,vcenter</align> +- <value>CPUs :</value> ++ <value>File :</value> </textarea> - <textarea name="load"> +- <textarea name="load"> - <font>mediumblue</font> +- <area>241,51,216,25</area> ++ <textarea name="filename"> + <font>medium</font> - <area>241,51,216,25</area> ++ <area>211,51,995,25</area> <align>left,vcenter</align> </textarea> -@@ -84,7 +84,7 @@ + +- <textarea name="file"> ++ <textarea name="cpuload"> + <font>medium</font> +- <area>450,51,60,25</area> ++ <area>74,76,132,25</area> + <align>right,vcenter</align> +- <value>File :</value> ++ <value>CPUs :</value> </textarea> - <textarea name="filename"> +- <textarea name="filename"> - <font>mediumblue</font> +- <area>515,51,685,25</area> ++ <textarea name="load"> + <font>medium</font> - <area>515,51,685,25</area> ++ <area>211,76,169,25</area> <align>left,vcenter</align> </textarea> -@@ -97,7 +97,7 @@ + +- <textarea name="storage"> ++ <textarea name="video"> + <font>medium</font> +- <area>74,76,162,25</area> ++ <area>74,101,132,25</area> + <align>right,vcenter</align> +- <value>Storage to Buffer :</value> ++ <value>Video :</value> </textarea> - <textarea name="storagerate"> +- <textarea name="storagerate"> - <font>mediumblue</font> +- <area>247,76,123,25</area> ++ <textarea name="videowidth"> + <font>medium</font> - <area>247,76,123,25</area> ++ <area>211,101,169,25</area> <align>left,vcenter</align> ++ <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template> </textarea> -@@ -110,7 +110,7 @@ + +- <textarea name="decoder"> ++ <textarea name="vidcodec"> + <font>medium</font> +- <area>74,101,162,25</area> ++ <area>74,126,132,25</area> + <align>right,vcenter</align> +- <value>Buffer to Decoder :</value> ++ <value>Codec/Decoder :</value> </textarea> - <textarea name="decoderrate"> +- <textarea name="decoderrate"> - <font>mediumblue</font> +- <area>247,101,123,25</area> ++ <textarea name="videocodec"> + <font>medium</font> - <area>247,101,123,25</area> ++ <area>211,126,169,25</area> <align>left,vcenter</align> ++ <template>%VIDEOCODEC%/%VIDEODECODER%</template> </textarea> -@@ -123,7 +123,7 @@ + + <textarea name="buffer"> + <font>medium</font> +- <area>74,126,162,25</area> ++ <area>385,76,160,25</area> + <align>right,vcenter</align> + <value>Available Buffer :</value> </textarea> <textarea name="bufferavail"> - <font>mediumblue</font> +- <area>247,126,123,25</area> + <font>medium</font> - <area>247,126,123,25</area> ++ <area>550,76,123,25</area> <align>left,vcenter</align> <template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template> -@@ -137,7 +137,7 @@ </textarea> - <textarea name="videowidth"> +- <textarea name="video"> ++ <textarea name="storage"> + <font>medium</font> +- <area>410,76,100,25</area> ++ <area>385,101,160,25</area> + <align>right,vcenter</align> +- <value>Video :</value> +- </textarea> +- +- <textarea name="videowidth"> - <font>mediumblue</font> -+ <font>medium</font> - <area>515,76,250,25</area> - <align>left,vcenter</align> - <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template> -@@ -151,7 +151,7 @@ - </textarea> - - <textarea name="videocodec"> +- <area>515,76,250,25</area> +- <align>left,vcenter</align> +- <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template> ++ <value>Storage to Buffer :</value> + </textarea> + +- <textarea name="vidcodec"> ++ <textarea name="storagerate"> + <font>medium</font> +- <area>410,101,100,25</area> +- <align>right,vcenter</align> +- <value>Codec :</value> +- </textarea> +- +- <textarea name="videocodec"> - <font>mediumblue</font> -+ <font>medium</font> - <area>515,101,150,25</area> +- <area>515,101,150,25</area> ++ <area>550,101,123,25</area> <align>left,vcenter</align> </textarea> -@@ -164,7 +164,7 @@ + +- <textarea name="viddec"> ++ <textarea name="decoder"> + <font>medium</font> +- <area>410,126,100,25</area> ++ <area>385,126,160,25</area> + <align>right,vcenter</align> +- <value>Decoder :</value> ++ <value>Buffer to Decoder :</value> </textarea> - <textarea name="videodecoder"> +- <textarea name="videodecoder"> - <font>mediumblue</font> +- <area>515,126,150,25</area> ++ <textarea name="decoderrate"> + <font>medium</font> - <area>515,126,150,25</area> ++ <area>550,126,123,25</area> <align>left,vcenter</align> </textarea> -@@ -177,7 +177,7 @@ + +@@ -177,7 +165,7 @@ </textarea> <textarea name="avsync"> @@ -98,7 +176,7 @@ <area>875,76,100,25</area> <align>left,vcenter</align> </textarea> -@@ -190,7 +190,7 @@ +@@ -190,7 +178,7 @@ </textarea> <textarea name="framerate"> @@ -107,7 +185,12 @@ <area>875,101,100,25</area> <align>left,vcenter</align> </textarea> -@@ -203,7 +203,7 @@ +@@ -199,11 +187,11 @@ + <font>medium</font> + <area>670,126,200,25</area> + <align>right,vcenter</align> +- <value>Frames decoded/free :</value> ++ <value>Frames Decoded/Free :</value> </textarea> <textarea name="videoframes"> @@ -116,7 +199,7 @@ <area>875,126,100,25</area> <align>left,vcenter</align> </textarea> -@@ -216,7 +216,7 @@ +@@ -216,7 +204,7 @@ </textarea> <textarea name="audiocodec"> @@ -125,7 +208,7 @@ <area>1129,76,77,25</area> <align>left,vcenter</align> </textarea> -@@ -229,7 +229,7 @@ +@@ -229,7 +217,7 @@ </textarea> <textarea name="audiochannels"> @@ -134,7 +217,12 @@ <area>1129,101,77,25</area> <align>left,vcenter</align> </textarea> -@@ -242,7 +242,7 @@ +@@ -238,11 +226,11 @@ + <font>medium</font> + <area>994,126,130,25</area> + <align>right,vcenter</align> +- <value>Sample rate :</value> ++ <value>Sample Rate :</value> </textarea> <textarea name="samplerate"> @@ -143,7 +231,7 @@ <area>1129,126,77,25</area> <align>left,vcenter</align> </textarea> -@@ -252,8 +252,8 @@ +@@ -252,8 +240,8 @@ <window name="osd_message"> <area>0,0,1280,720</area> @@ -154,7 +242,7 @@ <color>#e6e6e6</color> </fontdef> -@@ -315,9 +315,9 @@ +@@ -315,9 +303,9 @@ <window name="osd_input"> <area>0,0,1280,720</area> @@ -166,7 +254,7 @@ </fontdef> <shape name="osd-input-backdrop"> -@@ -378,9 +378,9 @@ +@@ -378,9 +366,9 @@ <window name="osd_status"> <area>0,0,1280,720</area> @@ -178,7 +266,7 @@ </fontdef> <shape name="osd-status-backdrop"> -@@ -436,12 +436,19 @@ +@@ -436,12 +424,19 @@ <align>left,vcenter</align> </textarea> @@ -186,23 +274,23 @@ - <area>90,658,1100,24</area> + <textarea name="value"> + <area>90,657,1100,24</area> -+ <font>small</font> -+ <align>allcenter</align> + <font>small</font> + <align>allcenter</align> +- <template>%DESCRIPTION% +- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> + <template>%VALUE%%UNITS%</template> + </textarea> + + <textarea name="playedtime" depends="!value"> + <area>90,657,1100,24</area> - <font>small</font> - <align>allcenter</align> -- <template>%DESCRIPTION% -- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template> ++ <font>small</font> ++ <align>allcenter</align> + <template>%PLAYEDTIME% of %TOTALTIME% + %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template> </textarea> <clock name="clock"> -@@ -470,39 +477,39 @@ +@@ -470,39 +465,39 @@ <window name="program_info"> <area>0,0,1280,720</area> @@ -213,7 +301,8 @@ + <pixelsize>23</pixelsize> </fontdef> - <fontdef name="supersmall" from="small"> +- <fontdef name="supersmall" from="small"> ++ <fontdef name="supersmall" from="small"> <weight>bold</weight> - <pixelsize>12</pixelsize> + <pixelsize>14</pixelsize> @@ -252,34 +341,199 @@ </fontdef> <shape name="program-info-backdrop"> -@@ -988,7 +995,7 @@ +@@ -628,7 +623,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>WatchingLiveTM</value> ++ <value>WatchingLiveTV</value> + </textarea> + </state> + <state name="WatchingPreRecorded"> +@@ -685,7 +680,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>AudioCodec: PCM_DVD</value> ++ <value>AudioCodec: PCM DVD</value> + </textarea> + </state> + <state name="PCM_BLURAY"> +@@ -787,7 +782,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: Mono</value> ++ <value>AudioChannels: Mono</value> + </textarea> + </state> + <state name="2"> +@@ -805,7 +800,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: 5 CH.</value> ++ <value>AudioChannels: 5.0</value> + </textarea> + </state> + <state name="6"> +@@ -823,7 +818,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: 7 CH.</value> ++ <value>AudioChannels: 7.0</value> + </textarea> + </state> + <state name="8"> +@@ -832,7 +827,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>Audio: 7.1 CH.</value> ++ <value>AudioChannels: 7.1</value> + </textarea> + </state> + </statetype> +@@ -865,6 +860,15 @@ + <value>VideoCodec: H.264</value> + </textarea> + </state> ++ <state name="HEVC"> ++ <textarea name="HEVC"> ++ <area>830,432,180,16</area> ++ <font>supersmallblue</font> ++ <cutdown>no</cutdown> ++ <align>allcenter</align> ++ <value>VideoCodec: HEVC</value> ++ </textarea> ++ </state> + <state name="MPEG-4"> + <textarea name="MPEG-4"> + <area>830,432,180,16</area> +@@ -910,7 +914,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: SD</value> ++ <value>VideoRes: SD</value> + </textarea> + </state> + <state name="HD_720_P"> +@@ -919,7 +923,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: HD_720_P</value> ++ <value>VideoRes: HD 720p</value> + </textarea> + </state> + <state name="HD_1080_I"> +@@ -928,7 +932,7 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: HD_1080_I</value> ++ <value>VideoRes: HD 1080i</value> + </textarea> + </state> + <state name="HD_1080_P"> +@@ -937,23 +941,32 @@ + <font>supersmallblue</font> + <cutdown>no</cutdown> + <align>allcenter</align> +- <value>VideoDesc: HD_1080_P</value> ++ <value>VideoRes: HD 1080p</value> + </textarea> + </state> + </statetype> + +- <textarea name="timedate"> ++ <!--use channum to detect if in videos--> ++ <textarea name="timedate" depends="channum"> + <font>mediumsmall</font> +- <area>274,453,481,24</area> ++ <area>274,453,581,24</area> + <align>vcenter</align> +- <template>%TIMEDATE% : %LENMINS%</template> ++ <template>%TIMEDATE% %LONGREPEAT%</template> + </textarea> + +- <textarea name="longrepeat"> ++ <!--use channum to detect if in videos--> ++ <textarea name="lenminsFilesize" depends="channum"> + <font>mediumsmall</font> +- <area>771,453,435,22</area> ++ <area>871,453,335,22</area> ++ <align>right,vcenter</align> ++ <template>%LENMINS% (%FILESIZE_STR%)</template> ++ </textarea> ++ ++ <!--use channum to detect if in videos--> ++ <textarea name="lenmins" depends="!channum"> ++ <font>mediumsmall</font> ++ <area>871,453,335,22</area> + <align>right,vcenter</align> +- <template>%LONGREPEAT% Size: %FILESIZE_STR%</template> + </textarea> + + <imagetype name="coverart"> +@@ -988,13 +1001,22 @@ <alpha>255</alpha> </imagetype> - <textarea name="category"> -+ <textarea name="category"> ++ <!--use channum to detect if in videos--> ++ <textarea name="category" depends="channum"> <font>supersmallblue</font> <area>284,490,912,28</area> <align>allcenter</align> -@@ -1003,37 +1010,49 @@ + <template>Category: %CATEGORY% PlayBackGroup: %PLAYGROUP% RecGroup: %RECORDINGGROUP% StorageGroup: %STORAGEGROUP%</template> + </textarea> + ++ <!--use channum to detect if in videos--> ++ <textarea name="playback" depends="!channum"> ++ <font>supersmallblue</font> ++ <area>284,490,912,28</area> ++ <align>allcenter</align> ++ <template>PlayBackGroup: %PLAYGROUP% RecGroup: %RECORDINGGROUP% StorageGroup: %STORAGEGROUP%</template> ++ </textarea> ++ + <textarea name="description"> + <font>small</font> + <area>284,523,912,126</area> +@@ -1003,37 +1025,62 @@ <template>%"|SUBTITLE|" %%YEARSTARS| %%DESCRIPTION%</template> </textarea> - <textarea name="programid"> -+ <textarea name="programid" depends="iconpath&!coverart"> ++ <textarea name="programid" depends="channum&!coverart"> <font>supersmallblue</font> <area>284,653,912,27</area> <align>allcenter</align> <template>Season/Episode: %s00e00% ProgramID: %PROGRAMID% SeriesID: %SERIESID%</template> </textarea> -+ <textarea name="channame" depends="iconpath&coverart"> ++ <textarea name="channame" depends="channum&coverart"> + <font>supersmallblue</font> + <area>284,653,912,27</area> + <align>allcenter</align> + <template>Channel: %channum% - %channame% - %callsign% Season/Episode: %s00e00% ProgramID: %PROGRAMID% SeriesID: %SERIESID%</template> + </textarea> + ++ <!--use channum to detect if in videos--> ++ <textarea name="s00e00" depends="!channum"> ++ <font>supersmallblue</font> ++ <area>2284,653,912,27</area> ++ <align>allcenter</align> ++ </textarea> ++ <textarea name="seasoneps" depends="!channum&s00e00"> ++ <font>supersmallblue</font> ++ <area>284,653,912,27</area> ++ <align>allcenter</align> ++ <template>Season/Episode: %s00e00%</template> ++ </textarea> ++ </window> <window name="browse_info"> @@ -318,7 +572,7 @@ </fontdef> <shape name="browse-info-backdrop"> -@@ -1084,7 +1103,7 @@ +@@ -1084,7 +1131,7 @@ </shape> <shape name="title-backdrop-line"> @@ -327,7 +581,7 @@ <type>roundbox</type> <fill color="#000000" alpha="0" /> <line color="#ffffff" alpha="45" width="2" /> -@@ -1092,11 +1111,11 @@ +@@ -1092,11 +1139,11 @@ </shape> <shape name="title-top-line" from="channel-top-line"> @@ -341,7 +595,7 @@ </shape> <shape name="title-left-line" from="channel-left-line"> -@@ -1104,30 +1123,6 @@ +@@ -1104,30 +1151,6 @@ </shape> <shape name="title-right-line" from="channel-left-line"> @@ -372,7 +626,7 @@ <area>1212,492,2,62</area> </shape> -@@ -1175,30 +1170,30 @@ +@@ -1175,30 +1198,29 @@ </textarea> <textarea name="title"> @@ -384,19 +638,22 @@ <textarea name="timedate"> - <font>smallerblue</font> +- <area>228,529,497,22</area> + <font>smaller</font> - <area>228,529,497,22</area> ++ <area>228,529,843,22</area> <align>vcenter</align> - <template>%TIMEDATE% : %LENMINS%</template> +- <template>%TIMEDATE% : %LENMINS%</template> ++ <template>%TIMEDATE% %LONGREPEAT%</template> </textarea> - <textarea name="longrepeat"> +- <textarea name="longrepeat"> - <font>smallerblue</font> - <area>740,530,304,20</area> ++ <textarea name="lenmins"> + <font>smaller</font> -+ <area>902,530,310,20</area> ++ <area>1086,530,120,22</area> <align>right,vcenter</align> - <template>%LONGREPEAT%</template> +- <template>%LONGREPEAT%</template> </textarea> <clock name="clock"> @@ -410,7 +667,7 @@ </clock> <textarea name="description"> -@@ -1214,9 +1209,9 @@ +@@ -1214,9 +1236,9 @@ <window name="ChannelEditor"> <area>0,0,1280,720</area> @@ -422,7 +679,7 @@ </fontdef> <fontdef name="smallblack" from="small"> -@@ -1224,7 +1219,7 @@ +@@ -1224,7 +1246,7 @@ </fontdef> <fontdef name="smallblue" from="small"> @@ -431,7 +688,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1232,7 +1227,7 @@ +@@ -1232,7 +1254,7 @@ </fontdef> <fontdef name="medium" from="small"> @@ -440,7 +697,7 @@ </fontdef> <shape name="channel-editor-backdrop"> -@@ -1610,9 +1605,9 @@ +@@ -1610,9 +1632,9 @@ <window name="osd_program_editor"> <area>0,0,1280,720</area> @@ -452,7 +709,7 @@ </fontdef> <shape name="osd-program-editor-backdrop"> -@@ -1663,13 +1658,17 @@ +@@ -1663,13 +1685,17 @@ </shape> <textarea name="title"> @@ -473,7 +730,7 @@ <align>right,vcenter</align> </textarea> -@@ -1749,9 +1748,9 @@ +@@ -1749,9 +1775,9 @@ <window name="MythPopupBox"> <area>0,0,1280,720</area> @@ -485,7 +742,7 @@ </fontdef> <fontdef name="smallgrey" from="small"> -@@ -1759,7 +1758,7 @@ +@@ -1759,7 +1785,7 @@ </fontdef> <fontdef name="smallyellow" from="small"> |