[Mplayer-cvslog] CVS: main mplayer.c,1.257,1.258
Arpi of Ize
arpi at mplayer.dev.hu
Thu Aug 30 23:14:37 CEST 2001
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv6464
Modified Files:
mplayer.c
Log Message:
stop fixed, fileselector supp. maybe not work, couldn't test
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- mplayer.c 30 Aug 2001 12:47:13 -0000 1.257
+++ mplayer.c 30 Aug 2001 21:14:34 -0000 1.258
@@ -434,6 +434,8 @@
int i;
int use_stdin=0; //int f; // filedes
+int gui_no_filename=0;
+
mp_msg_init(MSGL_STATUS);
mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
@@ -484,10 +486,12 @@
exit(0);
}
- if(!num_filenames && !vcd_track && !dvd_title && !use_gui){
+ if(!num_filenames && !vcd_track && !dvd_title){
+ if(!use_gui){
// no file/vcd/dvd -> show HELP:
printf("%s",help_text);
exit(0);
+ } else gui_no_filename=1;
}
// Many users forget to include command line in bugreports...
@@ -572,13 +576,18 @@
curr_filename=0;
play_next_file:
filename=(num_filenames>0)?filenames[curr_filename]:NULL;
+
#ifdef HAVE_NEW_GUI
- if ( use_gui )
- {
- strcpy( mplShMem->Filename,filename );
- mplShMem->Playing=1;
- }
-#endif
+ if ( use_gui ) {
+ if(filename) strcpy( mplShMem->Filename,filename );
+ mplShMem->Playing= (gui_no_filename) ? 0 : 1;
+ while(mplShMem->Playing!=1){
+ usleep(20000);
+ wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
+ }
+ }
+#endif
+
if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,"Playing %s\n", filename);
#ifdef USE_SUB
More information about the MPlayer-cvslog
mailing list