--- sourceforge.net/trunk/rdesktop/rdpsnd_oss.c	2003/10/29 14:14:46	532
+++ sourceforge.net/trunk/rdesktop/rdpsnd_oss.c	2004/11/03 09:57:48	793
@@ -1,4 +1,4 @@
-/* 
+/*
    rdesktop: A Remote Desktop Protocol client.
    Sound Channel Process Functions - Open Sound System
    Copyright (C) Matthew Chapman 2003
@@ -33,6 +33,7 @@
 BOOL g_dsp_busy = False;
 static int g_snd_rate;
 static short g_samplewidth;
+static BOOL g_driver_broken = False;
 
 static struct audio_packet
 {
@@ -45,7 +46,12 @@
 BOOL
 wave_out_open(void)
 {
-	char *dsp_dev = "/dev/dsp";
+	char *dsp_dev = getenv("AUDIODEV");
+
+	if (dsp_dev == NULL)
+	{
+		dsp_dev = "/dev/dsp";
+	}
 
 	if ((g_dsp_fd = open(dsp_dev, O_WRONLY | O_NONBLOCK)) == -1)
 	{
@@ -80,7 +86,7 @@
 BOOL
 wave_out_set_format(WAVEFORMATEX * pwfx)
 {
-	int channels, format;
+	int stereo, format, fragments;
 
 	ioctl(g_dsp_fd, SNDCTL_DSP_RESET, NULL);
 	ioctl(g_dsp_fd, SNDCTL_DSP_SYNC, NULL);
@@ -99,17 +105,21 @@
 		return False;
 	}
 
-	channels = pwfx->nChannels;
-	if (ioctl(g_dsp_fd, SNDCTL_DSP_CHANNELS, &channels) == -1)
+	if (pwfx->nChannels == 2)
 	{
-		perror("SNDCTL_DSP_CHANNELS");
-		close(g_dsp_fd);
-		return False;
+		stereo = 1;
+		g_samplewidth *= 2;
+	}
+	else
+	{
+		stereo = 0;
 	}
 
-	if (channels == 2)
+	if (ioctl(g_dsp_fd, SNDCTL_DSP_STEREO, &stereo) == -1)
 	{
-		g_samplewidth *= 2;
+		perror("SNDCTL_DSP_CHANNELS");
+		close(g_dsp_fd);
+		return False;
 	}
 
 	g_snd_rate = pwfx->nSamplesPerSec;
@@ -120,6 +130,31 @@
 		return False;
 	}
 
+	/* try to get 7 fragments of 2^12 bytes size */
+	fragments = (7 << 16) + 12;
+	ioctl(g_dsp_fd, SNDCTL_DSP_SETFRAGMENT, &fragments);
+
+	if (!g_driver_broken)
+	{
+		audio_buf_info info;
+
+		memset(&info,0,sizeof(info));
+		if (ioctl(g_dsp_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
+		{
+			perror("SNDCTL_DSP_GETOSPACE");
+			close(g_dsp_fd);
+			return False;
+		}
+
+		if (info.fragments == 0 || info.fragstotal == 0 || info.fragsize == 0)
+		{
+			fprintf(stderr,
+				"Broken OSS-driver detected: fragments: %d, fragstotal: %d, fragsize: %d\n",
+				info.fragments, info.fragstotal, info.fragsize);
+			g_driver_broken = True;
+		}
+	}
+
 	return True;
 }
 
@@ -178,7 +213,7 @@
 	packet->s.p += 4;
 
 	/* we steal the data buffer from s, give it a new one */
-	s->data = malloc(s->size);
+	s->data = (uint8 *) malloc(s->size);
 
 	if (!g_dsp_busy)
 		wave_out_play();
@@ -194,6 +229,7 @@
 	static long startedat_s;
 	static BOOL started = False;
 	struct timeval tv;
+	audio_buf_info info;
 
 	while (1)
 	{
@@ -214,7 +250,32 @@
 			started = True;
 		}
 
-		len = write(g_dsp_fd, out->p, out->end - out->p);
+		len = out->end - out->p;
+
+		if (!g_driver_broken)
+		{
+			memset(&info,0,sizeof(info));
+			if (ioctl(g_dsp_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
+			{
+				perror("SNDCTL_DSP_GETOSPACE");
+				return;
+			}
+
+			if (info.fragments == 0)
+			{
+				g_dsp_busy = 1;
+				return;
+			}
+
+			if (info.fragments * info.fragsize < len
+			    && info.fragments * info.fragsize > 0)
+			{
+				len = info.fragments * info.fragsize;
+			}
+		}
+
+
+		len = write(g_dsp_fd, out->p, len);
 		if (len == -1)
 		{
 			if (errno != EWOULDBLOCK)
@@ -233,7 +294,7 @@
 			duration = (out->size * (1000000 / (g_samplewidth * g_snd_rate)));
 			elapsed = (tv.tv_sec - startedat_s) * 1000000 + (tv.tv_usec - startedat_us);
 
-			if (elapsed >= (duration * 7) / 10)
+			if (elapsed >= (duration * 85) / 100)
 			{
 				rdpsnd_send_completion(packet->tick, packet->index);
 				free(out->data);