# HG changeset patch
# User ib
# Date 1396619757 0
# Node ID 7694f4226420a4979cf85d64d23803fda8e68925
# Parent  c9d36530a55bfcee4a7ffe021bb6f1cd68675dda
Make the current item string as currItem global.

Utilize this variable instead of using string constants.

This allows naming the particular potmeter now.

diff -r c9d36530a55b -r 7694f4226420 gui/skin/skin.c
--- a/gui/skin/skin.c	Fri Apr 04 13:16:53 2014 +0000
+++ b/gui/skin/skin.c	Fri Apr 04 13:55:57 2014 +0000
@@ -49,6 +49,7 @@
 static guiItems *skin;
 
 static int linenumber;
+static unsigned char currItem[32];
 static unsigned char path[512];
 
 static unsigned char currWinName[32];
@@ -182,7 +183,7 @@
 static int item_section(char *in)
 {
     if (skin) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorItem, "section");
+        skin_error(MSGTR_GUI_MSG_SkinErrorItem, currItem);
         return 1;
     }
 
@@ -193,7 +194,7 @@
         return 1;
     }
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]  section: %s\n", in);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]  %s: %s\n", currItem, in);
 
     return 0;
 }
@@ -221,10 +222,10 @@
         name  = "section";
     }
 
-    if (!section_item("end"))
+    if (!section_item(currItem))
         return 1;
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]  %send (%s)\n", space, name);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]  %s%s (%s)\n", space, currItem, name);
 
     if (currWinName[0]) {
         currWinName[0] = 0;
@@ -248,11 +249,11 @@
  */
 static int item_window(char *in)
 {
-    if (!section_item("window"))
+    if (!section_item(currItem))
         return 1;
 
     if (currWinName[0]) {
-        skin_error(MSGTR_GUI_MSG_SkinErrorItem, "window");
+        skin_error(MSGTR_GUI_MSG_SkinErrorItem, currItem);
         return 1;
     }
 
@@ -287,7 +288,7 @@
 
     av_strlcpy(currWinName, in, sizeof(currWinName));
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]   window: %s\n", currWinName);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]   %s: %s\n", currItem, currWinName);
 
     return 0;
 }
@@ -309,7 +310,7 @@
     int w = 0, h = 0;
     int is_video, is_bar, is_menu;
 
-    if (!window_item("base"))
+    if (!window_item(currItem))
         return 1;
 
     is_video = (strcmp(currWinName, "video") == 0);
@@ -388,7 +389,7 @@
  */
 static int item_background(char *in)
 {
-    if (!window_item("background"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("main"))
@@ -402,7 +403,7 @@
     currWin->G = cutInt(in, ',', 1);
     currWin->B = cutInt(in, ',', 2);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    background color: #%02x%02x%02x\n", currWin->R, currWin->G, currWin->B);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s color: #%02x%02x%02x\n", currItem, currWin->R, currWin->G, currWin->B);
 
     return 0;
 }
@@ -424,7 +425,7 @@
     char msg[32];
     guiItem *item;
 
-    if (!window_item("button"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -449,7 +450,7 @@
     else
         skin_legacy("evSetURL", msg);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    button image: %s %d,%d\n", fname, x, y);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s image: %s %d,%d\n", currItem, fname, x, y);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     message: %s (#%d)\n", msg, message);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     size: %dx%d\n", w, h);
 
@@ -496,9 +497,9 @@
 static int item_selected(char *in)
 {
     unsigned char file[512];
-    guiItem *currItem;
+    guiItem *item;
 
-    if (!window_item("selected"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("main"))
@@ -508,21 +509,21 @@
     if (in_window("playbar"))
         return 1;
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    image selected: %s\n", in);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    image %s: %s\n", currItem, in);
 
-    currItem       = &skin->menuSelected;
-    currItem->type = itBase;
+    item       = &skin->menuSelected;
+    item->type = itBase;
 
     av_strlcpy(file, path, sizeof(file));
     av_strlcat(file, in, sizeof(file));
 
-    if (skinImageRead(file, &currItem->Bitmap) != 0)
+    if (skinImageRead(file, &item->Bitmap) != 0)
         return 1;
 
-    currItem->width  = currItem->Bitmap.Width;
-    currItem->height = currItem->Bitmap.Height;
+    item->width  = item->Bitmap.Width;
+    item->height = item->Bitmap.Height;
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     bitmap: %dx%d\n", currItem->width, currItem->height);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     bitmap: %dx%d\n", item->width, item->height);
 
     return 0;
 }
@@ -542,7 +543,7 @@
     char msg[32];
     guiItem *item;
 
-    if (!window_item("menu"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("main"))
@@ -605,7 +606,7 @@
     unsigned char buf[512];
     int bwidth, bheight, num, d, x, y, w, h, message;
 
-    if (!window_item("h/v potmeter"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -640,7 +641,7 @@
     else
         skin_legacy("evSetURL", buf);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    h/v potmeter image: %s %d,%d %dx%d\n", phfname, x, y, w, h);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s image: %s %d,%d %dx%d\n", currItem, phfname, x, y, w, h);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     button image: %s %dx%d\n", bfname, bwidth, bheight);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     numphases: %d, default: %d%%\n", num, d);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     message: %s (#%d)\n", buf, message);
@@ -670,7 +671,7 @@
         if (skinImageRead(buf, &item->Bitmap) != 0)
             return 1;
 
-        mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     (potmeter bitmap: %ux%u)\n", item->Bitmap.Width, item->Bitmap.Height);
+        mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     (%s bitmap: %ux%u)\n", currItem, item->Bitmap.Width, item->Bitmap.Height);
     }
 
     item->Mask.Image = NULL;
@@ -750,7 +751,7 @@
     char param[256];
 
     // legacy
-    skin_legacy("potmeter", "hpotmeter");
+    skin_legacy(currItem, "hpotmeter");
 
     snprintf(param, sizeof(param), "NULL,0,0,%s", in);
 
@@ -773,7 +774,7 @@
     int num, d, x, y, w, h, message;
     guiItem *item;
 
-    if (!window_item("pimage"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -805,7 +806,7 @@
     else
         skin_legacy("evSetURL", buf);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    pimage image: %s %d,%d %dx%d\n", phfname, x, y, w, h);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s image: %s %d,%d %dx%d\n", currItem, phfname, x, y, w, h);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     numphases: %d, default: %d%%\n", num, d);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     message: %s (#%d)\n", buf, message);
 
@@ -856,7 +857,7 @@
 {
     char fnt[256];
 
-    if (!window_item("font"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -887,7 +888,7 @@
         return 1;
     }
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    font: %s (#%d)\n", fnt, fntFindID(fnt));
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s: %s (#%d)\n", currItem, fnt, fntFindID(fnt));
 
     return 0;
 }
@@ -908,7 +909,7 @@
     char txt[256];
     guiItem *item;
 
-    if (!window_item("slabel"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -922,7 +923,7 @@
     cutStr(in, txt, ',', 3);
     cutStr(txt, txt, '"', 1);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    slabel: \"%s\"\n", txt);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s: \"%s\"\n", currItem, txt);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     pos: %d,%d\n", x, y);
 
     id = fntFindID(fnt);
@@ -971,7 +972,7 @@
     char txt[256];
     guiItem *item;
 
-    if (!window_item("dlabel"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -990,7 +991,7 @@
     // legacy
     skin_legacy("$l", txt);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    dlabel: \"%s\"\n", txt);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s: \"%s\"\n", currItem, txt);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     pos: %d,%d\n", x, y);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     width: %d, align: %d\n", w, a);
 
@@ -1036,7 +1037,7 @@
  */
 static int item_decoration(char *in)
 {
-    if (!window_item("decoration"))
+    if (!window_item(currItem))
         return 1;
 
     if (in_window("video"))
@@ -1055,7 +1056,7 @@
 
     skin->mainDecoration = (strcmp(in, "enable") == 0);
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    decoration: %s\n", in);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s: %s\n", currItem, in);
 
     return 0;
 }
@@ -1151,7 +1152,6 @@
     char *skinfname;
     FILE *skinfile;
     unsigned char line[256];
-    unsigned char item[32];
     unsigned char param[256];
     unsigned int i;
 
@@ -1184,12 +1184,12 @@
         if (!*line)
             continue;
 
-        cutStr(line, item, '=', 0);
+        cutStr(line, currItem, '=', 0);
         cutStr(line, param, '=', 1);
-        strlower(item);
+        strlower(currItem);
 
         for (i = 0; i < FF_ARRAY_ELEMS(skinItem); i++) {
-            if (!strcmp(item, skinItem[i].name)) {
+            if (!strcmp(currItem, skinItem[i].name)) {
                 if (skinItem[i].func(param) != 0) {
                     fclose(skinfile);
                     return -2;
@@ -1199,7 +1199,7 @@
         }
 
         if (i == FF_ARRAY_ELEMS(skinItem)) {
-            skin_error(MSGTR_GUI_MSG_SkinUnknownItem, item);
+            skin_error(MSGTR_GUI_MSG_SkinUnknownItem, currItem);
             fclose(skinfile);
             return -2;
         }