diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-16 17:41:29 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-16 17:41:29 +0000 |
commit | da6135b983a530787ac61b8ff01a6aab54918fcb (patch) | |
tree | 82c61b32480be6302fbb6fbd86671c868bbc3f32 /mplayer.c | |
parent | f974b8e83f90d1288d47ff4e0317abcc3a4fc31b (diff) | |
download | mpv-da6135b983a530787ac61b8ff01a6aab54918fcb.tar.bz2 mpv-da6135b983a530787ac61b8ff01a6aab54918fcb.tar.xz |
fix playlist bug with gui and rewrite mousecursor show/hide code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5652 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 23 |
1 files changed, 11 insertions, 12 deletions
@@ -1223,6 +1223,7 @@ if((video_out->preinit(vo_subdevice))!=0){ 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 @@ if(benchmark){ } -#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 @@ if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) { 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) { |