[MPlayer-cvslog] r35782 - in trunk/gui: app/app.c app/app.h skin/font.c skin/font.h skin/skin.c ui/main.c ui/playbar.c ui/render.c ui/render.h
ib
subversion at mplayerhq.hu
Fri Jan 18 18:35:07 CET 2013
Author: ib
Date: Fri Jan 18 18:35:07 2013
New Revision: 35782
Log:
Cosmetic: Rename wItem guiItem.
Because that's what it is - a GUI item.
Modified:
trunk/gui/app/app.c
trunk/gui/app/app.h
trunk/gui/skin/font.c
trunk/gui/skin/font.h
trunk/gui/skin/skin.c
trunk/gui/ui/main.c
trunk/gui/ui/playbar.c
trunk/gui/ui/render.c
trunk/gui/ui/render.h
Modified: trunk/gui/app/app.c
==============================================================================
--- trunk/gui/app/app.c Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/app/app.c Fri Jan 18 18:35:07 2013 (r35782)
@@ -90,7 +90,7 @@ static const evName evNames[] = {
*
* @param item item to be freed
*/
-static void appClearItem(wItem *item)
+static void appClearItem(guiItem *item)
{
bpFree(&item->Bitmap);
bpFree(&item->Mask);
@@ -157,9 +157,9 @@ int appFindMessage(const char *name)
*
* @return pointer to the item (ok) or NULL (not found)
*/
-wItem *appFindItem(int event)
+guiItem *appFindItem(int event)
{
- wItem *item;
+ guiItem *item;
int i, n;
if (guiApp.videoWindow.isFullScreen && guiApp.playbarIsPresent) {
Modified: trunk/gui/app/app.h
==============================================================================
--- trunk/gui/app/app.h Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/app/app.h Fri Jan 18 18:35:07 2013 (r35782)
@@ -140,41 +140,41 @@ typedef struct {
int last_x;
int pressed;
-} wItem;
+} guiItem;
/// Maximum GUI items
#define MAX_ITEMS 64
typedef struct {
- wItem main;
+ guiItem main;
wsWindow mainWindow;
int mainDecoration;
- wItem video;
+ guiItem video;
wsWindow videoWindow;
- wItem playbar;
+ guiItem playbar;
wsWindow playbarWindow;
int playbarIsPresent;
- wItem menu;
- wItem menuSelected;
+ guiItem menu;
+ guiItem menuSelected;
wsWindow menuWindow;
int menuIsPresent;
int IndexOfMainItems;
- wItem mainItems[MAX_ITEMS];
+ guiItem mainItems[MAX_ITEMS];
int IndexOfPlaybarItems;
- wItem playbarItems[MAX_ITEMS];
+ guiItem playbarItems[MAX_ITEMS];
int IndexOfMenuItems;
- wItem menuItems[MAX_ITEMS];
+ guiItem menuItems[MAX_ITEMS];
} guiItems;
extern guiItems guiApp;
-wItem *appFindItem(int event);
+guiItem *appFindItem(int event);
int appFindMessage(const char *name);
void appFreeStruct(void);
void btnModify(int event, float state);
Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/skin/font.c Fri Jan 18 18:35:07 2013 (r35782)
@@ -336,7 +336,7 @@ static int fntTextHeight(int id, char *s
*
* @return image containing the rendered text
*/
-guiImage *fntTextRender(wItem *item, int px, char *txt)
+guiImage *fntTextRender(guiItem *item, int px, char *txt)
{
unsigned char *u;
unsigned int i;
Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/skin/font.h Fri Jan 18 18:35:07 2013 (r35782)
@@ -43,7 +43,7 @@ typedef struct {
int fntFindID(char *name);
void fntFreeFont(void);
int fntRead(char *path, char *fname);
-guiImage *fntTextRender(wItem *item, int px, char *txt);
+guiImage *fntTextRender(guiItem *item, int px, char *txt);
int fntTextWidth(int id, char *str);
#endif /* MPLAYER_GUI_FONT_H */
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/skin/skin.c Fri Jan 18 18:35:07 2013 (r35782)
@@ -52,9 +52,9 @@ static int linenumber;
static unsigned char path[512];
static unsigned char currWinName[32];
-static wItem *currWin;
+static guiItem *currWin;
static int *currWinItemIdx;
-static wItem *currWinItems;
+static guiItem *currWinItems;
/**
* @brief Display a skin error message.
@@ -130,9 +130,9 @@ static int in_window(char *name)
*
* @return pointer to next free item (ok) or NULL (error)
*/
-static wItem *next_item(void)
+static guiItem *next_item(void)
{
- wItem *item = NULL;
+ guiItem *item = NULL;
if (*currWinItemIdx < MAX_ITEMS - 1) {
(*currWinItemIdx)++;
@@ -384,7 +384,7 @@ static int item_button(char *in)
unsigned char file[512];
int x, y, w, h, message;
char msg[32];
- wItem *item;
+ guiItem *item;
if (!window_item("button"))
return 1;
@@ -455,7 +455,7 @@ static int item_button(char *in)
static int item_selected(char *in)
{
unsigned char file[512];
- wItem *currItem;
+ guiItem *currItem;
if (!window_item("selected"))
return 1;
@@ -499,7 +499,7 @@ static int item_menu(char *in)
{
int x, y, w, h, message;
char msg[32];
- wItem *item;
+ guiItem *item;
if (!window_item("menu"))
return 1;
@@ -559,7 +559,7 @@ static int item_hpotmeter(char *in)
unsigned char phfname[256];
unsigned char buf[512];
int pwidth, pheight, ph, d, x, y, w, h, message;
- wItem *item;
+ guiItem *item;
if (!window_item("h/v potmeter"))
return 1;
@@ -649,7 +649,7 @@ static int item_hpotmeter(char *in)
static int item_vpotmeter(char *in)
{
int r;
- wItem *item;
+ guiItem *item;
r = item_hpotmeter(in);
@@ -675,7 +675,7 @@ static int item_potmeter(char *in)
unsigned char phfname[256];
unsigned char buf[512];
int ph, d, x, y, w, h, message;
- wItem *item;
+ guiItem *item;
if (!window_item("potmeter"))
return 1;
@@ -794,7 +794,7 @@ static int item_slabel(char *in)
int x, y, id;
char fnt[256];
char txt[256];
- wItem *item;
+ guiItem *item;
if (!window_item("slabel"))
return 1;
@@ -857,7 +857,7 @@ static int item_dlabel(char *in)
int x, y, w, a, id;
char fnt[256];
char txt[256];
- wItem *item;
+ guiItem *item;
if (!window_item("dlabel"))
return 1;
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/ui/main.c Fri Jan 18 18:35:07 2013 (r35782)
@@ -423,7 +423,7 @@ void uiMainMouseHandle( int Button,int X
{
static int itemtype = 0;
int i;
- wItem * item = NULL;
+ guiItem * item = NULL;
float value = 0.0f;
static int SelectedItem = -1;
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/ui/playbar.c Fri Jan 18 18:35:07 2013 (r35782)
@@ -119,7 +119,7 @@ static void uiPlaybarMouseHandle( int Bu
{
static int itemtype = 0;
int i;
- wItem * item = NULL;
+ guiItem * item = NULL;
float value = 0.0f;
static int SelectedItem = -1;
Modified: trunk/gui/ui/render.c
==============================================================================
--- trunk/gui/ui/render.c Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/ui/render.c Fri Jan 18 18:35:07 2013 (r35782)
@@ -304,9 +304,9 @@ static void SimplePotmeterPutImage(guiIm
}
}
-void RenderAll(wsWindow *window, wItem *Items, int nrItems, char *db)
+void RenderAll(wsWindow *window, guiItem *Items, int nrItems, char *db)
{
- wItem *item;
+ guiItem *item;
guiImage *image = NULL;
int i, ofs;
Modified: trunk/gui/ui/render.h
==============================================================================
--- trunk/gui/ui/render.h Fri Jan 18 18:24:54 2013 (r35781)
+++ trunk/gui/ui/render.h Fri Jan 18 18:35:07 2013 (r35782)
@@ -21,6 +21,6 @@
#include "gui/app/app.h"
-void RenderAll(wsWindow *window, wItem *Items, int nrItems, char *db);
+void RenderAll(wsWindow *window, guiItem *Items, int nrItems, char *db);
#endif /* MPLAYER_GUI_RENDER_H */
More information about the MPlayer-cvslog
mailing list