Mercurial > mplayer.hg

changeset 33099:0b17f6bed6fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't needlessly store font information in the wItems array There is no valuable information available and no such information is used anywhere. So remove the itFont item type.
author ib
date Fri, 01 Apr 2011 22:16:32 +0000
parents b61dff4c9a35
children 35efac3ece2c
files gui/app.h gui/skin/skin.c
diffstat 2 files changed, 1 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/gui/app.h	Fri Apr 01 21:23:50 2011 +0000
+++ b/gui/app.h	Fri Apr 01 22:16:32 2011 +0000
@@ -119,7 +119,6 @@
 #define itDLabel    105
 #define itBase      106
 #define itPotmeter  107
-#define itFont      108
 
 #define itPLMButton (itNone - 1)
 #define itPRMButton (itNone - 2)
--- a/gui/skin/skin.c	Fri Apr 01 21:23:50 2011 +0000
+++ b/gui/skin/skin.c	Fri Apr 01 22:16:32 2011 +0000
@@ -687,7 +687,6 @@
 static int cmd_font(char *in)
 {
     char fnt[256];
-    wItem *item;
 
     if (!window_cmd("font"))
         return 1;
@@ -699,15 +698,7 @@
 
     cutItem(in, fnt, ',', 0);   // Note: This seems needless but isn't for compatibility
                                 // reasons with a meanwhile depreciated second parameter.
-    item = next_item();
-
-    if (!item)
-        return 1;
-
-    item->type   = itFont;
-    item->fontid = fntRead(path, fnt);
-
-    switch (item->fontid) {
+    switch (fntRead(path, fnt)) {
     case -1:
         skin_error(MSGTR_SKIN_NotEnoughMemory);
         return 1;