--- sourceforge.net/trunk/rdesktop/rdpsnd_sun.c	2003/10/13 16:09:45	491
+++ sourceforge.net/trunk/rdesktop/rdpsnd_sun.c	2004/11/03 10:05:02	794
@@ -26,17 +26,21 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/audioio.h>
+
+#if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 #include <stropts.h>
+#endif
 
 #define MAX_QUEUE	10
 
 int g_dsp_fd;
-BOOL g_dsp_busy;
-static BOOL reopened;
-static BOOL swapaudio;
-static short samplewidth;
+BOOL g_dsp_busy = False;
+static BOOL g_reopened;
+static BOOL g_swapaudio;
+static short g_samplewidth;
 
-static struct audio_packet {
+static struct audio_packet
+{
 	struct stream s;
 	uint16 tick;
 	uint8 index;
@@ -48,23 +52,23 @@
 {
 	char *dsp_dev = getenv("AUDIODEV");
 
-	if ( dsp_dev == NULL )
+	if (dsp_dev == NULL)
 	{
-		dsp_dev="/dev/audio";
+		dsp_dev = strdup("/dev/audio");
 	}
 
-	if ((g_dsp_fd = open(dsp_dev, O_WRONLY|O_NONBLOCK)) == -1)
+	if ((g_dsp_fd = open(dsp_dev, O_WRONLY | O_NONBLOCK)) == -1)
 	{
 		perror(dsp_dev);
 		return False;
 	}
 
 	/* Non-blocking so that user interface is responsive */
-	fcntl(g_dsp_fd, F_SETFL, fcntl(g_dsp_fd, F_GETFL)|O_NONBLOCK);
-	
+	fcntl(g_dsp_fd, F_SETFL, fcntl(g_dsp_fd, F_GETFL) | O_NONBLOCK);
+
 	queue_lo = queue_hi = 0;
-	reopened = True;
-	
+	g_reopened = True;
+
 	return True;
 }
 
@@ -72,20 +76,25 @@
 wave_out_close(void)
 {
 	/* Ack all remaining packets */
-	while ( queue_lo != queue_hi )
+	while (queue_lo != queue_hi)
 	{
 		rdpsnd_send_completion(packet_queue[queue_lo].tick, packet_queue[queue_lo].index);
 		free(packet_queue[queue_lo].s.data);
 		queue_lo = (queue_lo + 1) % MAX_QUEUE;
 	}
 
+#if defined I_FLUSH && defined FLUSHW
 	/* Flush the audiobuffer */
-	ioctl(g_dsp_fd,I_FLUSH,FLUSHW);
+	ioctl(g_dsp_fd, I_FLUSH, FLUSHW);
+#endif
+#if defined AUDIO_FLUSH
+	ioctl(g_dsp_fd, AUDIO_FLUSH, NULL);
+#endif
 	close(g_dsp_fd);
 }
 
 BOOL
-wave_out_format_supported(WAVEFORMATEX *pwfx)
+wave_out_format_supported(WAVEFORMATEX * pwfx)
 {
 	if (pwfx->wFormatTag != WAVE_FORMAT_PCM)
 		return False;
@@ -98,13 +107,12 @@
 }
 
 BOOL
-wave_out_set_format(WAVEFORMATEX *pwfx)
+wave_out_set_format(WAVEFORMATEX * pwfx)
 {
 	audio_info_t info;
-	int test = 1;
 
 	ioctl(g_dsp_fd, AUDIO_DRAIN, 0);
-	swapaudio = False;
+	g_swapaudio = False;
 	AUDIO_INITINFO(&info);
 
 
@@ -116,19 +124,23 @@
 	{
 		info.play.encoding = AUDIO_ENCODING_LINEAR;
 		/* Do we need to swap the 16bit values? (Are we BigEndian) */
-		swapaudio = !(*(uint8 *) (&test));
+#ifdef B_ENDIAN
+		g_swapaudio = 1;
+#else
+		g_swapaudio = 0;
+#endif
 	}
 
-	samplewidth = pwfx->wBitsPerSample/8;
+	g_samplewidth = pwfx->wBitsPerSample / 8;
 
-	if (pwfx->nChannels == 1 )
-	{	
-		info.play.channels = AUDIO_CHANNELS_MONO;
+	if (pwfx->nChannels == 1)
+	{
+		info.play.channels = 1;
 	}
-	else if (pwfx->nChannels == 2 )
+	else if (pwfx->nChannels == 2)
 	{
-		info.play.channels = AUDIO_CHANNELS_STEREO;
-		samplewidth *= 2;
+		info.play.channels = 2;
+		g_samplewidth *= 2;
 	}
 
 	info.play.sample_rate = pwfx->nSamplesPerSec;
@@ -136,7 +148,7 @@
 	info.play.samples = 0;
 	info.play.eof = 0;
 	info.play.error = 0;
-	reopened = True;
+	g_reopened = True;
 
 	if (ioctl(g_dsp_fd, AUDIO_SETINFO, &info) == -1)
 	{
@@ -155,24 +167,22 @@
 	uint balance;
 	uint volume;
 
-	if (ioctl(g_dsp_fd, AUDIO_GETINFO, &info) == -1)
-	{
-		perror("AUDIO_GETINFO");
-		return;
-	}
+	AUDIO_INITINFO(&info);
 
 	volume = (left > right) ? left : right;
 
-	if ( volume/AUDIO_MID_BALANCE != 0 )
+	if (volume / AUDIO_MID_BALANCE != 0)
 	{
-		balance = AUDIO_MID_BALANCE - (left/(volume/AUDIO_MID_BALANCE)) + (right/(volume/AUDIO_MID_BALANCE));
+		balance =
+			AUDIO_MID_BALANCE - (left / (volume / AUDIO_MID_BALANCE)) +
+			(right / (volume / AUDIO_MID_BALANCE));
 	}
 	else
 	{
 		balance = AUDIO_MID_BALANCE;
 	}
 
-	info.play.gain = volume/(65536/AUDIO_MAX_GAIN);
+	info.play.gain = volume / (65536 / AUDIO_MAX_GAIN);
 	info.play.balance = balance;
 
 	if (ioctl(g_dsp_fd, AUDIO_SETINFO, &info) == -1)
@@ -193,7 +203,7 @@
 		error("No space to queue audio packet\n");
 		return;
 	}
-	
+
 	queue_hi = next_hi;
 
 	packet->s = *s;
@@ -224,13 +234,13 @@
 
 	while (1)
 	{
-		if ( reopened )
+		if (g_reopened)
 		{
 			/* Device was just (re)openend */
 			samplecnt = 0;
 			swapped = False;
 			sentcompletion = True;
-			reopened = False;
+			g_reopened = False;
 		}
 
 		if (queue_lo == queue_hi)
@@ -243,9 +253,9 @@
 		out = &packet->s;
 
 		/* Swap the current packet, but only once */
-		if ( swapaudio && ! swapped )
+		if (g_swapaudio && !swapped)
 		{
-			for ( i = 0; i < out->end - out->p; i += 2 )
+			for (i = 0; i < out->end - out->p; i += 2)
 			{
 				swap = *(out->p + i);
 				*(out->p + i) = *(out->p + i + 1);
@@ -254,15 +264,15 @@
 			swapped = True;
 		}
 
-		if ( sentcompletion )
+		if (sentcompletion)
 		{
 			sentcompletion = False;
-			numsamples = (out->end - out->p)/samplewidth;
+			numsamples = (out->end - out->p) / g_samplewidth;
 		}
 
-		len=0;
+		len = 0;
 
-		if ( out->end != out->p )
+		if (out->end != out->p)
 		{
 			len = write(g_dsp_fd, out->p, out->end - out->p);
 			if (len == -1)
@@ -284,7 +294,7 @@
 			}
 
 			/* Ack the packet, if we have played at least 70% */
-			if ( info.play.samples >= samplecnt+((numsamples*7)/10) )
+			if (info.play.samples >= samplecnt + ((numsamples * 7) / 10))
 			{
 				samplecnt += numsamples;
 				rdpsnd_send_completion(packet->tick, packet->index);