Mercurial > mplayer.hg

changeset 6219:d43d0460cad5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upsz ...
author pontscho
date Tue, 28 May 2002 12:54:57 +0000
parents 8cfddba867b4
children dc29d4236bdc
files Gui/mplayer/mplayer.c Gui/mplayer/play.c Gui/mplayer/play.h Gui/mplayer/widgets.c
diffstat 4 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/mplayer/mplayer.c	Tue May 28 11:55:17 2002 +0000
+++ b/Gui/mplayer/mplayer.c	Tue May 28 12:54:57 2002 +0000
@@ -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();
--- a/Gui/mplayer/play.c	Tue May 28 11:55:17 2002 +0000
+++ b/Gui/mplayer/play.c	Tue May 28 12:54:57 2002 +0000
@@ -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;
--- a/Gui/mplayer/play.h	Tue May 28 11:55:17 2002 +0000
+++ b/Gui/mplayer/play.h	Tue May 28 12:54:57 2002 +0000
@@ -6,8 +6,6 @@
 
 #include "./mplayer.h"
 
-extern void mplMPlayerInit( void );
-
 extern void mplStop();
 extern void mplFullScreen( void );
 extern void mplPlay( void );
--- a/Gui/mplayer/widgets.c	Tue May 28 11:55:17 2002 +0000
+++ b/Gui/mplayer/widgets.c	Tue May 28 12:54:57 2002 +0000
@@ -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;
 }