diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-02 15:01:56 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-02 15:01:56 +0000 |
commit | 218548d50c2839eb03955a351e740e7b6dbcfafd (patch) | |
tree | 9742d46d6459c71a0bf391355b0298a2c4b13b03 /Gui/mplayer | |
parent | d65a7da22183da0bb47eeea99da9cd44087cf395 (diff) | |
download | mpv-218548d50c2839eb03955a351e740e7b6dbcfafd.tar.bz2 mpv-218548d50c2839eb03955a351e740e7b6dbcfafd.tar.xz |
fix other bugs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2046 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mw.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/sw.h | 15 |
3 files changed, 16 insertions, 5 deletions
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 947dd91c01..38ac506512 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -17,7 +17,7 @@ char * Translate( char * str ) static char trbuf[512]; char tmp[128]; int i,c; - int t,h,m,s; + int t; memset( trbuf,0,512 ); memset( tmp,0,128 ); for ( c=0,i=0;i < strlen( str );i++ ) diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 22c6305005..e766d0df21 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -52,6 +52,8 @@ void mplFullScreen( void ) wsWindowDecoration( &appMPlayer.subWindow,0 ); appMPlayer.subWindow.isFullScreen=1; } + if ( mplShMem->Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); + else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height ); } @@ -71,8 +73,8 @@ void mplStop() wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y ); } mplSubRender=1; - wsClearWindow( appMPlayer.subWindow ); wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); + wsClearWindow( appMPlayer.subWindow ); wsPostRedisplay( &appMPlayer.subWindow ); } diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h index a97dc88921..8f0ca754da 100644 --- a/Gui/mplayer/sw.h +++ b/Gui/mplayer/sw.h @@ -6,7 +6,8 @@ int SubVisible = 0; void mplSubDraw( wsParamDisplay ) { - if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible=0; + if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++; + if ( !appMPlayer.subWindow.Mapped || appMPlayer.subWindow.Visible == wsWindowNotVisible ) return; @@ -64,8 +65,16 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY ) // if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow ); if ( !mplSubMoved ) { - if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.subWindow ); - else wsMoveTopWindow( &appMPlayer.mainWindow ); + if( SubVisible++%2 ) + { + wsMoveTopWindow( &appMPlayer.mainWindow ); + fprintf( stderr,"[sw] MAIN TOP\n" ); + } + else + { + wsMoveTopWindow( &appMPlayer.subWindow ); + fprintf( stderr,"[sw] SUB TOP\n" ); + } } msButton=0; mplSubMoved=0; |