Mercurial > mplayer.hg

changeset 36994:167442bc79d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename same variables in RenderAll().
author ib
date Thu, 27 Mar 2014 13:09:44 +0000
parents 764a6a754b89
children efec4d517450
files gui/ui/render.c gui/ui/render.h
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/render.c	Thu Mar 27 13:05:43 2014 +0000
+++ b/gui/ui/render.c	Thu Mar 27 13:09:44 2014 +0000
@@ -422,36 +422,36 @@
     }
 }
 
-void RenderAll(wsWindow *window, guiItem *Items, int nrItems, char *db)
+void RenderAll(wsWindow *window, guiItem *items, int nrItems, char *drawbuf)
 {
     guiItem *item;
     guiImage *image = NULL;
-    int i, ofs;
+    int i, index;
 
-    image_buffer = db;
+    image_buffer  = drawbuf;
     drawbuf_width = window->Width;
 
     for (i = 0; i < nrItems + 1; i++) {
-        item = &Items[i];
+        item = &items[i];
 
         switch (item->pressed) {
         case btnPressed:
-            ofs = 0;
+            index = 0;
             break;
 
         case btnReleased:
-            ofs = 1;
+            index = 1;
             break;
 
         default:
-            ofs = 2;
+            index = 2;
             break;
         }
 
         switch (item->type) {
         case itButton:
 
-            PutImage(&item->Bitmap, item->x, item->y, 3, ofs);
+            PutImage(&item->Bitmap, item->x, item->y, 3, index);
             break;
 
         case itPimage:
@@ -470,13 +470,13 @@
             else
                 PutImage(&item->Bitmap, item->x, item->y, item->numphases, (item->numphases - 1) * (item->value / 100.0));
 
-            PutImage(&item->Mask, item->x + (item->width - item->pwidth) * (item->value / 100.0), item->y, 3, ofs);
+            PutImage(&item->Mask, item->x + (item->width - item->pwidth) * (item->value / 100.0), item->y, 3, index);
             break;
 
         case itVPotmeter:
 
             PutImage(&item->Bitmap, item->x, item->y, item->numphases, item->numphases * (1.0 - item->value / 100.0));
-            PutImage(&item->Mask, item->x, item->y + (item->height - item->pheight) * (1.0 - item->value / 100.0), 3, ofs);
+            PutImage(&item->Mask, item->x, item->y + (item->height - item->pheight) * (1.0 - item->value / 100.0), 3, index);
             break;
 
         case itSLabel:
@@ -534,5 +534,5 @@
         }
     }
 
-    wsImageRender(window, db);
+    wsImageRender(window, drawbuf);
 }
--- a/gui/ui/render.h	Thu Mar 27 13:05:43 2014 +0000
+++ b/gui/ui/render.h	Thu Mar 27 13:09:44 2014 +0000
@@ -22,6 +22,6 @@
 #include "gui/app/app.h"
 #include "gui/wm/ws.h"
 
-void RenderAll(wsWindow *window, guiItem *Items, int nrItems, char *db);
+void RenderAll(wsWindow *window, guiItem *items, int nrItems, char *drawbuf);
 
 #endif /* MPLAYER_GUI_RENDER_H */