Mercurial > mplayer.hg

changeset 36910:11932adad7a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add symbol character 'r' for dynamic label variable $a. This is for audio having more than two channels.
author ib
date Thu, 13 Mar 2014 14:08:46 +0000
parents 1548470f45f8
children 7fea799f350c
files DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/ui/render.c gui/win32/widgetrender.c
diffstat 4 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/de/skin.xml	Thu Mar 13 11:23:56 2014 +0000
+++ b/DOCS/xml/de/skin.xml	Thu Mar 13 14:08:46 2014 +0000
@@ -673,7 +673,7 @@
                     <entry>$a</entry>
                     <entry>
                       Buchstabe entsprechend dem Audio-Typ (Nichts: <keycap>n</keycap>,
-                      Mono: <keycap>m</keycap>, Stereo: <keycap>t</keycap>)
+                      Mono: <keycap>m</keycap>, Stereo: <keycap>t</keycap>, Surround: <keycap>r</keycap>)
                     </entry>
                   </row>
                   <row>
@@ -922,6 +922,7 @@
             <row><entry><keycap>n</keycap></entry><entry>Kein Sound</entry></row>
             <row><entry><keycap>m</keycap></entry><entry>Mono-Sound</entry></row>
             <row><entry><keycap>t</keycap></entry><entry>Stereo-Sound</entry></row>
+            <row><entry><keycap>r</keycap></entry><entry>Surround-Sound</entry></row>
             <row><entry><keycap>f</keycap></entry><entry>Stream ist eine Datei</entry></row>
             <row><entry><keycap>a</keycap></entry><entry>Stream ist eine CD</entry></row>
             <row><entry><keycap>v</keycap></entry><entry>Stream ist eine Video-CD</entry></row>
--- a/DOCS/xml/en/skin.xml	Thu Mar 13 11:23:56 2014 +0000
+++ b/DOCS/xml/en/skin.xml	Thu Mar 13 14:08:46 2014 +0000
@@ -559,7 +559,7 @@
   <row>
     <entry>$a</entry>
     <entry>a character according to the audio type (none: <keycap>n</keycap>,
-    mono: <keycap>m</keycap>, stereo: <keycap>t</keycap>)</entry>
+    mono: <keycap>m</keycap>, stereo: <keycap>t</keycap>, surround: <keycap>r</keycap>)</entry>
   </row>
   <row>
     <entry>$t</entry>
@@ -790,6 +790,7 @@
   <row><entry><keycap>n</keycap></entry><entry>no sound</entry></row>
   <row><entry><keycap>m</keycap></entry><entry>mono sound</entry></row>
   <row><entry><keycap>t</keycap></entry><entry>stereo sound</entry></row>
+  <row><entry><keycap>r</keycap></entry><entry>surround sound</entry></row>
   <row><entry><keycap>f</keycap></entry><entry>stream is a file</entry></row>
   <row><entry><keycap>a</keycap></entry><entry>stream is a CD</entry></row>
   <row><entry><keycap>v</keycap></entry><entry>stream is a Video CD</entry></row>
--- a/gui/ui/render.c	Thu Mar 13 11:23:56 2014 +0000
+++ b/gui/ui/render.c	Thu Mar 13 14:08:46 2014 +0000
@@ -178,6 +178,10 @@
                 case 2:
                     av_strlcat(trbuf, "t", sizeof(trbuf));
                     break;
+
+                default:
+                    av_strlcat(trbuf, "r", sizeof(trbuf));
+                    break;
                 }
                 break;
 
--- a/gui/win32/widgetrender.c	Thu Mar 13 11:23:56 2014 +0000
+++ b/gui/win32/widgetrender.c	Thu Mar 13 14:08:46 2014 +0000
@@ -158,7 +158,8 @@
 
     if(guiInfo.AudioChannels == 0) stringreplace(text, "$a", "n");
     else if(guiInfo.AudioChannels == 1) stringreplace(text, "$a", "m");
-    else stringreplace(text, "$a", "t");
+    else if(guiInfo.AudioChannels == 2) stringreplace(text, "$a", "t");
+    else stringreplace(text, "$a", "r");
 
     if(guiInfo.StreamType == 0)
         stringreplace(text, "$T", "f");