From 01ab34d04af5aadb0be949a196d25142b6adb692 Mon Sep 17 00:00:00 2001 From: pontscho Date: Mon, 26 May 2003 08:34:17 +0000 Subject: From: Michael Joosten PATCH: fullscreen issues with GUI, WM layers, gmplayer plays first file always twice git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10194 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/play.c | 4 ++-- Gui/mplayer/play.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'Gui/mplayer') diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 147674bba0..4977dbe183 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -32,7 +32,7 @@ extern float rel_seek_secs; extern int abs_seek_pos; -static int mplGotoTheNext = 1; +int mplGotoTheNext = 1; void mplFullScreen( void ) { @@ -57,7 +57,7 @@ void mplFullScreen( void ) if ( guiIntfStruct.Playing || gtkShowVideoWindow ) wsFullScreen( &appMPlayer.subWindow ); fullscreen=vo_fs=appMPlayer.subWindow.isFullScreen; wsSetLayer( wsDisplay,appMPlayer.mainWindow.WindowID,appMPlayer.subWindow.isFullScreen ); - wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen ); + if ( appMPlayer.menuIsPresent ) wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen ); if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B ); diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h index b7c3c58a3b..60317cd479 100644 --- a/Gui/mplayer/play.h +++ b/Gui/mplayer/play.h @@ -6,6 +6,8 @@ #include "./mplayer.h" +extern int mplGotoTheNext; + extern void mplEnd( void ); extern void mplFullScreen( void ); extern void mplPlay( void ); -- cgit v1.2.3