[MPlayer-cvslog] r37006 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/ui/render.c gui/win32/widgetrender.c

[ib]

Author: ib
Date: Thu Mar 13 15:08:46 2014
New Revision: 37006

Log:
Add symbol character 'r' for dynamic label variable $a.

This is for audio having more than two channels.

Modified:
   trunk/gui/ui/render.c
   trunk/gui/win32/widgetrender.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/de/skin.xml
   trunk/DOCS/xml/en/skin.xml

Modified: trunk/gui/ui/render.c
==============================================================================
--- trunk/gui/ui/render.c	Thu Mar 13 12:23:56 2014	(r37005)
+++ trunk/gui/ui/render.c	Thu Mar 13 15:08:46 2014	(r37006)
@@ -178,6 +178,10 @@ calclengthmmmmss:
                 case 2:
                     av_strlcat(trbuf, "t", sizeof(trbuf));
                     break;
+
+                default:
+                    av_strlcat(trbuf, "r", sizeof(trbuf));
+                    break;
                 }
                 break;
 

Modified: trunk/gui/win32/widgetrender.c
==============================================================================
--- trunk/gui/win32/widgetrender.c	Thu Mar 13 12:23:56 2014	(r37005)
+++ trunk/gui/win32/widgetrender.c	Thu Mar 13 15:08:46 2014	(r37006)
@@ -158,7 +158,8 @@ static char *generatetextfromlabel(widge
 
     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");