summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-25 15:13:58 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-25 15:13:58 +0000
commit66a5cbaeabe4d18456be734b031cffdf1dd0e69c (patch)
tree3cee23145495e2c4c115d760bbc3f0ff009a2a12
parent4d0c8f973d69f46ec531bae54ef9ce050ac5e5b4 (diff)
downloadmpv-66a5cbaeabe4d18456be734b031cffdf1dd0e69c.tar.bz2
mpv-66a5cbaeabe4d18456be734b031cffdf1dd0e69c.tar.xz
stop bug fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1954 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Gui/mplayer/play.c6
-rw-r--r--mplayer.c7
2 files changed, 3 insertions, 10 deletions
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index f1ef8634d5..5d94f239ac 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -50,15 +50,15 @@ void mplStop()
mplShMem->TimeSec=0;
mplShMem->Position=0;
mplShMem->AudioType=0;
- mplSubRender=1;
- wsPostRedisplay( &appMPlayer.subWindow );
- if ( !mplShMem->Playing ) return;
+// if ( !mplShMem->Playing ) return;
if ( !appMPlayer.subWindow.isFullScreen )
{
wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
}
mplSubRender=1;
+ wsClearWindow( appMPlayer.subWindow );
+ wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
wsPostRedisplay( &appMPlayer.subWindow );
}
diff --git a/mplayer.c b/mplayer.c
index d30fe452cc..fd7aeeaa1e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1026,8 +1026,6 @@ 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 );
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;
@@ -1923,11 +1921,6 @@ 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;
}
#endif