diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-21 21:20:52 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-21 21:20:52 +0000 |
commit | 9be78192bba31c64dcc9c4e17dee38cfbd92ab34 (patch) | |
tree | e45f4f5f3753cbe7ab71a8cac89da1d46e1d2713 /Gui | |
parent | ec21f4caa0b6b422468c279b3dfe25ead7d8acc5 (diff) | |
download | mpv-9be78192bba31c64dcc9c4e17dee38cfbd92ab34.tar.bz2 mpv-9be78192bba31c64dcc9c4e17dee38cfbd92ab34.tar.xz |
10l+
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4798 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r-- | Gui/mplayer/mplayer.c | 1 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 3 | ||||
-rw-r--r-- | Gui/mplayer/psignal.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/sw.h | 6 |
4 files changed, 2 insertions, 10 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 99e3e29613..ac6552f0a6 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -81,7 +81,6 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height ); vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC ); - vo_setwindowsize( appMPlayer.sub.width,appMPlayer.sub.height ); i=wsHideFrame|wsMaxSize|wsHideWindow; if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow; diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index ec7d52204c..0eaef673d7 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -126,9 +126,6 @@ void mplState( void ) void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) { -// printf( "----resize---> %dx%d --- \n",width,height ); - vo_setwindowsize( width,height ); - vo_resize=1; } void mplMPlayerInit( int argc,char* argv[], char *envp[] ) diff --git a/Gui/mplayer/psignal.h b/Gui/mplayer/psignal.h index 91b6bf7c94..8e7f8639d8 100644 --- a/Gui/mplayer/psignal.h +++ b/Gui/mplayer/psignal.h @@ -42,7 +42,7 @@ #ifndef SIGTYPE #ifdef SIGUSR2 #define SIGTYPE SIGUSR2 -#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too? +//#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too? #else #ifdef __bsdi__ #define _NSIG NSIG diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h index 8b195203d6..85ae30820d 100644 --- a/Gui/mplayer/sw.h +++ b/Gui/mplayer/sw.h @@ -11,11 +11,7 @@ void mplSubDraw( wsParamDisplay ) if ( !appMPlayer.subWindow.Mapped || appMPlayer.subWindow.Visible == wsWindowNotVisible ) return; - if ( mplShMem->Playing ) - { - vo_expose=1; - mplSubRender=0; - } + if ( mplShMem->Playing ) mplSubRender=0; if ( mplSubRender ) { |