[MPlayer-cvslog] r35889 - in trunk/gui/ui: actions.c main.c ui.h

[ib]

Author: ib
Date: Fri Jan 25 23:31:37 2013
New Revision: 35889

Log:
Make mainDrawBuffer static.

Additionally, remove unnecessary initialization.

Modified:
   trunk/gui/ui/actions.c
   trunk/gui/ui/main.c
   trunk/gui/ui/ui.h

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Jan 25 22:52:55 2013	(r35888)
+++ trunk/gui/ui/actions.c	Fri Jan 25 23:31:37 2013	(r35889)
@@ -645,7 +645,6 @@ void uiChangeSkin(char *name)
 
     /* reload main window */
 
-    free(mainDrawBuffer);
     wsWindowDestroy(&guiApp.mainWindow);
 
     uiMainInit();

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Fri Jan 25 22:52:55 2013	(r35888)
+++ trunk/gui/ui/main.c	Fri Jan 25 23:31:37 2013	(r35889)
@@ -54,7 +54,7 @@
 
 #include "actions.h"
 
-unsigned char * mainDrawBuffer = NULL;
+static unsigned char * mainDrawBuffer;
 int             uiMainRender = True;
 
 int             mainVisible = True;
@@ -340,6 +340,8 @@ static void uiMainDND(int num,char** fil
 
 void uiMainInit (void)
 {
+  if (mainDrawBuffer) free(mainDrawBuffer);
+
   mainDrawBuffer = malloc(guiApp.main.Bitmap.ImageSize);
 
   if (!mainDrawBuffer)

Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h	Fri Jan 25 22:52:55 2013	(r35888)
+++ trunk/gui/ui/ui.h	Fri Jan 25 23:31:37 2013	(r35889)
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_GUI_UI_H
 #define MPLAYER_GUI_UI_H
 
-extern unsigned char * mainDrawBuffer;
 extern unsigned char * menuDrawBuffer;
 extern int             mainVisible;