[MPlayer-cvslog] r34057 - in trunk/gui/skin: font.c skin.c skin.h

[ib]

Author: ib
Date: Mon Sep  5 18:00:37 2011
New Revision: 34057

Log:
Cosmetic: Rename skinBPRead() skinImageRead().

Additionally, rename parameter bf img.

Modified:
   trunk/gui/skin/font.c
   trunk/gui/skin/skin.c
   trunk/gui/skin/skin.h

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Mon Sep  5 17:47:55 2011	(r34056)
+++ trunk/gui/skin/font.c	Mon Sep  5 18:00:37 2011	(r34057)
@@ -156,7 +156,7 @@ int fntRead(char *path, char *fname)
 
             mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[font] image file: %s\n", buf);
 
-            if (skinBPRead(buf, &Fonts[id]->Bitmap) != 0) {
+            if (skinImageRead(buf, &Fonts[id]->Bitmap) != 0) {
                 bpFree(&Fonts[id]->Bitmap);
                 nfree(Fonts[id]);
                 fclose(f);

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Mon Sep  5 17:47:55 2011	(r34056)
+++ trunk/gui/skin/skin.c	Mon Sep  5 18:00:37 2011	(r34057)
@@ -133,9 +133,9 @@ static int in_window(char *name)
  *
  * @return return code of #bpRead()
  */
-int skinBPRead(char *fname, guiImage *bf)
+int skinImageRead(char *fname, guiImage *img)
 {
-    int i = bpRead(fname, bf);
+    int i = bpRead(fname, img);
 
     switch (i) {
     case -1:
@@ -340,7 +340,7 @@ static int item_base(char *in)
     av_strlcpy(file, path, sizeof(file));
     av_strlcat(file, fname, sizeof(file));
 
-    if (skinBPRead(file, &currWin->Bitmap) != 0)
+    if (skinImageRead(file, &currWin->Bitmap) != 0)
         return 1;
 
     currWin->width  = currWin->Bitmap.Width;
@@ -470,7 +470,7 @@ static int item_button(char *in)
         av_strlcpy(file, path, sizeof(file));
         av_strlcat(file, fname, sizeof(file));
 
-        if (skinBPRead(file, &item->Bitmap) != 0)
+        if (skinImageRead(file, &item->Bitmap) != 0)
             return 1;
 
         mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     (bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
@@ -511,7 +511,7 @@ static int item_selected(char *in)
     av_strlcpy(file, path, sizeof(file));
     av_strlcat(file, in, sizeof(file));
 
-    if (skinBPRead(file, &currItem->Bitmap) != 0)
+    if (skinImageRead(file, &currItem->Bitmap) != 0)
         return 1;
 
     currItem->width  = currItem->Bitmap.Width;
@@ -652,7 +652,7 @@ static int item_hpotmeter(char *in)
         av_strlcpy(buf, path, sizeof(buf));
         av_strlcat(buf, phfname, sizeof(buf));
 
-        if (skinBPRead(buf, &item->Bitmap) != 0)
+        if (skinImageRead(buf, &item->Bitmap) != 0)
             return 1;
 
         mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     (potmeter bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);
@@ -664,7 +664,7 @@ static int item_hpotmeter(char *in)
         av_strlcpy(buf, path, sizeof(buf));
         av_strlcat(buf, pfname, sizeof(buf));
 
-        if (skinBPRead(buf, &item->Mask) != 0)
+        if (skinImageRead(buf, &item->Mask) != 0)
             return 1;
 
         mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     (button bitmap: %lux%lu)\n", item->Mask.Width, item->Mask.Height);
@@ -761,7 +761,7 @@ static int item_potmeter(char *in)
         av_strlcpy(buf, path, sizeof(buf));
         av_strlcat(buf, phfname, sizeof(buf));
 
-        if (skinBPRead(buf, &item->Bitmap) != 0)
+        if (skinImageRead(buf, &item->Bitmap) != 0)
             return 1;
 
         mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     (bitmap: %lux%lu)\n", item->Bitmap.Width, item->Bitmap.Height);

Modified: trunk/gui/skin/skin.h
==============================================================================
--- trunk/gui/skin/skin.h	Mon Sep  5 17:47:55 2011	(r34056)
+++ trunk/gui/skin/skin.h	Mon Sep  5 18:00:37 2011	(r34057)
@@ -24,7 +24,7 @@
 extern char *skinDirInHome;
 extern char *skinMPlayerDir;
 
-int skinBPRead(char *fname, guiImage *bf);
+int skinImageRead(char *fname, guiImage *bf);
 int skinRead(char *dname);
 
 #endif /* MPLAYER_GUI_SKIN_H */