summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-25 14:00:19 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-25 14:00:19 +0000
commit4d0c8f973d69f46ec531bae54ef9ce050ac5e5b4 (patch)
tree6c41dcb489e3cf1f7d435a9a6c619e4cbee14421 /Gui
parent3649b763b161457c5fa4c4cc138fc3c8cf71b1d7 (diff)
downloadmpv-4d0c8f973d69f46ec531bae54ef9ce050ac5e5b4.tar.bz2
mpv-4d0c8f973d69f46ec531bae54ef9ce050ac5e5b4.tar.xz
compile bug fixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1953 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/play.c10
-rw-r--r--Gui/mplayer/play.h3
2 files changed, 10 insertions, 3 deletions
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index fbf9b610c9..f1ef8634d5 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -46,11 +46,13 @@ extern int mplSubRender;
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 @@ void EventHandling( void )
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 );
+}
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index 8de211c51e..f286d1b934 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -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 mplFullScreen( void );
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 );