[MPlayer-cvslog] r36983 - in trunk/gui/win32: skinload.c skinload.h

[ib]

Author: ib
Date: Sat Mar  8 19:31:29 2014
New Revision: 36983

Log:
Remove needless fontid from Win32 GUI.

It isn't used anywhere and has been removed
from the X11/GTK GUI in r32827.

Modified:
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Fri Mar  7 19:29:27 2014	(r36982)
+++ trunk/gui/win32/skinload.c	Sat Mar  8 19:31:29 2014	(r36983)
@@ -233,7 +233,6 @@ static void freeskin(skin_t *skin)
         unsigned int x;
 
         nfree(skin->fonts[i]->name);
-        nfree(skin->fonts[i]->id);
 
         for (x=0; x<skin->fonts[i]->charcount; x++)
             nfree(skin->fonts[i]->chars[x]);
@@ -659,20 +658,8 @@ skin_t* loadskin(char* skindir, int desk
         }
         else if(!strncmp(desc, "font", 4))
         {
-            unsigned int i;
             int id = 0;
             char temp[MAX_LINESIZE];
-            int base = counttonextchar(desc, '=')+1;
-            findnextstring(temp, desc, &base);
-            findnextstring(temp, desc, &base);
-            for (i=0; i<skin->fontcount; i++)
-                if(!strcmp(skin->fonts[i]->id, temp))
-                {
-                    id = i;
-                    break;
-                }
-            if(!id)
-            {
                 int base = counttonextchar(desc, '=') + 1;
                 findnextstring(temp, desc, &base);
                 id = skin->fontcount;
@@ -680,9 +667,7 @@ skin_t* loadskin(char* skindir, int desk
                 skin->fonts = realloc(skin->fonts, sizeof(font_t *) * skin->fontcount);
                 skin->fonts[id]=calloc(1, sizeof(font_t));
                 skin->fonts[id]->name = strdup(temp);
-                skin->fonts[id]->id = strdup(findnextstring(temp, desc, &base));
-            }
-            mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [FONT] id  \"%s\" name \"%s\"\n", skin->fonts[id]->name, skin->fonts[id]->id);
+            mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [FONT] name \"%s\"\n", skin->fonts[id]->name);
         }
         else
             skin->addwidget(skin, mywindow, desc);

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Fri Mar  7 19:29:27 2014	(r36982)
+++ trunk/gui/win32/skinload.h	Sat Mar  8 19:31:29 2014	(r36983)
@@ -45,7 +45,6 @@ typedef struct
 typedef struct
 {
     char *name;
-    char *id;
     image *image;
     unsigned int charcount;
     char_t **chars;