[MPlayer-cvslog] r35856 - in trunk/gui: interface.c ui/actions.c ui/main.c ui/menu.c ui/playbar.c ui/ui.h ui/video.c
ib
subversion at mplayerhq.hu
Thu Jan 24 18:08:38 CET 2013
Author: ib
Date: Thu Jan 24 18:08:38 2013
New Revision: 35856
Log:
Cosmetic: Remove "Handle(r)" from function names.
Modified:
trunk/gui/interface.c
trunk/gui/ui/actions.c
trunk/gui/ui/main.c
trunk/gui/ui/menu.c
trunk/gui/ui/playbar.c
trunk/gui/ui/ui.h
trunk/gui/ui/video.c
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/interface.c Thu Jan 24 18:08:38 2013 (r35856)
@@ -193,14 +193,14 @@ void guiInit(void)
mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] videoWindow ID: 0x%x\n", (int)guiApp.videoWindow.WindowID);
guiApp.mainWindow.DrawHandler = uiMainDraw;
- guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
- guiApp.mainWindow.KeyHandler = uiMainKeyHandle;
- guiApp.mainWindow.DNDHandler = uiDNDHandler;
+ guiApp.mainWindow.MouseHandler = uiMainMouse;
+ guiApp.mainWindow.KeyHandler = uiMainKey;
+ guiApp.mainWindow.DNDHandler = uiDND;
guiApp.videoWindow.DrawHandler = uiVideoDraw;
- guiApp.videoWindow.MouseHandler = uiVideoMouseHandle;
- guiApp.videoWindow.KeyHandler = uiMainKeyHandle;
- guiApp.videoWindow.DNDHandler = uiDNDHandler;
+ guiApp.videoWindow.MouseHandler = uiVideoMouse;
+ guiApp.videoWindow.KeyHandler = uiMainKey;
+ guiApp.videoWindow.DNDHandler = uiDND;
if (guiApp.video.Bitmap.Image)
wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/ui/actions.c Thu Jan 24 18:08:38 2013 (r35856)
@@ -226,9 +226,9 @@ void uiChangeSkin(char *name)
wsWindowIcon(wsDisplay, guiApp.mainWindow.WindowID, &guiIcon);
guiApp.mainWindow.DrawHandler = uiMainDraw;
- guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
- guiApp.mainWindow.KeyHandler = uiMainKeyHandle;
- guiApp.mainWindow.DNDHandler = uiDNDHandler;
+ guiApp.mainWindow.MouseHandler = uiMainMouse;
+ guiApp.mainWindow.KeyHandler = uiMainKey;
+ guiApp.mainWindow.DNDHandler = uiDND;
wsXDNDMakeAwareness(&guiApp.mainWindow);
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/ui/main.c Thu Jan 24 18:08:38 2013 (r35856)
@@ -419,7 +419,7 @@ NoPause:
}
}
-void uiMainMouseHandle( int Button,int X,int Y,int RX,int RY )
+void uiMainMouse( int Button,int X,int Y,int RX,int RY )
{
static int itemtype = 0;
int i;
@@ -521,7 +521,7 @@ rollerhandled:
wsWindowMove( &guiApp.mainWindow,True,RX - abs( sx ),RY - abs( sy ) );
break;
case itPRMButton:
- uiMenuMouseHandle( RX,RY );
+ uiMenuMouse( RX,RY );
break;
case itPotmeter:
item->value=(float)( X - item->x ) / item->width * 100.0f;
@@ -541,7 +541,7 @@ potihandled:
}
}
-void uiMainKeyHandle( int KeyCode,int Type,int Key )
+void uiMainKey( int KeyCode,int Type,int Key )
{
int msg = evNone;
@@ -588,7 +588,7 @@ void uiMainKeyHandle( int KeyCode,int Ty
}
/* this will be used to handle drag & drop files */
-void uiDNDHandler(int num,char** files)
+void uiDND(int num,char** files)
{
struct stat buf;
int f = 0;
Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/ui/menu.c Thu Jan 24 18:08:38 2013 (r35856)
@@ -70,7 +70,7 @@ static void uiMenuDraw( void )
wsImageDraw( &guiApp.menuWindow );
}
-void uiMenuMouseHandle( int RX,int RY )
+void uiMenuMouse( int RX,int RY )
{
int x,y,i;
@@ -168,7 +168,7 @@ void uiMenuInit( void )
menuIsInitialized=True;
guiApp.menuWindow.DrawHandler=uiMenuDraw;
-// guiApp.menuWindow.MouseHandler=uiMenuMouseHandle;
-// guiApp.menuWindow.KeyHandler=uiMainKeyHandle;
+// guiApp.menuWindow.MouseHandler=uiMenuMouse;
+// guiApp.menuWindow.KeyHandler=uiMainKey;
uiMenuRender=True; wsWindowRedraw( &guiApp.menuWindow );
}
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/ui/playbar.c Thu Jan 24 18:08:38 2013 (r35856)
@@ -115,7 +115,7 @@ static void uiPlaybarDraw( void )
wsImageDraw( &guiApp.playbarWindow );
}
-static void uiPlaybarMouseHandle( int Button, int X, int Y, int RX, int RY )
+static void uiPlaybarMouse( int Button, int X, int Y, int RX, int RY )
{
static int itemtype = 0;
int i;
@@ -211,7 +211,7 @@ rollerhandled:
switch ( itemtype )
{
case itPRMButton:
- uiMenuMouseHandle( RX,RY );
+ uiMenuMouse( RX,RY );
break;
case itPotmeter:
item->value=(float)( X - item->x ) / item->width * 100.0f;
@@ -264,8 +264,8 @@ void uiPlaybarInit( void )
wsWindowShape( &guiApp.playbarWindow,guiApp.playbar.Mask.Image );
guiApp.playbarWindow.DrawHandler=uiPlaybarDraw;
- guiApp.playbarWindow.MouseHandler=uiPlaybarMouseHandle;
- guiApp.playbarWindow.KeyHandler=uiMainKeyHandle;
+ guiApp.playbarWindow.MouseHandler=uiPlaybarMouse;
+ guiApp.playbarWindow.KeyHandler=uiMainKey;
playbarLength=guiApp.videoWindow.Height;
}
Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/ui/ui.h Thu Jan 24 18:08:38 2013 (r35856)
@@ -32,17 +32,17 @@ void uiInit( void * disp );
void uiMainDraw( void );
void uiEventHandling( int msg, float param );
-void uiMainMouseHandle( int Button, int X, int Y, int RX, int RY );
-void uiMainKeyHandle( int KeyCode, int Type, int Key );
-void uiDNDHandler(int num, char** files);
+void uiMainMouse( int Button, int X, int Y, int RX, int RY );
+void uiMainKey( int KeyCode, int Type, int Key );
+void uiDND(int num, char** files);
void uiVideoDraw( void );
-void uiVideoMouseHandle( int Button, int X, int Y, int RX, int RY );
+void uiVideoMouse( int Button, int X, int Y, int RX, int RY );
void uiMenuInit( void );
void uiHideMenu( int mx, int my, int w );
void uiShowMenu( int mx, int my );
-void uiMenuMouseHandle( int RX, int RY );
+void uiMenuMouse( int RX, int RY );
void uiPlaybarInit( void );
void uiPlaybarShow( int y );
Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c Thu Jan 24 17:59:28 2013 (r35855)
+++ trunk/gui/ui/video.c Thu Jan 24 18:08:38 2013 (r35856)
@@ -50,7 +50,7 @@ void uiVideoDraw( void )
}
}
-void uiVideoMouseHandle( int Button,int X,int Y,int RX,int RY )
+void uiVideoMouse( int Button,int X,int Y,int RX,int RY )
{
static int mplVideoMoved = 0;
static int msButton = 0;
@@ -89,7 +89,7 @@ void uiVideoMouseHandle( int Button,int
}
break;
case wsPMMouseButton:
- uiMenuMouseHandle( RX,RY );
+ uiMenuMouse( RX,RY );
break;
default: uiPlaybarShow( Y ); break;
}
More information about the MPlayer-cvslog
mailing list