EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doom: fix mixbuffer size confusion

front
cinap_lenrek 2012-09-03 00:24:27 +02:00
parent d32c8fc79a
commit 1be10947ba
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/src/games/doom/i_sound.c
View File

@ -14,9 +14,6 @@
/* Needed for calling the actual sound output. */
#define SAMPLECOUNT (512<<2)
#define NUM_CHANNELS 8
/* It is 2 for 16bit, and 2 for two channels */
#define BUFMUL 4
#define MIXBUFFERSIZE (SAMPLECOUNT*BUFMUL)
/* The actual lengths of all sound effects. */
int lengths[NUMSFX];
@ -29,7 +26,7 @@ static int audio_fd;
** are modified and added, and stored in the buffer
** that is submitted to the audio device.
*/
signed short mixbuffer[MIXBUFFERSIZE];
signed short mixbuffer[SAMPLECOUNT*2];
/* The channel step amount... */
uint channelstep[NUM_CHANNELS];
@ -153,7 +150,7 @@ void I_InitSound(void)
}
/* Now initialize mixbuffer with zero. */
memset(mixbuffer, 0, sizeof(mixbuffer));
memset(mixbuffer, 0, sizeof mixbuffer);
}
/* This function loops all active (internal) sound
@ -275,7 +272,7 @@ void I_UpdateSound(void)
void I_SubmitSound(void)
{
if(audio_fd >= 0)
write(audio_fd, mixbuffer, MIXBUFFERSIZE);
write(audio_fd, mixbuffer, sizeof mixbuffer);
}
void I_ShutdownSound(void)