[Mplayer-cvslog] CVS: main mplayer.c,1.397,1.398
David Holm
mswitch at mplayer.dev.hu
Mon Feb 18 18:34:23 CET 2002
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv2167
Modified Files:
mplayer.c
Log Message:
Added VOCTRL_PAUSE and VOCTRL_RESUME
Fixed playback bug in vo_dxr3 which would cause syncloss when playing
ntsc movies on pal and vice versa (this does not affect mpeg playback as
we still don't know how to set the internal fps registers)
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- mplayer.c 17 Feb 2002 17:35:34 -0000 1.397
+++ mplayer.c 18 Feb 2002 17:34:14 -0000 1.398
@@ -1957,6 +1957,9 @@
#ifdef HAVE_NEW_GUI
if(use_gui) mplShMem->Playing=2;
#endif
+ if (video_out && sh_video)
+ video_out->control(VOCTRL_PAUSE, NULL);
+
if (audio_out && sh_audio)
audio_out->pause(); // pause audio, keep data if possible
@@ -2005,6 +2008,8 @@
osd_function=OSD_PLAY;
if (audio_out && sh_audio)
audio_out->resume(); // resume audio
+ if (video_out && sh_video)
+ video_out->control(VOCTRL_RESUME, NULL); // resume video
(void)GetRelativeTime(); // keep TF around FT in next cycle
#ifdef HAVE_NEW_GUI
if(use_gui && !gui_pause_flag) mplShMem->Playing=1; // play from keyboard
More information about the MPlayer-cvslog
mailing list