[CF-Devel] CVS update: client

[Crossfire CVS devel]

Date:	Thursday August 10, 2000 @ 20:57
Author:	cvs

Update of /home/cvs/CVS/client
In directory boltzmann.eecs.berkeley.edu:/tmp/cvs-serv1670

Modified Files:
	cfsndserv.c CHANGES 
Log Message:
cfsndserv.c: Make some changes so that sound on ultrasparc systems is played
properly.  Missing FD_SET call to re-add the soundfd, as well as a missing
wrap check for first_free_buffer.  MSW 8/10/2000



****************************************

Index: client/cfsndserv.c
diff -u client/cfsndserv.c:1.2 client/cfsndserv.c:1.3
--- client/cfsndserv.c:1.2	Thu Apr 20 23:47:42 2000
+++ client/cfsndserv.c	Thu Aug 10 20:57:09 2000
@@ -791,6 +791,7 @@
 	    (first_free_buffer >= current_buffer))
 		first_free_buffer = buf+1;
     }
+    if (first_free_buffer >= settings.buffers) first_free_buffer=0;
 }
 
 int SoundCmd(unsigned char *data,  int len)
@@ -925,6 +926,11 @@
              if (current_buffer>=settings.buffers) current_buffer=0;
            }
 	}   
+      } else {
+	/* We need to reset this if it is not set - otherwise, we will never
+	 * finish playing the sounds
+	 */
+	FD_SET(soundfd,&outset);
       }
       if (FD_ISSET(infd,&inset)){
         int err=read(infd,inbuf+inbuf_pos,1);
Index: client/CHANGES
diff -u client/CHANGES:1.18 client/CHANGES:1.19
--- client/CHANGES:1.18	Sun Aug  6 22:27:22 2000
+++ client/CHANGES	Thu Aug 10 20:57:09 2000
@@ -1,5 +1,9 @@
-"$Id: CHANGES,v 1.18 2000/08/07 05:27:22 cvs Exp $"
+"$Id: CHANGES,v 1.19 2000/08/11 03:57:09 cvs Exp $"
 Top of CVS tree:
+
+cfsndserv.c: Make some changes so that sound on ultrasparc systems is played
+properly.  Missing FD_SET call to re-add the soundfd, as well as a missing
+wrap check for first_free_buffer.  MSW 8/10/2000
 
 The following matches a change made to the server which includes two
 piece item names to make the item names in the client appear more perfect.