linhes-theme: update osd.xml for HEVC codec

change layout of osd debug window

2 files changed, 155 insertions, 61 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index d600f7d..7660af9 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.4
-pkgrel=9
+pkgrel=10
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -79,11 +79,11 @@ package() {
 
     msg "Modifying yellows and blue to LinHES yellow and blue"
     #yellow
-    grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g"
+    grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g" || return 0
     #darkyellow
-    grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g"
+    grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g" || return 0
     #blue
-    grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g"
+    grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g" || return 0
 
     msg "Modifying fonts to Overlock"
     grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\DejaVu Sans/\Overlock/g"
@@ -94,7 +94,7 @@ package() {
     sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
-         '0d95c596b460de777e12b89da0bf2e19'
+         '0383edbb16b0d15f47492cde738f164b'
          'f2b9c85519e80843294315a42870e582'
          '43b1f213fd392fb07aac503e775e27bc'
          '80bb72994eca59ca6dc9034ac185e7cc'
@@ -113,6 +113,6 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          'e8dee86a10ce7c4423a97305b38b4668'
          'e8ac15e38b3dc99c9e889e439ba356de'
          'e8cf0d3a55ba3be47deae55c05432141'
-         'bcc89120aba113ca204534dbbbaee60d'
+         '58834fbee0230c713802c61e635cbab0'
          'b51ef0cbf8ed2d3a8c1a8257a89aceff'
          '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index efe4838..d4b225b 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-10-25 18:54:13.696402426 +0000
++++ osd.xml	2016-10-25 18:53:00.649172353 +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,7 @@
              <area>875,101,100,25</area>
              <align>left,vcenter</align>
          </textarea>
-@@ -203,7 +203,7 @@
+@@ -203,7 +191,7 @@
          </textarea>
  
          <textarea name="videoframes">
@@ -116,7 +194,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 +203,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 +212,7 @@
              <area>1129,101,77,25</area>
              <align>left,vcenter</align>
          </textarea>
-@@ -242,7 +242,7 @@
+@@ -242,7 +230,7 @@
          </textarea>
  
          <textarea name="samplerate">
@@ -143,7 +221,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 +232,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 +244,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 +256,7 @@
          </fontdef>
  
          <shape name="osd-status-backdrop">
-@@ -436,12 +436,19 @@
+@@ -436,12 +424,19 @@
              <align>left,vcenter</align>
          </textarea>
  
@@ -202,7 +280,7 @@
          </textarea>
  
          <clock name="clock">
-@@ -470,39 +477,39 @@
+@@ -470,39 +465,39 @@
      <window name="program_info">
          <area>0,0,1280,720</area>
  
@@ -252,7 +330,23 @@
          </fontdef>
  
          <shape name="program-info-backdrop">
-@@ -988,7 +995,7 @@
+@@ -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>
+@@ -988,7 +992,7 @@
              <alpha>255</alpha>
          </imagetype>
  
@@ -261,7 +355,7 @@
              <font>supersmallblue</font>
              <area>284,490,912,28</area>
              <align>allcenter</align>
-@@ -1003,37 +1010,49 @@
+@@ -1003,37 +1007,49 @@
              <template>%"|SUBTITLE|"  %%YEARSTARS| %%DESCRIPTION%</template>
          </textarea>
  
@@ -318,7 +412,7 @@
          </fontdef>
  
          <shape name="browse-info-backdrop">
-@@ -1084,7 +1103,7 @@
+@@ -1084,7 +1100,7 @@
          </shape>
  
          <shape name="title-backdrop-line">
@@ -327,7 +421,7 @@
              <type>roundbox</type>
              <fill color="#000000" alpha="0" />
              <line color="#ffffff" alpha="45" width="2" />
-@@ -1092,11 +1111,11 @@
+@@ -1092,11 +1108,11 @@
          </shape>
  
          <shape name="title-top-line" from="channel-top-line">
@@ -341,7 +435,7 @@
          </shape>
  
          <shape name="title-left-line" from="channel-left-line">
-@@ -1104,30 +1123,6 @@
+@@ -1104,30 +1120,6 @@
          </shape>
  
          <shape name="title-right-line" from="channel-left-line">
@@ -372,7 +466,7 @@
              <area>1212,492,2,62</area>
          </shape>
  
-@@ -1175,30 +1170,30 @@
+@@ -1175,30 +1167,30 @@
          </textarea>
  
          <textarea name="title">
@@ -410,7 +504,7 @@
          </clock>
  
          <textarea name="description">
-@@ -1214,9 +1209,9 @@
+@@ -1214,9 +1206,9 @@
      <window name="ChannelEditor">
          <area>0,0,1280,720</area>
  
@@ -422,7 +516,7 @@
          </fontdef>
  
          <fontdef name="smallblack" from="small">
-@@ -1224,7 +1219,7 @@
+@@ -1224,7 +1216,7 @@
          </fontdef>
  
          <fontdef name="smallblue" from="small">
@@ -431,7 +525,7 @@
          </fontdef>
  
          <fontdef name="smallgrey" from="small">
-@@ -1232,7 +1227,7 @@
+@@ -1232,7 +1224,7 @@
          </fontdef>
  
          <fontdef name="medium" from="small">
@@ -440,7 +534,7 @@
          </fontdef>
  
          <shape name="channel-editor-backdrop">
-@@ -1610,9 +1605,9 @@
+@@ -1610,9 +1602,9 @@
      <window name="osd_program_editor">
          <area>0,0,1280,720</area>
  
@@ -452,7 +546,7 @@
          </fontdef>
  
          <shape name="osd-program-editor-backdrop">
-@@ -1663,13 +1658,17 @@
+@@ -1663,13 +1655,17 @@
          </shape>
  
          <textarea name="title">
@@ -473,7 +567,7 @@
              <align>right,vcenter</align>
          </textarea>
  
-@@ -1749,9 +1748,9 @@
+@@ -1749,9 +1745,9 @@
      <window name="MythPopupBox">
          <area>0,0,1280,720</area>
  
@@ -485,7 +579,7 @@
          </fontdef>
  
          <fontdef name="smallgrey" from="small">
-@@ -1759,7 +1758,7 @@
+@@ -1759,7 +1755,7 @@
          </fontdef>
  
          <fontdef name="smallyellow" from="small">