diff options
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mplayer.c | 7 | ||||
-rw-r--r-- | Gui/mplayer/mw.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 5 | ||||
-rw-r--r-- | Gui/mplayer/play.h | 1 |
4 files changed, 6 insertions, 9 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index a9f2e1bf95..0cecbc3b4f 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -97,7 +97,6 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) appMPlayer.subWindow.ReDraw=mplSubDraw; appMPlayer.subWindow.MouseHandler=mplSubMouseHandle; appMPlayer.subWindow.KeyHandler=mplMainKeyHandle; - appMPlayer.subWindow.ReSize=mplResize; wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); wsClearWindow( appMPlayer.subWindow ); @@ -109,6 +108,12 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) btnModify( evSetVolume,guiIntfStruct.Volume ); btnModify( evSetBalance,guiIntfStruct.Balance ); btnModify( evSetMoviePosition,guiIntfStruct.Position ); + + if ( fullscreen ) + { + btnModify( evFullScreen,btnPressed ); + mplFullScreen(); + } guiIntfStruct.Playing=0; diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 2f2388f567..a3215ee770 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -359,7 +359,6 @@ NoPause: appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2; appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; wsFullScreen( &appMPlayer.subWindow ); - mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,guiIntfStruct.MovieWidth,guiIntfStruct.MovieHeight ); } break; case evDoubleSize: @@ -370,7 +369,6 @@ NoPause: appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2; appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2; wsFullScreen( &appMPlayer.subWindow ); - mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,guiIntfStruct.MovieWidth,guiIntfStruct.MovieHeight ); } break; case evFullScreen: diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index a2637589b9..0155c91ae2 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -55,7 +55,6 @@ void mplFullScreen( void ) fullscreen=appMPlayer.subWindow.isFullScreen; if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); -// mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height ); } extern int mplSubRender; @@ -121,10 +120,6 @@ void mplState( void ) } } -void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) -{ -} - void mplMPlayerInit( int argc,char* argv[], char *envp[] ) { guiIntfStruct.Balance=50.0f; diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h index 92e445e8cd..274cf6e2db 100644 --- a/Gui/mplayer/play.h +++ b/Gui/mplayer/play.h @@ -13,7 +13,6 @@ extern void mplFullScreen( void ); extern void mplPlay( void ); extern void mplPause( void ); extern void mplState( void ); -extern void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ); extern void mplResizeToMovieSize( unsigned int width,unsigned int height ); extern void mplIncAudioBufDelay( void ); |