Mercurial > mplayer.hg
comparison gui/win32/skinload.c @ 36891:c5ee0fc2ec75
Print an information on deprecated skin config file entries.
There are several skin config file entries which oughtn't be used
any more, although they are still being supported.
Inform the user about these without being too annoying.
author | ib |
---|---|
date | Mon, 10 Mar 2014 17:15:24 +0000 |
parents | 8f38fea0b91b |
children | f50427ad9ff6 |
comparison
equal
deleted
inserted
replaced
36890:8f38fea0b91b | 36891:c5ee0fc2ec75 |
---|---|
26 #include <stdio.h> | 26 #include <stdio.h> |
27 #include <inttypes.h> | 27 #include <inttypes.h> |
28 #include <windows.h> | 28 #include <windows.h> |
29 | 29 |
30 #include "mp_msg.h" | 30 #include "mp_msg.h" |
31 #include "help_mp.h" | |
31 #include "cpudetect.h" | 32 #include "cpudetect.h" |
32 #include "libswscale/swscale.h" | 33 #include "libswscale/swscale.h" |
33 #include "libavutil/imgutils.h" | 34 #include "libavutil/imgutils.h" |
34 #include "gui.h" | 35 #include "gui.h" |
35 #include "gui/util/mem.h" | 36 #include "gui/util/mem.h" |
93 | 94 |
94 static const int evBoxs = sizeof(evNames) / sizeof(evName); | 95 static const int evBoxs = sizeof(evNames) / sizeof(evName); |
95 | 96 |
96 static int linenumber; | 97 static int linenumber; |
97 | 98 |
99 /** | |
100 * @brief Print a legacy information on an entry. | |
101 * | |
102 * @param old identifier (and deprecated entry) | |
103 * @param data pointer to additional data necessary for checking and | |
104 * to print the information on @a old | |
105 */ | |
106 static void skin_legacy (const char *old, const char *data) | |
107 { | |
108 const char *p; | |
109 | |
110 if (strcmp(old, "fontid") == 0) | |
111 { | |
112 p = strchr(data, ','); | |
113 | |
114 if (p) mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, p, "font = fontfile"); | |
115 } | |
116 else if (strcmp(old, "$l") == 0) | |
117 { | |
118 p = strstr(old, data); | |
119 | |
120 if (p && (p == data || p[-1] != '$')) mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, old, "$p"); | |
121 } | |
122 else if (strcmp(old, "evSetURL") == 0 && strcmp(data, old) == 0) | |
123 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, old, "evLoadURL"); | |
124 else if (strcmp(old, "sub") == 0) | |
125 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_SkinLegacy, linenumber, old, data); | |
126 } | |
127 | |
98 static char *geteventname(int event) | 128 static char *geteventname(int event) |
99 { | 129 { |
100 int i; | 130 int i; |
101 for(i=0; i<evBoxs; i++) | 131 for(i=0; i<evBoxs; i++) |
102 if(evNames[i].msg == event) | 132 if(evNames[i].msg == event) |
320 mywidget->msg = evNone; | 350 mywidget->msg = evNone; |
321 for (i=0; i<evBoxs; i++) | 351 for (i=0; i<evBoxs; i++) |
322 { | 352 { |
323 if(!strcmp(temp, evNames[i].name)) | 353 if(!strcmp(temp, evNames[i].name)) |
324 { | 354 { |
355 // legacy | |
356 skin_legacy("evSetURL", temp); | |
357 | |
325 mywidget->msg = evNames[i].msg; | 358 mywidget->msg = evNames[i].msg; |
326 break; | 359 break; |
327 } | 360 } |
328 } | 361 } |
329 | 362 |
352 mywidget->msg = evNone; | 385 mywidget->msg = evNone; |
353 for (i=0; i<evBoxs; i++) | 386 for (i=0; i<evBoxs; i++) |
354 { | 387 { |
355 if(!strcmp(temp, evNames[i].name)) | 388 if(!strcmp(temp, evNames[i].name)) |
356 { | 389 { |
390 // legacy | |
391 skin_legacy("evSetURL", temp); | |
392 | |
357 mywidget->msg = evNames[i].msg; | 393 mywidget->msg = evNames[i].msg; |
358 break; | 394 break; |
359 } | 395 } |
360 } | 396 } |
361 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] %s %s %i %i %s %i %f %i %i %i %i msg %i\n", | 397 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] %s %s %i %i %s %i %f %i %i %i %i msg %i\n", |
384 mywidget->msg = evNone; | 420 mywidget->msg = evNone; |
385 for (i=0; i<evBoxs; i++) | 421 for (i=0; i<evBoxs; i++) |
386 { | 422 { |
387 if(!strcmp(temp, evNames[i].name)) | 423 if(!strcmp(temp, evNames[i].name)) |
388 { | 424 { |
425 // legacy | |
426 skin_legacy("evSetURL", temp); | |
427 | |
389 mywidget->msg=evNames[i].msg; | 428 mywidget->msg=evNames[i].msg; |
390 break; | 429 break; |
391 } | 430 } |
392 } | 431 } |
393 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [POTMETER] %s %i %i %i %f %i %i msg %i\n", | 432 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [POTMETER] %s %i %i %i %f %i %i msg %i\n", |
411 mywidget->msg = evNone; | 450 mywidget->msg = evNone; |
412 for (i=0; i<evBoxs; i++) | 451 for (i=0; i<evBoxs; i++) |
413 { | 452 { |
414 if(!strcmp(temp, evNames[i].name)) | 453 if(!strcmp(temp, evNames[i].name)) |
415 { | 454 { |
455 // legacy | |
456 skin_legacy("evSetURL", temp); | |
457 | |
416 mywidget->msg = evNames[i].msg; | 458 mywidget->msg = evNames[i].msg; |
417 break; | 459 break; |
418 } | 460 } |
419 } | 461 } |
420 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [MENU] %i %i %i %i msg %i\n", | 462 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [MENU] %i %i %i %i msg %i\n", |
464 mywidget->font=skin->fonts[i]; | 506 mywidget->font=skin->fonts[i]; |
465 break; | 507 break; |
466 } | 508 } |
467 } | 509 } |
468 mywidget->label=strdup(findnextstring(temp, desc, &base)); | 510 mywidget->label=strdup(findnextstring(temp, desc, &base)); |
511 | |
512 // legacy | |
513 skin_legacy("$l", mywidget->label); | |
514 | |
469 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [DLABEL] %i %i %i %i %s \"%s\"\n", | 515 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [DLABEL] %i %i %i %i %s \"%s\"\n", |
470 mywidget->x, mywidget->y, mywidget->length, mywidget->align, mywidget->font->name, mywidget->label); | 516 mywidget->x, mywidget->y, mywidget->length, mywidget->align, mywidget->font->name, mywidget->label); |
471 } | 517 } |
472 free(temp); | 518 free(temp); |
473 } | 519 } |
621 if(!strncmp(desc + 7, "main", 4)) mywindow->type = wiMain; | 667 if(!strncmp(desc + 7, "main", 4)) mywindow->type = wiMain; |
622 else if(!strncmp(desc+7, "video", 5) || /* legacy */ !strncmp(desc+7, "sub", 3)) | 668 else if(!strncmp(desc+7, "video", 5) || /* legacy */ !strncmp(desc+7, "sub", 3)) |
623 { | 669 { |
624 mywindow->type = wiVideo; | 670 mywindow->type = wiVideo; |
625 mywindow->decoration = TRUE; | 671 mywindow->decoration = TRUE; |
672 // legacy | |
673 if (desc[7] == 's') skin_legacy("sub", "video"); | |
626 } | 674 } |
627 else if(!strncmp(desc + 7, "menu", 4)) mywindow->type = wiMenu; | 675 else if(!strncmp(desc + 7, "menu", 4)) mywindow->type = wiMenu; |
628 else if(!strncmp(desc + 7, "playbar", 7)) mywindow->type = wiPlaybar; | 676 else if(!strncmp(desc + 7, "playbar", 7)) mywindow->type = wiPlaybar; |
629 else mp_msg(MSGT_GPLAYER, MSGL_V, "[SKIN] warning found unknown windowtype"); | 677 else mp_msg(MSGT_GPLAYER, MSGL_V, "[SKIN] warning found unknown windowtype"); |
630 } | 678 } |
666 id = skin->fontcount; | 714 id = skin->fontcount; |
667 (skin->fontcount)++; | 715 (skin->fontcount)++; |
668 skin->fonts = realloc(skin->fonts, sizeof(font_t *) * skin->fontcount); | 716 skin->fonts = realloc(skin->fonts, sizeof(font_t *) * skin->fontcount); |
669 skin->fonts[id]=calloc(1, sizeof(font_t)); | 717 skin->fonts[id]=calloc(1, sizeof(font_t)); |
670 skin->fonts[id]->name = strdup(temp); | 718 skin->fonts[id]->name = strdup(temp); |
719 | |
720 // legacy | |
721 skin_legacy("fontid", desc); | |
722 | |
671 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [FONT] name \"%s\"\n", skin->fonts[id]->name); | 723 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [FONT] name \"%s\"\n", skin->fonts[id]->name); |
672 } | 724 } |
673 else | 725 else |
674 skin->addwidget(skin, mywindow, desc); | 726 skin->addwidget(skin, mywindow, desc); |
675 } | 727 } |