summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/mplayer.c3
-rw-r--r--Gui/mplayer/play.c6
-rw-r--r--Gui/mplayer/play.h2
-rw-r--r--Gui/mplayer/widgets.c3
4 files changed, 2 insertions, 12 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index e1133dffc6..bddcbec4ee 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -47,7 +47,8 @@ void mplInit( void * disp )
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();
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index bdeefd5a98..0feb3d0a4d 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -138,12 +138,6 @@ void mplState( void )
}
}
-void mplMPlayerInit( void )
-{
- guiIntfStruct.Balance=50.0f;
- guiIntfStruct.StreamType=-1;
-}
-
float mplGetPosition( void )
{ // return 0.0 ... 100.0
return guiIntfStruct.Position;
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index e5c8ebf3f1..0626880054 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -6,8 +6,6 @@
#include "./mplayer.h"
-extern void mplMPlayerInit( void );
-
extern void mplStop();
extern void mplFullScreen( void );
extern void mplPlay( void );
diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c
index c2930978e2..08f868a220 100644
--- a/Gui/mplayer/widgets.c
+++ b/Gui/mplayer/widgets.c
@@ -50,14 +50,11 @@ int gtkInited = 0;
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;
}