Mercurial > mplayer.hg

changeset 33616:4221981ad74c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prefer playing variable $p to $l. $p is used in the Win32 GUI as well. Leave $l for legacy reasons. Revise skin documentation.
author ib
date Wed, 22 Jun 2011 13:10:23 +0000
parents 1f9a31d4f114
children c77bf171b354
files DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/ui/render.c
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/de/skin.xml	Wed Jun 22 12:53:30 2011 +0000
+++ b/DOCS/xml/de/skin.xml	Wed Jun 22 13:10:23 2011 +0000
@@ -695,7 +695,7 @@
                     </entry>
                   </row>
                   <row>
-                    <entry>$l</entry>
+                    <entry>$p</entry>
                     <entry>
                       Buchstabe <keycap>p</keycap> (wenn ein Film abgespielt wird)
                     </entry>
@@ -735,7 +735,7 @@
 
       <note>
         <para>
-          Die Variablen <literal>$a, $T, $l, $s</literal> und <literal>$e</literal>
+          Die Variablen <literal>$a, $T, $p, $s</literal> und <literal>$e</literal>
           geben Buchstaben zurück, die als spezielle Symbole angezeigt werden sollen
           (zum Beispiel steht <keycap>e</keycap> für das Pause-Symbol, welches gewöhnlich
           etwa so || aussieht).
--- a/DOCS/xml/en/skin.xml	Wed Jun 22 12:53:30 2011 +0000
+++ b/DOCS/xml/en/skin.xml	Wed Jun 22 13:10:23 2011 +0000
@@ -582,7 +582,7 @@
     </entry>
   </row>
   <row>
-    <entry>$l</entry>
+    <entry>$p</entry>
     <entry>the <keycap>p</keycap> character (if a movie is playing)</entry>
   </row>
   <row>
@@ -610,7 +610,7 @@
   </informaltable>
 
   <note><para>
-  The <literal>$a, $T, $l, $s</literal> and <literal>$e</literal>
+  The <literal>$a, $T, $p, $s</literal> and <literal>$e</literal>
   variables all return characters that should be displayed as special symbols
   (for example, <keycap>e</keycap> is for the pause symbol that usually looks
   something like ||). You should have a font for normal characters and
--- a/gui/ui/render.c	Wed Jun 22 12:53:30 2011 +0000
+++ b/gui/ui/render.c	Wed Jun 22 13:10:23 2011 +0000
@@ -234,7 +234,8 @@
                     av_strlcat(trbuf, "s", sizeof(trbuf));
                 break;
 
-            case 'l':
+            case 'l': // legacy
+            case 'p':
                 if (guiInfo.Playing == GUI_PLAY)
                     av_strlcat(trbuf, "p", sizeof(trbuf));
                 break;