RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-04 06:01:56 +00:00
Code Issues Releases Wiki Activity

compile bug fixed.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1953 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-09-25 14:00:19 +00:00
parent 3649b763b1
commit 4d0c8f973d
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Gui/mplayer/play.c
View File

@ -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 );
}

3
Gui/mplayer/play.h
View File

@ -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 );

18
mplayer.c
View File

@ -1026,9 +1026,11 @@ current_module="init_libvo";
#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 @@ goto_next_file: // don't jump here after ao/vo/getch initialization!
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