mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
From: Michael Joosten <joost@c-lab.de>
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
This commit is contained in:
parent
50de517345
commit
01ab34d04a
@ -1145,6 +1145,7 @@ int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* confi
|
||||
}
|
||||
|
||||
mplCurr(); // Update filename
|
||||
mplGotoTheNext=1;
|
||||
|
||||
if (!enqueue)
|
||||
filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline,
|
||||
|
@ -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 );
|
||||
|
@ -6,6 +6,8 @@
|
||||
|
||||
#include "./mplayer.h"
|
||||
|
||||
extern int mplGotoTheNext;
|
||||
|
||||
extern void mplEnd( void );
|
||||
extern void mplFullScreen( void );
|
||||
extern void mplPlay( void );
|
||||
|
@ -783,7 +783,7 @@ void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer )
|
||||
{
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user