Mercurial > mplayer.hg

changeset 1952:b55163894e30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compile bug fixed.
author pontscho
date Tue, 25 Sep 2001 14:00:19 +0000
parents b2b85982fc0e
children 041483da104e
files Gui/mplayer/play.c Gui/mplayer/play.h mplayer.c
diffstat 3 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/mplayer/play.c	Tue Sep 25 07:20:42 2001 +0000
+++ b/Gui/mplayer/play.c	Tue Sep 25 14:00:19 2001 +0000
@@ -46,11 +46,13 @@
 
 void mplStop()
 {
- if ( !mplShMem->Playing ) return;
  mplShMem->Playing=0;
  mplShMem->TimeSec=0;
  mplShMem->Position=0;
  mplShMem->AudioType=0;
+ mplSubRender=1;
+ wsPostRedisplay( &appMPlayer.subWindow );
+ if ( !mplShMem->Playing ) return;
  if ( !appMPlayer.subWindow.isFullScreen )
   {
    wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
@@ -197,3 +199,9 @@
  wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
  if ( mplShMem->SkinChange ) { ChangeSkin(); mplShMem->SkinChange=0;  }
 }
+
+void mplResizeToMovieSize( unsigned int width,unsigned int height )
+{
+ if ( !appMPlayer.subWindow.isFullScreen )
+   wsResizeWindow( &appMPlayer.subWindow,width,height );
+}
--- a/Gui/mplayer/play.h	Tue Sep 25 07:20:42 2001 +0000
+++ b/Gui/mplayer/play.h	Tue Sep 25 14:00:19 2001 +0000
@@ -4,8 +4,6 @@
 
 #include "./psignal.h"
 #include "./mplayer.h"
-#include "../wm/ws.h"
-#include "../app.h"
 
 typedef struct
 {
@@ -77,6 +75,7 @@
 extern void mplPlay( void );
 extern void mplPause( 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 );
 extern void mplDecAudioBufDelay( void );
--- a/mplayer.c	Tue Sep 25 07:20:42 2001 +0000
+++ b/mplayer.c	Tue Sep 25 14:00:19 2001 +0000
@@ -1026,9 +1026,11 @@
 #ifdef HAVE_NEW_GUI
    if ( use_gui )
     {
-     if ( !appMPlayer.subWindow.isFullScreen ) wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h );
-     moviewidth=screen_size_x=appMPlayer.subWindow.Width;
-     movieheight=screen_size_y=appMPlayer.subWindow.Height;
+//     if ( !appMPlayer.subWindow.isFullScreen ) 
+//     wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h );
+     mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h );
+     moviewidth=screen_size_x=sh_video->disp_w;
+     movieheight=screen_size_y=sh_video->disp_h;
     }
 #endif
 
@@ -1921,11 +1923,11 @@
       if(use_gui) 
        {
         mplStop();
-        mplSubRender=1;
-        wsPostRedisplay( &appMPlayer.subWindow );
-        mplShMem->TimeSec=0;
-        mplShMem->Position=0;       
-	mplShMem->FrameDrop=0;
+//        mplSubRender=1;
+//        wsPostRedisplay( &appMPlayer.subWindow );
+//        mplShMem->TimeSec=0;
+//        mplShMem->Position=0;       
+//	mplShMem->FrameDrop=0;
        }	
 #endif