[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.24,1.25 play.c,1.63,1.64 play.h,1.24,1.25 widgets.c,1.24,1.25

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c play.c play.h widgets.c 
Log Message:
upsz ...

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mplayer.c	28 May 2002 11:55:16 -0000	1.24
+++ mplayer.c	28 May 2002 12:54:57 -0000	1.25
@@ -47,7 +47,8 @@
  int i;
 
  // init fields of this struct to default values
- mplMPlayerInit();
+ guiIntfStruct.Balance=50.0f;
+ guiIntfStruct.StreamType=-1;
 
  // fork() a process which runs gtkThreadProc()  [gtkPID]
  gtkInit();

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- play.c	28 May 2002 11:55:16 -0000	1.63
+++ play.c	28 May 2002 12:54:57 -0000	1.64
@@ -138,12 +138,6 @@
    }
 }
 
-void mplMPlayerInit( void )
-{
- guiIntfStruct.Balance=50.0f;
- guiIntfStruct.StreamType=-1;
-}
-
 float mplGetPosition( void )
 { // return 0.0 ... 100.0
  return guiIntfStruct.Position;

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- play.h	28 May 2002 11:55:16 -0000	1.24
+++ play.h	28 May 2002 12:54:57 -0000	1.25
@@ -6,8 +6,6 @@
 
 #include "./mplayer.h"
 
-extern void mplMPlayerInit( void );
-
 extern void mplStop();
 extern void mplFullScreen( void );
 extern void mplPlay( void );

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- widgets.c	28 May 2002 11:55:16 -0000	1.24
+++ widgets.c	28 May 2002 12:54:57 -0000	1.25
@@ -50,14 +50,11 @@
 
 void gtkInit( void )
 {
- int largc = 1;
- char * largv[1] = { "asd" };
  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 );
- 
  gtkInited=1;
 }