linhes-theme: fix osd.xml for remain/behind

2 files changed, 144 insertions, 3 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index c8e97ab..91d6ed4 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.2
-pkgrel=7
+pkgrel=8
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -80,7 +80,7 @@ package() {
     sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
-         'e857e084963166bb37c6236463750dc1'
+         '6d200405600fd9aed3241097207d86c8'
          '5fccb4e20c15d87223ea5de4c40faa06'
          'c75c83b90969fb07755062113f858e88'
          '22ff4044c8c29560451fb51dcbf4d44e'
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 6c29161..981a0e8 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,5 +1,5 @@
 --- osd.xml.orig	2014-10-26 18:47:55.853729172 +0000
-+++ osd.xml	2014-10-26 19:11:25.023453880 +0000
++++ osd.xml	2014-11-23 22:04:30.823095573 +0000
 @@ -7,13 +7,13 @@
      <window name="osd_debug">
          <area>0,0,1280,720</area>
@@ -17,6 +17,132 @@
          </fontdef>
  
          <shape name="osd-debug-backdrop">
+@@ -71,7 +71,7 @@
+         </textarea>
+ 
+         <textarea name="load">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>241,51,216,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -84,7 +84,7 @@
+         </textarea>
+ 
+         <textarea name="filename">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>515,51,685,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -97,7 +97,7 @@
+         </textarea>
+ 
+         <textarea name="storagerate">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>247,76,123,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -110,7 +110,7 @@
+         </textarea>
+ 
+         <textarea name="decoderrate">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>247,101,123,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -123,7 +123,7 @@
+         </textarea>
+ 
+         <textarea name="bufferavail">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>247,126,123,25</area>
+             <align>left,vcenter</align>
+             <template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template>
+@@ -137,7 +137,7 @@
+         </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">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>515,101,150,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -164,7 +164,7 @@
+         </textarea>
+ 
+         <textarea name="videodecoder">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>515,126,150,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -177,7 +177,7 @@
+         </textarea>
+ 
+         <textarea name="avsync">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>875,76,100,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -190,7 +190,7 @@
+         </textarea>
+ 
+         <textarea name="framerate">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>875,101,100,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -203,7 +203,7 @@
+         </textarea>
+ 
+         <textarea name="videoframes">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>875,126,100,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -216,7 +216,7 @@
+         </textarea>
+ 
+         <textarea name="audiocodec">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>1129,76,77,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -229,7 +229,7 @@
+         </textarea>
+ 
+         <textarea name="audiochannels">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>1129,101,77,25</area>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -242,7 +242,7 @@
+         </textarea>
+ 
+         <textarea name="samplerate">
+-            <font>mediumblue</font>
++            <font>medium</font>
+             <area>1129,126,77,25</area>
+             <align>left,vcenter</align>
+         </textarea>
 @@ -252,8 +252,8 @@
      <window name="osd_message">
          <area>0,0,1280,720</area>
@@ -52,6 +178,21 @@
          </fontdef>
  
          <shape name="osd-status-backdrop">
+@@ -437,11 +437,11 @@
+         </textarea>
+ 
+         <textarea name="description">
+-            <area>90,658,1100,24</area>
++            <area>90,657,1100,24</area>
+             <font>small</font>
+             <align>allcenter</align>
+-            <template>%DESCRIPTION%
+-            %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template>
++            <template>%PLAYEDTIME% of %TOTALTIME%
++            %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template>
+         </textarea>
+ 
+         <clock name="clock">
 @@ -470,39 +470,39 @@
      <window name="program_info">
          <area>0,0,1280,720</area>