[MPlayer-cvslog] r33636 - in trunk/gui: interface.c mplayer/gui_common.c mplayer/gui_common.h mplayer/menu.c mplayer/mw.c mplayer/pb.c mplayer/play.c wm/ws.c wm/ws.h

[ib]

Author: ib
Date: Fri Jun 17 19:51:50 2011
New Revision: 33636

Log:
Remove unused parameter 'Size' in wsConvert().

Modified:
   trunk/gui/interface.c
   trunk/gui/mplayer/gui_common.c
   trunk/gui/mplayer/gui_common.h
   trunk/gui/mplayer/menu.c
   trunk/gui/mplayer/mw.c
   trunk/gui/mplayer/pb.c
   trunk/gui/mplayer/play.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/interface.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -289,7 +289,7 @@ void guiInit(void)
     wsClearWindow(appMPlayer.subWindow);
 
     if (appMPlayer.sub.Bitmap.Image)
-        wsConvert(&appMPlayer.subWindow, appMPlayer.sub.Bitmap.Image, appMPlayer.sub.Bitmap.ImageSize);
+        wsConvert(&appMPlayer.subWindow, appMPlayer.sub.Bitmap.Image);
 
     btnModify(evSetVolume, guiIntfStruct.Volume);
     btnModify(evSetBalance, guiIntfStruct.Balance);

Modified: trunk/gui/mplayer/gui_common.c
==============================================================================
--- trunk/gui/mplayer/gui_common.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/mplayer/gui_common.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -379,7 +379,7 @@ static void SimplePotmeterPutImage(txSam
     }
 }
 
-void RenderAll(wsTWindow *window, wItem *Items, int nrItems, char *db, int size)
+void RenderAll(wsTWindow *window, wItem *Items, int nrItems, char *db)
 {
     wItem *item;
     txSample *image = NULL;
@@ -481,5 +481,5 @@ void RenderAll(wsTWindow *window, wItem 
         }
     }
 
-    wsConvert(window, db, size);
+    wsConvert(window, db);
 }

Modified: trunk/gui/mplayer/gui_common.h
==============================================================================
--- trunk/gui/mplayer/gui_common.h	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/mplayer/gui_common.h	Fri Jun 17 19:51:50 2011	(r33636)
@@ -21,6 +21,6 @@
 
 #include "gui/app.h"
 
-void RenderAll(wsTWindow *window, wItem *Items, int nrItems, char *db, int size);
+void RenderAll(wsTWindow *window, wItem *Items, int nrItems, char *db);
 
 #endif /* MPLAYER_GUI_GUI_COMMON_H */

Modified: trunk/gui/mplayer/menu.c
==============================================================================
--- trunk/gui/mplayer/menu.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/mplayer/menu.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -61,7 +61,7 @@ static void mplMenuDraw( void )
     }
    mplOldMenuItem=mplMenuItem;
 // ---
-   wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menu.Bitmap.ImageSize );
+   wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer );
    mplMenuRender=0;
   }
  wsPutImage( &appMPlayer.menuWindow );

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/mplayer/mw.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -87,7 +87,7 @@ void mplMainDraw( void )
    btnModify( evSetVolume,guiIntfStruct.Volume );
 
    fast_memcpy( mplDrawBuffer,appMPlayer.main.Bitmap.Image,appMPlayer.main.Bitmap.ImageSize );
-   RenderAll( &appMPlayer.mainWindow,appMPlayer.mainItems,appMPlayer.IndexOfMainItems,mplDrawBuffer,appMPlayer.main.Bitmap.ImageSize );
+   RenderAll( &appMPlayer.mainWindow,appMPlayer.mainItems,appMPlayer.IndexOfMainItems,mplDrawBuffer );
    mplMainRender=0;
   }
  wsPutImage( &appMPlayer.mainWindow );

Modified: trunk/gui/mplayer/pb.c
==============================================================================
--- trunk/gui/mplayer/pb.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/mplayer/pb.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -106,8 +106,8 @@ static void mplPBDraw( void )
    vo_mouse_autohide=0;
 
    fast_memcpy( mplPBDrawBuffer,appMPlayer.bar.Bitmap.Image,appMPlayer.bar.Bitmap.ImageSize );
-   RenderAll( &appMPlayer.barWindow,appMPlayer.barItems,appMPlayer.IndexOfBarItems,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize );
-   wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize );
+   RenderAll( &appMPlayer.barWindow,appMPlayer.barItems,appMPlayer.IndexOfBarItems,mplPBDrawBuffer );
+   wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer );
   }
  wsPutImage( &appMPlayer.barWindow );
 }

Modified: trunk/gui/mplayer/play.c
==============================================================================
--- trunk/gui/mplayer/play.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/mplayer/play.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -239,7 +239,7 @@ void ChangeSkin(char *name)
     }
 
     if (appMPlayer.sub.Bitmap.Image)
-        wsConvert(&appMPlayer.subWindow, appMPlayer.sub.Bitmap.Image, appMPlayer.sub.Bitmap.ImageSize);
+        wsConvert(&appMPlayer.subWindow, appMPlayer.sub.Bitmap.Image);
 
     if (!guiIntfStruct.Playing) {
         mplSubRender = 1;

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/wm/ws.c	Fri Jun 17 19:51:50 2011	(r33636)
@@ -979,7 +979,7 @@ void wsDoExit(void)
 // ----------------------------------------------------------------------------------------------
 //    Put 'Image' to window.
 // ----------------------------------------------------------------------------------------------
-void wsConvert(wsTWindow *win, unsigned char *Image, unsigned int Size)
+void wsConvert(wsTWindow *win, unsigned char *Image)
 {
     const uint8_t *src[4] = { Image, NULL, NULL, NULL };
     int src_stride[4]     = { 4 * win->xImage->width, 0, 0, 0 };
@@ -987,8 +987,6 @@ void wsConvert(wsTWindow *win, unsigned 
     int dst_stride[4];
     int i;
 
-    (void)Size;
-
     sws_ctx = sws_getCachedContext(sws_ctx, win->xImage->width, win->xImage->height, PIX_FMT_RGB32,
                                    win->xImage->width, win->xImage->height, out_pix_fmt,
                                    SWS_POINT, NULL, NULL, NULL);

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Fri Jun 17 15:22:41 2011	(r33635)
+++ trunk/gui/wm/ws.h	Fri Jun 17 19:51:50 2011	(r33636)
@@ -262,7 +262,7 @@ void wsSetMousePosition(wsTWindow *win, 
 // Image handling
 // ----------------------------------------------------------------------------------------------
 void wsCreateImage(wsTWindow *win, int Width, int Height);
-void wsConvert(wsTWindow *win, unsigned char *Image, unsigned int Size);
+void wsConvert(wsTWindow *win, unsigned char *Image);
 void wsPutImage(wsTWindow *win);
 void wsResizeImage(wsTWindow *win, int Width, int Height);
 void wsDestroyImage(wsTWindow *win);