[Mplayer-cvslog] CVS: main mplayer.c,1.105,1.106

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv21691

Modified Files:
	mplayer.c 
Log Message:
audio_reset, dshow NULLptr fix

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -r1.105 -r1.106
*** mplayer.c	2001/05/07 00:03:30	1.105
--- mplayer.c	2001/05/08 01:56:03	1.106
***************
*** 4,7 ****
--- 4,9 ----
  //#define SIMULATE_ALSA
  
+ #define RESET_AUDIO(audio_fd) ioctl(audio_fd, SNDCTL_DSP_RESET, NULL)
+ //#define RESET_AUDIO(audio_fd)
  
  #include <stdio.h>
***************
*** 1255,1258 ****
--- 1257,1261 ----
    a_frame=-(buffer_delay);
    printf("Audio buffer size: %d bytes, delay: %5.3fs\n",audio_buffer_size,buffer_delay);
+ //  RESET_AUDIO(audio_fd);
  }
  
***************
*** 1432,1436 ****
      current_module="draw_frame";
  
!     if(!drop_frame){
        t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
        if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
--- 1435,1439 ----
      current_module="draw_frame";
  
!     if(!drop_frame && sh_video->our_out_buffer){
        t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
        if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
***************
*** 2035,2038 ****
--- 2038,2044 ----
        audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
  //      num_frames=real_num_frames=0;
+ 
+       RESET_AUDIO(audio_fd);
+ 
    }
  } // keyboard event handler


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog