[MPlayer-cvslog] r23350 - trunk/libao2/ao_sun.c

reimar subversion at mplayerhq.hu
Sun May 20 10:15:28 CEST 2007


Author: reimar
Date: Sun May 20 10:15:27 2007
New Revision: 23350

Log:
Remove unused code, if it is ever needed it can be recovered from history


Modified:
   trunk/libao2/ao_sun.c

Modified: trunk/libao2/ao_sun.c
==============================================================================
--- trunk/libao2/ao_sun.c	(original)
+++ trunk/libao2/ao_sun.c	Sun May 20 10:15:27 2007
@@ -562,42 +562,6 @@ static int init(int rate,int channels,in
     ao_data.bps = byte_per_sec = bytes_per_sample * ao_data.samplerate;
     ao_data.outburst = byte_per_sec > 100000 ? 16384 : 8192;
 
-#ifdef	__not_used__
-    /*
-     * hmm, ao_data.buffersize is currently not used in this driver, do there's
-     * no need to measure it
-     */
-    if(ao_data.buffersize==-1){
-	// Measuring buffer size:
-	void* data;
-	ao_data.buffersize=0;
-#ifdef HAVE_AUDIO_SELECT
-	data = malloc(ao_data.outburst);
-	memset(data, format==AF_FORMAT_U8 ? 0x80 : 0, ao_data.outburst);
-	while(ao_data.buffersize<0x40000){
-	    fd_set rfds;
-	    struct timeval tv;
-	    FD_ZERO(&rfds); FD_SET(audio_fd,&rfds);
-	    tv.tv_sec=0; tv.tv_usec = 0;
-	    if(!select(audio_fd+1, NULL, &rfds, NULL, &tv)) break;
-	    write(audio_fd,data,ao_data.outburst);
-	    ao_data.buffersize+=ao_data.outburst;
-	}
-	free(data);
-	if(ao_data.buffersize==0){
-	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_CantUseSelect);
-	    return 0;
-	}
-#ifdef	__svr4__
-	// remove the 0 bytes from the above ao_data.buffersize measurement from the
-	// audio driver's STREAMS queue
-	ioctl(audio_fd, I_FLUSH, FLUSHW);
-#endif
-	ioctl(audio_fd, AUDIO_DRAIN, 0);
-#endif
-    }
-#endif	/* __not_used__ */
-
     AUDIO_INITINFO(&info);
     info.play.samples = 0;
     info.play.eof = 0;



More information about the MPlayer-cvslog mailing list