diff gui/skin/skin.c @ 33555:c5a19bbeac2b

Cosmetic: Rename some GUI variables and functions. The new names are more intelligible and consistent. List of changes: guiIntfStruct -> guiInfo appMPlayer -> guiApp txSample -> guiImage (and member BPP -> Bpp) mplDrawBuffer -> mainDrawBuffer mplPBDrawBuffer -> playbarDrawBuffer mplMenuDrawBuffer -> menuDrawBuffer mpl.* -> ui.* (or mpl dropped) .*bar.* -> .*playbar.* URLItem -> urlItem ChangeSkin -> uiChangeSkin Convert32to1 -> bpRenderMask

--- a/gui/skin/skin.c	Sat Jun 18 10:33:30 2011 +0000
+++ b/gui/skin/skin.c	Sat Jun 18 14:33:41 2011 +0000
@@ -90,7 +90,7 @@
     return 0;
 }
 
-int skinBPRead(char *fname, txSample *bf)
+int skinBPRead(char *fname, guiImage *bf)
 {
     int i = bpRead(fname, bf);
 
@@ -137,7 +137,7 @@
     }
 
     if (!strcmp(strlower(in), "movieplayer"))
-        skin = &appMPlayer;
+        skin = &guiApp;
     else {
         skin_error(MSGTR_SKIN_UNKNOWN_NAME, in);
         return 1;
@@ -203,9 +203,9 @@
         currWinItemIdx = NULL;
         currWinItems   = NULL;
     } else if (strcmp(in, "playbar") == 0) {
-        currWin = &skin->bar;
-        currWinItemIdx = &skin->IndexOfBarItems;
-        currWinItems   = skin->barItems;
+        currWin = &skin->playbar;
+        currWinItemIdx = &skin->IndexOfPlaybarItems;
+        currWinItems   = skin->playbarItems;
     } else if (strcmp(in, "menu") == 0) {
         currWin = &skin->menu;
         currWinItemIdx = &skin->IndexOfMenuItems;
@@ -277,7 +277,7 @@
 
     if (!is_sub) {
 #ifdef CONFIG_XSHAPE
-        if (!Convert32to1(&currWin->Bitmap, &currWin->Mask)) {
+        if (!bpRenderMask(&currWin->Bitmap, &currWin->Mask)) {
             skin_error(MSGTR_SKIN_NotEnoughMemory);
             return 1;
         }
@@ -288,7 +288,7 @@
     }
 
     if (is_bar)
-        skin->barIsPresent = 1;
+        skin->playbarIsPresent = 1;
     if (is_menu)
         skin->menuIsPresent = 1;