[MPlayer-cvslog] r35862 - in trunk/gui: dialog/fileselect.c dialog/menu.c dialog/url.c interface.c ui/actions.c ui/main.c ui/menu.c ui/playbar.c ui/ui.h
ib
subversion at mplayerhq.hu
Thu Jan 24 18:44:38 CET 2013
Author: ib
Date: Thu Jan 24 18:44:38 2013
New Revision: 35862
Log:
Cosmetic: Rename uiEventHandling() uiMainEvent().
Modified:
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/menu.c
trunk/gui/dialog/url.c
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
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/dialog/fileselect.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -541,7 +541,7 @@ static void fs_Ok_released( GtkButton *
item=item->next;
}
if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name_utf8() );
- if ( uiMainAutoPlay ) { uiMainAutoPlay=False; uiEventHandling( evPlay,0 ); }
+ if ( uiMainAutoPlay ) { uiMainAutoPlay=False; uiMainEvent( evPlay,0 ); }
else gui( GUI_SET_STATE,(void *) GUI_STOP );
}
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/dialog/menu.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -91,7 +91,7 @@ static void ActivateMenuItem( int Item )
// fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 );
gtkPopupMenu=Item & 0x0000ffff;
gtkPopupMenuParam=Item >> 16;
- uiEventHandling( Item & 0x0000ffff,Item >> 16 );
+ uiMainEvent( Item & 0x0000ffff,Item >> 16 );
}
static GtkWidget * AddMenuCheckItem(GtkWidget *window1, const char * immagine_xpm, GtkWidget* Menu,const char* label, gboolean state, int Number)
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/dialog/url.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -105,7 +105,7 @@ static void on_Button_pressed( GtkButton
uiSetFile( NULL,str,STREAMTYPE_STREAM ); guiInfo.NewPlay=GUI_FILE_NEW;
listMgr(PLAYLIST_DELETE, 0);
add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND);
- uiEventHandling( evPlay,0 );
+ uiMainEvent( evPlay,0 );
}
}
HideURLDialogBox();
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/interface.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -376,23 +376,23 @@ int gui(int what, void *data)
switch ((int)data) {
case MP_CMD_VO_FULLSCREEN:
- uiEventHandling(evFullScreen, True);
+ uiMainEvent(evFullScreen, True);
break;
case MP_CMD_PLAY_TREE_STEP:
- uiEventHandling(evNext, 0);
+ uiMainEvent(evNext, 0);
break;
case -MP_CMD_PLAY_TREE_STEP:
- uiEventHandling(evPrev, 0);
+ uiMainEvent(evPrev, 0);
break;
case MP_CMD_STOP:
- uiEventHandling(evStop, 0);
+ uiMainEvent(evStop, 0);
break;
case MP_CMD_QUIT:
- uiEventHandling(evExit, 0);
+ uiMainEvent(evExit, 0);
break;
}
@@ -404,7 +404,7 @@ int gui(int what, void *data)
msg = appFindMessage((const char *)data);
if ((msg == evMenu) || appFindItem(msg))
- uiEventHandling(msg, 0);
+ uiMainEvent(msg, 0);
break;
@@ -761,7 +761,7 @@ int gui(int what, void *data)
case GUI_REDRAW:
- uiEventHandling(ivRedraw, 0);
+ uiMainEvent(ivRedraw, 0);
break;
case GUI_SETUP_VIDEO_WINDOW:
@@ -777,7 +777,7 @@ int gui(int what, void *data)
}
if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
- uiEventHandling(evFullScreen, True);
+ uiMainEvent(evFullScreen, True);
if (guiWinID >= 0)
wsWindowMove(&guiApp.mainWindow, True, 0, guiInfo.VideoHeight);
@@ -796,7 +796,7 @@ int gui(int what, void *data)
guiInfo.sh_video = NULL;
- uiEventHandling(ivRedraw, True);
+ uiMainEvent(ivRedraw, True);
if (guiInfo.Playing) {
if (!guiInfo.PlaylistNext) {
@@ -859,7 +859,7 @@ int gui(int what, void *data)
wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
- uiEventHandling(evFullScreen, False);
+ uiMainEvent(evFullScreen, False);
} else {
wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
guiInfo.VideoWindow = False;
Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/ui/actions.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -335,7 +335,7 @@ void uiCurr(void)
}
if (guiInfo.Playing == GUI_PLAY)
- uiEventHandling(evPlay, 0);
+ uiMainEvent(evPlay, 0);
}
/**
@@ -397,10 +397,10 @@ void uiPrev(void)
}
if (stop)
- uiEventHandling(evStop, 0);
+ uiMainEvent(evStop, 0);
if (guiInfo.Playing == GUI_PLAY)
- uiEventHandling(evPlay, 0);
+ uiMainEvent(evPlay, 0);
else if (!stop && !prev && unset)
uiUnsetMedia(True);
}
@@ -457,10 +457,10 @@ void uiNext(void)
}
if (stop)
- uiEventHandling(evStop, 0);
+ uiMainEvent(evStop, 0);
if (guiInfo.Playing == GUI_PLAY)
- uiEventHandling(evPlay, 0);
+ uiMainEvent(evPlay, 0);
else if (!stop && !next && unset)
uiUnsetMedia(True);
}
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/ui/main.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -125,7 +125,7 @@ static void MediumPrepare (int type)
static unsigned last_redraw_time = 0;
-void uiEventHandling( int msg,float param )
+void uiMainEvent( int msg,float param )
{
int iparam = (int)param, osd;
mixer_t *mixer = mpctx_get_mixer(guiInfo.mpcontext);
@@ -172,21 +172,21 @@ void uiEventHandling( int msg,float para
#ifdef CONFIG_DVDREAD
case ivSetDVDSubtitle:
dvdsub_id=iparam;
- uiEventHandling( ivPlayDVD, 0 );
+ uiMainEvent( ivPlayDVD, 0 );
break;
case ivSetDVDAudio:
audio_id=iparam;
- uiEventHandling( ivPlayDVD, 0 );
+ uiMainEvent( ivPlayDVD, 0 );
break;
case ivSetDVDChapter:
guiInfo.Chapter=iparam;
- uiEventHandling( ivPlayDVD, 0 );
+ uiMainEvent( ivPlayDVD, 0 );
break;
case ivSetDVDTitle:
guiInfo.Track=iparam;
guiInfo.Chapter=1;
guiInfo.Angle=1;
- uiEventHandling( ivPlayDVD, 0 );
+ uiMainEvent( ivPlayDVD, 0 );
break;
case evPlayDVD:
guiInfo.Chapter=1;
@@ -308,7 +308,7 @@ NoPause:
mixer_setbalance( mixer,(guiInfo.Balance - 50.0 ) / 50.0 ); // transform 0..100 to -1..1
osd = osd_level;
osd_level = 0;
- uiEventHandling(evSetVolume, guiInfo.Volume);
+ uiMainEvent(evSetVolume, guiInfo.Volume);
osd_level = osd;
if ( osd_level )
{
@@ -389,8 +389,8 @@ NoPause:
case 1:
default: movie_aspect=-1;
}
- if ( guiInfo.StreamType == STREAMTYPE_VCD ) uiEventHandling( evPlayVCD, 0 );
- else if ( guiInfo.StreamType == STREAMTYPE_DVD ) uiEventHandling( ivPlayDVD, 0 );
+ if ( guiInfo.StreamType == STREAMTYPE_VCD ) uiMainEvent( evPlayVCD, 0 );
+ else if ( guiInfo.StreamType == STREAMTYPE_DVD ) uiMainEvent( ivPlayDVD, 0 );
else
guiInfo.NewPlay=GUI_FILE_NEW;
break;
@@ -411,10 +411,10 @@ NoPause:
break;
/* system events */
case evNone:
- mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] uiEventHandling: evNone\n" );
+ mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] uiMainEvent: evNone\n" );
break;
default:
- mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] uiEventHandling: unknown event %d, param %.2f\n", msg, param );
+ mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] uiMainEvent: unknown event %d, param %.2f\n", msg, param );
break;
}
}
@@ -479,16 +479,16 @@ void uiMainMouse( int Button,int X,int Y
case itPotmeter:
case itHPotmeter:
btnModify( item->message,(float)( X - item->x ) / item->width * 100.0f );
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
value=item->value;
break;
case itVPotmeter:
btnModify( item->message, ( 1. - (float)( Y - item->y ) / item->height) * 100.0f );
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
value=item->value;
break;
}
- uiEventHandling( item->message,value );
+ uiMainEvent( item->message,value );
itemtype=0;
break;
@@ -507,7 +507,7 @@ rollerhandled:
{
item->value+=value;
btnModify( item->message,item->value );
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
}
}
break;
@@ -534,7 +534,7 @@ rollerhandled:
potihandled:
if ( item->value > 100.0f ) item->value=100.0f;
if ( item->value < 0.0f ) item->value=0.0f;
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
break;
}
break;
@@ -578,13 +578,13 @@ void uiMainKey( int KeyCode,int Type,int
case wsEscape:
if ( guiInfo.VideoWindow && guiInfo.Playing && guiApp.videoWindow.isFullScreen )
{
- uiEventHandling( evNormalSize,0 );
+ uiMainEvent( evNormalSize,0 );
return;
}
default: vo_x11_putkey( Key ); return;
}
}
- if ( msg != evNone ) uiEventHandling( msg,0 );
+ if ( msg != evNone ) uiMainEvent( msg,0 );
}
/* this will be used to handle drag & drop files */
@@ -659,8 +659,8 @@ void uiMainDND(int num,char** files)
if (file) {
uiSetFile( NULL,file,STREAMTYPE_FILE );
- if ( guiInfo.Playing == GUI_PLAY ) uiEventHandling( evStop,0 );
- uiEventHandling( evPlay,0 );
+ if ( guiInfo.Playing == GUI_PLAY ) uiMainEvent( evStop,0 );
+ uiMainEvent( evPlay,0 );
}
if (subtitles) {
nfree(guiInfo.SubtitleFilename);
Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/ui/menu.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -169,6 +169,6 @@ void uiMenuHide( int mx,int my,int w )
guiApp.menuItems[i].x+guiApp.menuItems[i].width,
guiApp.menuItems[i].y+guiApp.menuItems[i].height ) )
{
- uiEventHandling( guiApp.menuItems[i].message,(float)w );
+ uiMainEvent( guiApp.menuItems[i].message,(float)w );
}
}
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/ui/playbar.c Thu Jan 24 18:44:38 2013 (r35862)
@@ -177,16 +177,16 @@ static void uiPlaybarMouse( int Button,
case itPotmeter:
case itHPotmeter:
btnModify( item->message,(float)( X - item->x ) / item->width * 100.0f );
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
value=item->value;
break;
case itVPotmeter:
btnModify( item->message, ( 1. - (float)( Y - item->y ) / item->height) * 100.0f );
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
value=item->value;
break;
}
- uiEventHandling( item->message,value );
+ uiMainEvent( item->message,value );
itemtype=0;
break;
@@ -201,7 +201,7 @@ rollerhandled:
{
item->value+=value;
btnModify( item->message,item->value );
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
}
}
break;
@@ -224,7 +224,7 @@ rollerhandled:
potihandled:
if ( item->value > 100.0f ) item->value=100.0f;
if ( item->value < 0.0f ) item->value=0.0f;
- uiEventHandling( item->message,item->value );
+ uiMainEvent( item->message,item->value );
break;
}
break;
Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h Thu Jan 24 18:37:49 2013 (r35861)
+++ trunk/gui/ui/ui.h Thu Jan 24 18:44:38 2013 (r35862)
@@ -31,7 +31,7 @@ extern int sx, sy;
void uiInit( void * disp );
void uiMainDraw( void );
-void uiEventHandling( int msg, float param );
+void uiMainEvent( int msg, float param );
void uiMainMouse( int Button, int X, int Y, int RX, int RY );
void uiMainKey( int KeyCode, int Type, int Key );
void uiMainDND(int num, char** files);
More information about the MPlayer-cvslog
mailing list