Mercurial > mplayer.hg

changeset 5046:b3bd4b29a03b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove obsoleted function (mplResize)
author pontscho
date Mon, 11 Mar 2002 09:19:15 +0000
parents ccf1be6ccf5e
children 2c0b97e0293e
files Gui/mplayer/mplayer.c Gui/mplayer/mw.h Gui/mplayer/play.c Gui/mplayer/play.h input/input.c mplayer.c
diffstat 6 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/mplayer/mplayer.c	Mon Mar 11 09:01:43 2002 +0000
+++ b/Gui/mplayer/mplayer.c	Mon Mar 11 09:19:15 2002 +0000
@@ -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;
 
--- a/Gui/mplayer/mw.h	Mon Mar 11 09:01:43 2002 +0000
+++ b/Gui/mplayer/mw.h	Mon Mar 11 09:19:15 2002 +0000
@@ -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:
--- a/Gui/mplayer/play.c	Mon Mar 11 09:01:43 2002 +0000
+++ b/Gui/mplayer/play.c	Mon Mar 11 09:19:15 2002 +0000
@@ -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;
@@ -121,10 +120,6 @@
    }
 }
 
-void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )
-{
-}
-
 void mplMPlayerInit( int argc,char* argv[], char *envp[] )
 {
  guiIntfStruct.Balance=50.0f;
--- a/Gui/mplayer/play.h	Mon Mar 11 09:01:43 2002 +0000
+++ b/Gui/mplayer/play.h	Mon Mar 11 09:19:15 2002 +0000
@@ -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 );
--- a/input/input.c	Mon Mar 11 09:01:43 2002 +0000
+++ b/input/input.c	Mon Mar 11 09:19:15 2002 +0000
@@ -860,9 +860,10 @@
 void
 mp_cmd_free(mp_cmd_t* cmd) {
   int i;
-#ifdef MP_DEBUG
-  assert(cmd != NULL);
-#endif
+//#ifdef MP_DEBUG
+//  assert(cmd != NULL);
+//#endif
+  if ( !cmd ) return;
 
   if(cmd->name)
     free(cmd->name);
--- a/mplayer.c	Mon Mar 11 09:01:43 2002 +0000
+++ b/mplayer.c	Mon Mar 11 09:19:15 2002 +0000
@@ -2070,7 +2070,7 @@
              usleep(20000);
 #ifdef HAVE_NEW_INPUT
          }
-      if ( cmd ) mp_cmd_free(cmd);
+      mp_cmd_free(cmd);
 #else
              if(use_stdin) usec_sleep(1000); // do not eat the CPU
          }