[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.48,1.49 play.c,1.48,1.49
Zoltan Ponekker
pontscho at mplayer.dev.hu
Thu Mar 7 18:50:27 CET 2002
- Previous message: [Mplayer-cvslog] CVS: main mplayer.c,1.423,1.424 mplayer.h,1.5,1.6
- Next message: [Mplayer-cvslog] CVS: main/libvo mga_common.c,1.20,1.21 video_out.c,1.42,1.43 video_out.h,1.25,1.26 vo_xmga.c,1.49,1.50 vo_xv.c,1.60,1.61 vo_xvidix.c,1.23,1.24 x11_common.c,1.55,1.56 x11_common.h,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv16443/Gui/mplayer
Modified Files:
mw.h play.c
Log Message:
rewrite fullscreen support in some libvo driver
Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mw.h 7 Mar 2002 15:06:02 -0000 1.48
+++ mw.h 7 Mar 2002 17:50:24 -0000 1.49
@@ -374,7 +374,6 @@
}
break;
case evFullScreen:
- IZE("evFullS");
for ( j=0;j<appMPlayer.NumberOfItems + 1;j++ )
{
if ( appMPlayer.Items[j].msg == evFullScreen )
@@ -383,8 +382,8 @@
appMPlayer.Items[j].pressed=appMPlayer.Items[j].tmp;
}
}
- mplMainRender=1;
mplFullScreen();
+ mplMainRender=1;
break;
// --- timer events
Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- play.c 6 Mar 2002 23:54:20 -0000 1.48
+++ play.c 7 Mar 2002 17:50:24 -0000 1.49
@@ -30,26 +30,33 @@
{
static int sx,sy;
- wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
- if ( appMPlayer.subWindow.isFullScreen )
+ if ( guiIntfStruct.Playing )
{
- wsResizeWindow( &appMPlayer.subWindow,sx,sy );
- wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
- wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
- appMPlayer.subWindow.isFullScreen=0;
- }
- else
- {
- sx=appMPlayer.subWindow.Width; sy=appMPlayer.subWindow.Height;
- wsResizeWindow( &appMPlayer.subWindow,wsMaxX,wsMaxY );
- wsMoveWindow( &appMPlayer.subWindow,True,0,0 );
- wsWindowDecoration( &appMPlayer.subWindow,0 );
- appMPlayer.subWindow.isFullScreen=1;
- }
+ wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
+ if ( appMPlayer.subWindow.isFullScreen )
+ {
+ wsResizeWindow( &appMPlayer.subWindow,sx,sy );
+ wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
+ wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
+ appMPlayer.subWindow.isFullScreen=0;
+ vo_fs=0;
+ }
+ else
+ {
+ sx=appMPlayer.subWindow.Width; sy=appMPlayer.subWindow.Height;
+ wsResizeWindow( &appMPlayer.subWindow,wsMaxX,wsMaxY );
+ wsMoveWindow( &appMPlayer.subWindow,True,0,0 );
+ wsWindowDecoration( &appMPlayer.subWindow,0 );
+ appMPlayer.subWindow.isFullScreen=1;
+ vo_fs=1;
+ }
+ wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
+ } else { vo_x11_fullscreen(); appMPlayer.subWindow.isFullScreen=vo_fs; }
+
+ fullscreen=appMPlayer.subWindow.isFullScreen;
if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
- wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
- mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
+// mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
}
extern int mplSubRender;
- Previous message: [Mplayer-cvslog] CVS: main mplayer.c,1.423,1.424 mplayer.h,1.5,1.6
- Next message: [Mplayer-cvslog] CVS: main/libvo mga_common.c,1.20,1.21 video_out.c,1.42,1.43 video_out.h,1.25,1.26 vo_xmga.c,1.49,1.50 vo_xv.c,1.60,1.61 vo_xvidix.c,1.23,1.24 x11_common.c,1.55,1.56 x11_common.h,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list