[Mplayer-cvslog] CVS: main mplayer.c,1.258,1.259

[Arpi of Ize]

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

Modified Files:
	mplayer.c 
Log Message:
stop fix, fileselector worx

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- mplayer.c	30 Aug 2001 21:14:34 -0000	1.258
+++ mplayer.c	30 Aug 2001 21:49:24 -0000	1.259
@@ -585,6 +585,9 @@
 	usleep(20000);
 	wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
       }
+      if(gui_no_filename){
+        filename=mplShMem->Filename;
+      }
     }
 #endif
 
@@ -1777,7 +1780,7 @@
 	  mplShMem->Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f);
 	}
 	mplShMem->TimeSec=d_video->pts; 
-	printf("mplShMem->Playing=%d  \n",mplShMem->Playing);
+//	printf("mplShMem->Playing=%d  \n",mplShMem->Playing);
 	if(mplShMem->Playing==0) break; // STOP
 	if(mplShMem->Playing==2) osd_function=OSD_PAUSE;
       }
@@ -1832,7 +1835,7 @@
 }
 
 
-if(curr_filename+1<num_filenames){
+if(curr_filename+1<num_filenames || use_gui){
     // partial uninit:
 
   // restore terminal:
@@ -1852,8 +1855,7 @@
 }
 
 goto_next_file:  // don't jump here after ao/vo/getch initialization!
-    ++curr_filename;
-if(curr_filename<num_filenames){
+if(use_gui || ++curr_filename<num_filenames){
 
   current_module="uninit_vcodec";
   if(sh_video) uninit_video(sh_video);