[MPlayer-cvslog] r33186 - in trunk/gui: app.h skin/skin.c

[ib]

Author: ib
Date: Sat Apr  2 00:16:32 2011
New Revision: 33186

Log:
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.

Modified:
   trunk/gui/app.h
   trunk/gui/skin/skin.c

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Fri Apr  1 23:23:50 2011	(r33185)
+++ trunk/gui/app.h	Sat Apr  2 00:16:32 2011	(r33186)
@@ -119,7 +119,6 @@ typedef struct {
 #define itDLabel    105
 #define itBase      106
 #define itPotmeter  107
-#define itFont      108
 
 #define itPLMButton (itNone - 1)
 #define itPRMButton (itNone - 2)

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Fri Apr  1 23:23:50 2011	(r33185)
+++ trunk/gui/skin/skin.c	Sat Apr  2 00:16:32 2011	(r33186)
@@ -687,7 +687,6 @@ static int cmd_potmeter(char *in)
 static int cmd_font(char *in)
 {
     char fnt[256];
-    wItem *item;
 
     if (!window_cmd("font"))
         return 1;
@@ -699,15 +698,7 @@ static int cmd_font(char *in)
 
     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;