Mercurial > mplayer.hg
changeset 35744:bfe51acc36fb
Cosmetic: Rename wsImageConvert() wsImageRender().
| author | ib |
|---|---|
| date | Wed, 23 Jan 2013 17:10:33 +0000 |
| parents | 68db224c2275 |
| children | 9c7bab18690c |
| files | gui/interface.c gui/ui/actions.c gui/ui/menu.c gui/ui/playbar.c gui/ui/render.c gui/wm/ws.c gui/wm/ws.h |
| diffstat | 7 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/interface.c Wed Jan 23 17:10:33 2013 +0000 @@ -203,7 +203,7 @@ guiApp.videoWindow.DandDHandler = uiDandDHandler; if (guiApp.video.Bitmap.Image) - wsImageConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image); + wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image); btnModify(evSetVolume, guiInfo.Volume); btnModify(evSetBalance, guiInfo.Balance);
--- a/gui/ui/actions.c Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/ui/actions.c Wed Jan 23 17:10:33 2013 +0000 @@ -197,7 +197,7 @@ } if (guiApp.video.Bitmap.Image) - wsImageConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image); + wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image); if (!guiInfo.Playing) { uiVideoRender = True;
--- a/gui/ui/menu.c Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/ui/menu.c Wed Jan 23 17:10:33 2013 +0000 @@ -64,7 +64,7 @@ } oldMenuItem=menuItem; /* --- */ - wsImageConvert( &guiApp.menuWindow,menuDrawBuffer ); + wsImageRender( &guiApp.menuWindow,menuDrawBuffer ); menuRender=False; } wsImageDraw( &guiApp.menuWindow );
--- a/gui/ui/playbar.c Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/ui/playbar.c Wed Jan 23 17:10:33 2013 +0000 @@ -110,7 +110,7 @@ fast_memcpy( playbarDrawBuffer,guiApp.playbar.Bitmap.Image,guiApp.playbar.Bitmap.ImageSize ); RenderAll( &guiApp.playbarWindow,guiApp.playbarItems,guiApp.IndexOfPlaybarItems,playbarDrawBuffer ); - wsImageConvert( &guiApp.playbarWindow,playbarDrawBuffer ); + wsImageRender( &guiApp.playbarWindow,playbarDrawBuffer ); } wsImageDraw( &guiApp.playbarWindow ); }
--- a/gui/ui/render.c Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/ui/render.c Wed Jan 23 17:10:33 2013 +0000 @@ -416,5 +416,5 @@ } } - wsImageConvert(window, db); + wsImageRender(window, db); }
--- a/gui/wm/ws.c Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/wm/ws.c Wed Jan 23 17:10:33 2013 +0000 @@ -1378,7 +1378,7 @@ win->xImage = NULL; } -void wsImageConvert(wsWindow *win, unsigned char *img) +void wsImageRender(wsWindow *win, unsigned char *img) { static struct SwsContext *sws_ctx; const uint8_t *src[4] = { img, NULL, NULL, NULL };
--- a/gui/wm/ws.h Wed Jan 23 16:43:59 2013 +0000 +++ b/gui/wm/ws.h Wed Jan 23 17:10:33 2013 +0000 @@ -188,7 +188,7 @@ // Image handling // ---------------------------------------------------------------------------------------------- void wsImageCreate(wsWindow *win, int w, int h); -void wsImageConvert(wsWindow *win, unsigned char *img); +void wsImageRender(wsWindow *win, unsigned char *img); void wsImageDraw(wsWindow *win); void wsImageResize(wsWindow *win, int w, int h); void wsImageDestroy(wsWindow *win);