Mercurial > mplayer.hg

changeset 36914:1db578946152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new dynamic label variable $D. This is the balance without decimal places (which makes more sense to me than $B and should have been the output of $B in the first place).
author ib
date Thu, 13 Mar 2014 15:41:22 +0000
parents 9d89aa330d63
children 91ec74c16463
files DOCS/xml/cs/skin.xml DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml DOCS/xml/es/skin.xml DOCS/xml/fr/skin.xml DOCS/xml/hu/skin.xml DOCS/xml/pl/skin.xml DOCS/xml/ru/skin.xml gui/ui/render.c gui/win32/widgetrender.c
diffstat 10 files changed, 38 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/cs/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/cs/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -577,6 +577,10 @@
     <entry>stereováha ve formátu <emphasis>xxx.x</emphasis></entry>
   </row>
   <row>
+    <entry>$D</entry>
+    <entry>stereováha ve formátu <emphasis>xxx</emphasis></entry>
+  </row>
+  <row>
     <entry>$$</entry>
     <entry>znak $</entry>
   </row>
--- a/DOCS/xml/de/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/de/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -666,6 +666,10 @@
                     <entry>Balance in Format <emphasis>xxx.x</emphasis></entry>
                   </row>
                   <row>
+                    <entry>$D</entry>
+                    <entry>Balance im Format <emphasis>xxx</emphasis></entry>
+                  </row>
+                  <row>
                     <entry>$$</entry>
                     <entry><literal>$</literal>-Zeichen</entry>
                   </row>
--- a/DOCS/xml/en/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/en/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -553,6 +553,10 @@
     <entry>balance in <emphasis>xxx.x</emphasis> format</entry>
   </row>
   <row>
+    <entry>$D</entry>
+    <entry>balance in <emphasis>xxx</emphasis> format</entry>
+  </row>
+  <row>
     <entry>$$</entry>
     <entry>the $ character</entry>
   </row>
--- a/DOCS/xml/es/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/es/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -558,6 +558,10 @@
 <entry>balance en formato <emphasis>xxx.x</emphasis></entry>
 </row>
 <row>
+<entry>$D</entry>
+<entry>balance en formato <emphasis>xxx</emphasis></entry>
+</row>
+<row>
 <entry>$$</entry>
 <entry>el caracter $</entry>
 </row>
--- a/DOCS/xml/fr/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/fr/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -539,6 +539,10 @@
 <entry>balance au format <emphasis>xxx.x</emphasis></entry>
 </row>
 <row>
+<entry>$D</entry>
+<entry>balance au format <emphasis>xxx</emphasis></entry>
+</row>
+<row>
 <entry>$$</entry>
 <entry>le caractère $</entry>
 </row>
--- a/DOCS/xml/hu/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/hu/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -548,6 +548,10 @@
     <entry>balansz <emphasis>xxx.x</emphasis> formátumban</entry>
   </row>
   <row>
+    <entry>$D</entry>
+    <entry>balansz <emphasis>xxx</emphasis> formátumban</entry>
+  </row>
+  <row>
     <entry>$$</entry>
     <entry>az $ karakter</entry>
   </row>
--- a/DOCS/xml/pl/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/pl/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -551,6 +551,10 @@
 <entry>format balansu <emphasis>xxx.x</emphasis></entry>
 </row>
 <row>
+<entry>$D</entry>
+<entry>format balansu <emphasis>xxx</emphasis></entry>
+</row>
+<row>
 <entry>$$</entry>
 <entry>znak $</entry>
 </row>
--- a/DOCS/xml/ru/skin.xml	Thu Mar 13 14:57:47 2014 +0000
+++ b/DOCS/xml/ru/skin.xml	Thu Mar 13 15:41:22 2014 +0000
@@ -580,6 +580,10 @@
     <entry>баланс в формате <emphasis>xxx.x</emphasis></entry>
   </row>
   <row>
+    <entry>$D</entry>
+    <entry>баланс в формате <emphasis>xxx</emphasis></entry>
+  </row>
+  <row>
     <entry>$$</entry>
     <entry>символ $</entry>
   </row>
--- a/gui/ui/render.c	Thu Mar 13 14:57:47 2014 +0000
+++ b/gui/ui/render.c	Thu Mar 13 15:41:22 2014 +0000
@@ -134,6 +134,11 @@
                 av_strlcat(trbuf, tmp, sizeof(trbuf));
                 break;
 
+            case 'D':
+                snprintf(tmp, sizeof(tmp), "%3.0f", guiInfo.Balance);
+                av_strlcat(trbuf, tmp, sizeof(trbuf));
+                break;
+
             case 'x':
                 snprintf(tmp, sizeof(tmp), "%d", guiInfo.VideoWidth);
                 av_strlcat(trbuf, tmp, sizeof(trbuf));
--- a/gui/win32/widgetrender.c	Thu Mar 13 14:57:47 2014 +0000
+++ b/gui/win32/widgetrender.c	Thu Mar 13 15:41:22 2014 +0000
@@ -142,6 +142,7 @@
     stringreplace(text, "$V", "%3.1f", guiInfo.Volume);
     stringreplace(text, "$b", "%3.2f%%", guiInfo.Balance);
     stringreplace(text, "$B", "%3.1f", guiInfo.Balance);
+    stringreplace(text, "$D", "%3.0f", guiInfo.Balance);
     stringreplace(text, "$t", "%.2i", guiInfo.Track);
     stringreplace(text, "$o", "%s", acp(TranslateFilename(0, tmp, sizeof(tmp))));
     stringreplace(text, "$x", "%i", guiInfo.VideoWidth);