[Mplayer-cvslog] CVS: main mplayer.c,1.471,1.472 playtree.c,1.12,1.13

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv24907

Modified Files:
	mplayer.c playtree.c 
Log Message:
fix playlist bug with gui and rewrite mousecursor show/hide code

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- mplayer.c	15 Apr 2002 22:41:28 -0000	1.471
+++ mplayer.c	16 Apr 2002 17:41:28 -0000	1.472
@@ -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) {
@@ -2938,6 +2927,16 @@
      uninit_player(INITED_ALL-(INITED_GUI+INITED_LIRC+INITED_INPUT));
      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;
 

Index: playtree.c
===================================================================
RCS file: /cvsroot/mplayer/main/playtree.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- playtree.c	20 Mar 2002 10:27:27 -0000	1.12
+++ playtree.c	16 Apr 2002 17:41:28 -0000	1.13
@@ -477,6 +477,9 @@
 play_tree_iter_step(play_tree_iter_t* iter, int d,int with_nodes) {
   play_tree_t* pt;
 
+  if ( !iter ) return PLAY_TREE_ITER_ENTRY;
+  if ( !iter->root ) return PLAY_TREE_ITER_ENTRY;
+  
 #ifdef MP_DEBUG
   assert(iter != NULL);
   assert(iter->root != NULL);