Mercurial > mplayer.hg

changeset 36916:d41fbe8a8797

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new dynamic label variable $U. This is the volume without decimal places (which makes more sense to me than $V and should have been the output of $V in the first place).
author ib
date Thu, 13 Mar 2014 15:51:42 +0000
parents 91ec74c16463
children 0dfa0ecb10f4
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 15:42:10 2014 +0000
+++ b/DOCS/xml/cs/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -569,6 +569,10 @@
     <entry>hlasitost ve formátu <emphasis>xxx.x</emphasis></entry>
   </row>
   <row>
+    <entry>$U</entry>
+    <entry>hlasitost ve formátu <emphasis>xxx</emphasis></entry>
+  </row>
+  <row>
     <entry>$b</entry>
     <entry>stereováha ve formátu <emphasis>xxx.xx</emphasis>%</entry>
   </row>
--- a/DOCS/xml/de/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/de/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -658,6 +658,10 @@
                     <entry>Lautstärke im Format <emphasis>xxx.x</emphasis></entry>
                   </row>
                   <row>
+                    <entry>$U</entry>
+                    <entry>Lautstärke im Format <emphasis>xxx</emphasis></entry>
+                  </row>
+                  <row>
                     <entry>$b</entry>
                     <entry>Balance im Format <emphasis>xxx.xx</emphasis>%</entry>
                   </row>
--- a/DOCS/xml/en/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/en/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -545,6 +545,10 @@
     <entry>volume in <emphasis>xxx.x</emphasis> format</entry>
   </row>
   <row>
+    <entry>$U</entry>
+    <entry>volume in <emphasis>xxx</emphasis> format</entry>
+  </row>
+  <row>
     <entry>$b</entry>
     <entry>balance in <emphasis>xxx.xx</emphasis>% format</entry>
   </row>
--- a/DOCS/xml/es/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/es/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -550,6 +550,10 @@
 <entry>volumen en formato <emphasis>xxx.x</emphasis></entry>
 </row>
 <row>
+<entry>$U</entry>
+<entry>volumen en formato <emphasis>xxx</emphasis></entry>
+</row>
+<row>
 <entry>$b</entry>
 <entry>balance en formato <emphasis>xxx.xx</emphasis>%</entry>
 </row>
--- a/DOCS/xml/fr/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/fr/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -531,6 +531,10 @@
 <entry>volume au format <emphasis>xxx.x</emphasis></entry>
 </row>
 <row>
+<entry>$U</entry>
+<entry>volume au format <emphasis>xxx</emphasis></entry>
+</row>
+<row>
 <entry>$b</entry>
 <entry>balance au format <emphasis>xxx.xx</emphasis>%</entry>
 </row>
--- a/DOCS/xml/hu/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/hu/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -540,6 +540,10 @@
     <entry>hangerő <emphasis>xxx.x</emphasis> formátumban</entry>
   </row>
   <row>
+    <entry>$U</entry>
+    <entry>hangerő <emphasis>xxx</emphasis> formátumban</entry>
+  </row>
+  <row>
     <entry>$b</entry>
     <entry>balansz <emphasis>xxx.xx</emphasis>% formátumban</entry>
   </row>
--- a/DOCS/xml/pl/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/pl/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -543,6 +543,10 @@
 <entry>format głośności <emphasis>xxx.x</emphasis> format</entry>
 </row>
 <row>
+<entry>$U</entry>
+<entry>format głośności <emphasis>xxx</emphasis> format</entry>
+</row>
+<row>
 <entry>$b</entry>
 <entry>format balansu w %<emphasis>xxx.xx</emphasis></entry>
 </row>
--- a/DOCS/xml/ru/skin.xml	Thu Mar 13 15:42:10 2014 +0000
+++ b/DOCS/xml/ru/skin.xml	Thu Mar 13 15:51:42 2014 +0000
@@ -572,6 +572,10 @@
     <entry>кромкость в формате <emphasis>xxx.x</emphasis></entry>
   </row>
   <row>
+    <entry>$U</entry>
+    <entry>кромкость в формате <emphasis>xxx</emphasis></entry>
+  </row>
+  <row>
     <entry>$b</entry>
     <entry>баланс в формате <emphasis>xxx.xx</emphasis>%</entry>
   </row>
--- a/gui/ui/render.c	Thu Mar 13 15:42:10 2014 +0000
+++ b/gui/ui/render.c	Thu Mar 13 15:51:42 2014 +0000
@@ -124,6 +124,11 @@
                 av_strlcat(trbuf, tmp, sizeof(trbuf));
                 break;
 
+            case 'U':
+                snprintf(tmp, sizeof(tmp), "%3.0f", guiInfo.Volume);
+                av_strlcat(trbuf, tmp, sizeof(trbuf));
+                break;
+
             case 'b':
                 snprintf(tmp, sizeof(tmp), "%3.2f%%", guiInfo.Balance);
                 av_strlcat(trbuf, tmp, sizeof(trbuf));
--- a/gui/win32/widgetrender.c	Thu Mar 13 15:42:10 2014 +0000
+++ b/gui/win32/widgetrender.c	Thu Mar 13 15:51:42 2014 +0000
@@ -140,6 +140,7 @@
                  (guiInfo.ElapsedTime / 60) % 60, guiInfo.ElapsedTime % 60);
     stringreplace(text, "$v", "%3.2f%%", guiInfo.Volume);
     stringreplace(text, "$V", "%3.1f", guiInfo.Volume);
+    stringreplace(text, "$U", "%3.0f", guiInfo.Volume);
     stringreplace(text, "$b", "%3.2f%%", guiInfo.Balance);
     stringreplace(text, "$B", "%3.1f", guiInfo.Balance);
     stringreplace(text, "$D", "%3.0f", guiInfo.Balance);