Mercurial > mplayer.hg
changeset 10193:f0bcaf5ea675
From: Michael Joosten <joost@c-lab.de>
PATCH: fullscreen issues with GUI, WM layers, gmplayer plays first file always twice
| author | pontscho |
|---|---|
| date | Mon, 26 May 2003 08:34:17 +0000 |
| parents | dcdc6ae3ebaf |
| children | 2608bf0037b6 |
| files | Gui/interface.c Gui/mplayer/play.c Gui/mplayer/play.h libvo/x11_common.c |
| diffstat | 4 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/interface.c Mon May 26 06:47:52 2003 +0000 +++ b/Gui/interface.c Mon May 26 08:34:17 2003 +0000 @@ -1145,6 +1145,7 @@ } mplCurr(); // Update filename + mplGotoTheNext=1; if (!enqueue) filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline,
--- a/Gui/mplayer/play.c Mon May 26 06:47:52 2003 +0000 +++ b/Gui/mplayer/play.c Mon May 26 08:34:17 2003 +0000 @@ -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 @@ 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 );
--- a/Gui/mplayer/play.h Mon May 26 06:47:52 2003 +0000 +++ b/Gui/mplayer/play.h Mon May 26 08:34:17 2003 +0000 @@ -6,6 +6,8 @@ #include "./mplayer.h" +extern int mplGotoTheNext; + extern void mplEnd( void ); extern void mplFullScreen( void ); extern void mplPlay( void );
--- a/libvo/x11_common.c Mon May 26 06:47:52 2003 +0000 +++ b/libvo/x11_common.c Mon May 26 08:34:17 2003 +0000 @@ -783,7 +783,7 @@ { XClientMessageEvent xev; - if (layer) orig_layer=vo_x11_get_gnome_layer( mDisplay, vo_window ); + if (!orig_layer) orig_layer=vo_x11_get_gnome_layer( mDisplay, vo_window ); memset(&xev, 0, sizeof(xev)); xev.type = ClientMessage;