[MPlayer-cvslog] r35838 - in trunk/gui: interface.c ui/actions.c ui/menu.c ui/playbar.c ui/render.c wm/ws.c wm/ws.h

[ib]

Author: ib
Date: Wed Jan 23 18:10:33 2013
New Revision: 35838

Log:
Cosmetic: Rename wsImageConvert() wsImageRender().

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/menu.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/render.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/interface.c	Wed Jan 23 18:10:33 2013	(r35838)
@@ -203,7 +203,7 @@ void guiInit(void)
     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);

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/ui/actions.c	Wed Jan 23 18:10:33 2013	(r35838)
@@ -197,7 +197,7 @@ void uiChangeSkin(char *name)
     }
 
     if (guiApp.video.Bitmap.Image)
-        wsImageConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
+        wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
 
     if (!guiInfo.Playing) {
         uiVideoRender = True;

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/ui/menu.c	Wed Jan 23 18:10:33 2013	(r35838)
@@ -64,7 +64,7 @@ static void uiMenuDraw( void )
     }
    oldMenuItem=menuItem;
 /* --- */
-   wsImageConvert( &guiApp.menuWindow,menuDrawBuffer );
+   wsImageRender( &guiApp.menuWindow,menuDrawBuffer );
    menuRender=False;
   }
  wsImageDraw( &guiApp.menuWindow );

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/ui/playbar.c	Wed Jan 23 18:10:33 2013	(r35838)
@@ -110,7 +110,7 @@ static void uiPlaybarDraw( void )
 
    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 );
 }

Modified: trunk/gui/ui/render.c
==============================================================================
--- trunk/gui/ui/render.c	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/ui/render.c	Wed Jan 23 18:10:33 2013	(r35838)
@@ -416,5 +416,5 @@ void RenderAll(wsWindow *window, guiItem
         }
     }
 
-    wsImageConvert(window, db);
+    wsImageRender(window, db);
 }

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/wm/ws.c	Wed Jan 23 18:10:33 2013	(r35838)
@@ -1378,7 +1378,7 @@ void wsImageDestroy(wsWindow *win)
     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 };

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Wed Jan 23 17:43:59 2013	(r35837)
+++ trunk/gui/wm/ws.h	Wed Jan 23 18:10:33 2013	(r35838)
@@ -188,7 +188,7 @@ void wsMouseVisibility(wsWindow *win, in
 // 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);