Mercurial > mplayer.hg

changeset 1790:f34087fa1469

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stop fix, fileselector worx
author arpi
date Thu, 30 Aug 2001 21:49:24 +0000
parents 8bbfd587166b
children 2e86c5c8071e
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Thu Aug 30 21:39:31 2001 +0000
+++ b/mplayer.c	Thu Aug 30 21:49:24 2001 +0000
@@ -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);