Mercurial > mplayer.hg
diff mplayer.c @ 5651:b8d8d72776f2
fix playlist bug with gui and rewrite mousecursor show/hide code
author | pontscho |
---|---|
date | Tue, 16 Apr 2002 17:41:29 +0000 |
parents | 3d9de27d9bd0 |
children | 117f34bb7097 |
line wrap: on
line diff
--- a/mplayer.c Tue Apr 16 17:29:04 2002 +0000 +++ b/mplayer.c Tue Apr 16 17:41:29 2002 +0000 @@ -1223,6 +1223,7 @@ mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error opening/initializing the selected video_out (-vo) device!\n"); goto goto_next_file; // exit_player(MSGTR_Exit_error); } +vo_mouse_timer_const=(int)sh_video->fps; sh_video->video_out=video_out; inited_flags|=INITED_VO; @@ -2902,18 +2903,6 @@ } -#ifdef HAVE_NEW_GUI - if( use_gui ) - { -#ifdef USE_DVDREAD - if ( !guiIntfStruct.DVDChanged ) -#endif - mplStop(); -#warning workaround for kiba playtree with gui ... if i dont play the prev/next file, then playtree sig6 (assert) -// eof=0; - } -#endif - uninit_player(INITED_VO|INITED_AO); if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) { @@ -2939,6 +2928,16 @@ eof = eof == PT_PREV_SRC ? -1 : 1; } +#ifdef HAVE_NEW_GUI + if( use_gui && !playtree_iter ) + { +#ifdef USE_DVDREAD + if ( !guiIntfStruct.DVDChanged ) +#endif + mplStop(); + } +#endif + if(eof == 0) eof = 1; while(playtree_iter != NULL) {