[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.34,1.35 mw.h,1.85,1.86 widgets.c,1.39,1.40 widgets.h,1.18,1.19

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv886/Gui/mplayer

Modified Files:
	mplayer.c mw.h widgets.c widgets.h 
Log Message:
cleanup

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mplayer.c	11 Aug 2002 13:12:38 -0000	1.34
+++ mplayer.c	2 Nov 2002 16:09:04 -0000	1.35
@@ -8,7 +8,6 @@
 #include <unistd.h>
 
 #include "./mplayer.h"
-#include "../events.h"
 #include "../app.h"
 #include "../cfg.h"
 #include "../interface.h"
@@ -34,7 +33,6 @@
 #define mplRedrawTimerConst 5
 
 int mplRedrawTimer = mplRedrawTimerConst;
-int mplTimer = 0;
 
 void mplEventHandling( int msg,float param );
 
@@ -48,20 +46,6 @@
 void mplInit( void * disp )
 {
  int i;
-
-#if 0
- // init fields of this struct to default values
- guiIntfStruct.Balance=50.0f;
- guiIntfStruct.StreamType=-1;
-
- gtkInit();
-
- // read gui.conf, gui.pl
- cfg_read();
-
- // opens X display, checks for extensions (XShape, DGA etc)
- wsXInit( disp );
-#endif 
 
  if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL )
   {

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mw.h	2 Nov 2002 14:01:41 -0000	1.85
+++ mw.h	2 Nov 2002 16:09:04 -0000	1.86
@@ -6,6 +6,8 @@
 #include "../../libvo/sub.h"
 #include "../../mplayer.h"
 
+extern unsigned int GetTimerMS( void );
+
 unsigned char * mplDrawBuffer = NULL;
 int             mplMainRender = 1;
 
@@ -195,7 +197,7 @@
             {
 	     char * t = Translate( item->label );
 	     int    l = fntTextWidth( item->fontid,t );
-             image=fntRender( item->fontid,mplTimer%(l?l:item->width),item->width,"%s",t );
+             image=fntRender( item->fontid,(GetTimerMS() / 20)%(l?l:item->width),item->width,"%s",t );
 	    }
 drawrenderedtext:
             if ( image )

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- widgets.c	31 Aug 2002 14:27:41 -0000	1.39
+++ widgets.c	2 Nov 2002 16:09:04 -0000	1.40
@@ -18,7 +18,6 @@
 #include "widgets.h"
 
 #include "./mplayer.h"
-#include "../events.h"
 #include "../app.h"
 #include "../wm/ws.h"
 
@@ -63,7 +62,6 @@
 {
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init gtk ...\n" );
  gtk_set_locale();
-// gtk_init( &argc,&argv );
  gtk_init( 0,NULL );
 // gdk_set_use_xshm( TRUE );
 
@@ -83,15 +81,8 @@
  gtkInited=1;
 }
 
-void gtkDone( void )
-{
-}
-
 void gtkAddIcon( GtkWidget * window )
-{
- GdkWindowPrivate * win = (GdkWindowPrivate *)window->window;
- wsSetIcon( gdk_display,win->xwindow,guiIcon,guiIconMask );
-}
+{ wsSetIcon( gdk_display,GDK_WINDOW_XWINDOW( window->window ),guiIcon,guiIconMask ); }
 
 void gtkClearList( GtkWidget * list )
 { gtk_clist_clear( GTK_CLIST( list ) ); }
@@ -159,16 +150,10 @@
 }
 
 void gtkSetLayer( GtkWidget * wdg )
-{
- GdkWindowPrivate * win = (GdkWindowPrivate *)wdg->window;
- wsSetLayer( gdk_display,win->xwindow,appMPlayer.subWindow.isFullScreen );
-}
+{ wsSetLayer( gdk_display,GDK_WINDOW_XWINDOW( wdg->window ),appMPlayer.subWindow.isFullScreen ); }
 
 void gtkActive( GtkWidget * wdg )
-{
- GdkWindowPrivate * win = (GdkWindowPrivate *)wdg->window;
- wsMoveTopWindow( gdk_display,win->xwindow );
-}
+{ wsMoveTopWindow( gdk_display,GDK_WINDOW_XWINDOW( wdg->window )); }
 
 void gtkShow( int type,char * param )
 {

Index: widgets.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- widgets.h	4 Aug 2002 19:23:57 -0000	1.18
+++ widgets.h	2 Nov 2002 16:09:04 -0000	1.19
@@ -44,7 +44,6 @@
 extern void widgetsCreate( void );
 
 extern void gtkInit( void );
-extern void gtkDone( void );
 extern void gtkAddIcon( GtkWidget * window );
 
 extern int  gtkFillSkinList( gchar * dir );