[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.21,1.22 mw.h,1.49,1.50 play.c,1.51,1.52 play.h,1.20,1.21
Zoltan Ponekker
pontscho at mplayer.dev.hu
Mon Mar 11 10:19:17 CET 2002
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv19914/Gui/mplayer
Modified Files:
mplayer.c mw.h play.c play.h
Log Message:
remove obsoleted function (mplResize)
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mplayer.c 23 Feb 2002 15:12:53 -0000 1.21
+++ mplayer.c 11 Mar 2002 09:19:14 -0000 1.22
@@ -97,7 +97,6 @@
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 @@
btnModify( evSetVolume,guiIntfStruct.Volume );
btnModify( evSetBalance,guiIntfStruct.Balance );
btnModify( evSetMoviePosition,guiIntfStruct.Position );
+
+ if ( fullscreen )
+ {
+ btnModify( evFullScreen,btnPressed );
+ mplFullScreen();
+ }
guiIntfStruct.Playing=0;
Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mw.h 7 Mar 2002 17:50:24 -0000 1.49
+++ mw.h 11 Mar 2002 09:19:14 -0000 1.50
@@ -359,7 +359,6 @@
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 @@
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:
Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- play.c 10 Mar 2002 23:20:01 -0000 1.51
+++ play.c 11 Mar 2002 09:19:14 -0000 1.52
@@ -55,7 +55,6 @@
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;
@@ -119,10 +118,6 @@
btnModify( evPlaySwitchToPause,btnDisabled );
btnModify( evPauseSwitchToPlay,btnReleased );
}
-}
-
-void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )
-{
}
void mplMPlayerInit( int argc,char* argv[], char *envp[] )
Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- play.h 23 Feb 2002 15:12:53 -0000 1.20
+++ play.h 11 Mar 2002 09:19:14 -0000 1.21
@@ -13,7 +13,6 @@
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 );
More information about the MPlayer-cvslog
mailing list