[Mplayer-cvslog] CVS: main mplayer.c,1.260,1.261

Arpi of Ize arpi at mplayer.dev.hu
Fri Aug 31 01:11:08 CEST 2001


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

Modified Files:
	mplayer.c 
Log Message:
gui status maintaining - now pause from console works, and gui display is in sync with osd

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- mplayer.c	30 Aug 2001 22:56:27 -0000	1.260
+++ mplayer.c	30 Aug 2001 23:11:06 -0000	1.261
@@ -1497,6 +1497,9 @@
 
   if(osd_function==OSD_PAUSE){
       mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");fflush(stdout);
+#ifdef HAVE_NEW_GUI
+      if(use_gui) mplShMem->Playing=2;
+#endif
       if (audio_out && sh_audio)
          audio_out->pause();	// pause audio, keep data if possible
          while(
@@ -1518,6 +1521,9 @@
          osd_function=OSD_PLAY;
       if (audio_out && sh_audio)
         audio_out->resume();	// resume audio
+#ifdef HAVE_NEW_GUI
+      if(use_gui) if(mplShMem->Playing==2) mplShMem->Playing=1;
+#endif
   }
 
 
@@ -1834,6 +1840,9 @@
 
 }
 
+#ifdef HAVE_NEW_GUI
+      if(use_gui) mplShMem->Playing=0;
+#endif
 
 if(curr_filename+1<num_filenames || use_gui){
     // partial uninit:




More information about the MPlayer-cvslog mailing list