Mercurial > mplayer.hg
changeset 36887:2b3ede5f8424
Remove needless fontid from Win32 GUI.
It isn't used anywhere and has been removed
from the X11/GTK GUI in r32827.
| author | ib |
|---|---|
| date | Sat, 08 Mar 2014 18:31:29 +0000 |
| parents | 590e9305f12c |
| children | 47c6c14f386b |
| files | gui/win32/skinload.c gui/win32/skinload.h |
| diffstat | 2 files changed, 1 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/win32/skinload.c Fri Mar 07 18:29:27 2014 +0000 +++ b/gui/win32/skinload.c Sat Mar 08 18:31:29 2014 +0000 @@ -233,7 +233,6 @@ 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 @@ } 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->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);