actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use better mixer

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-31 01:13:58 +00:00
parent fb71bacda7
commit 05d9719441
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+5 -6
View File
@@ -63,17 +63,15 @@ bool RageSound_DSound_Software::GetPCM()
/* Silence the buffer. */ /* Silence the buffer. */
memset(locked_buf, 0, len); memset(locked_buf, 0, len);
/* Create a 32-bit buffer to mix sounds. */
static Sint32 *mixbuf = NULL;
static Sint16 *buf = NULL; static Sint16 *buf = NULL;
int bufsize = buffersize_frames * channels; int bufsize = buffersize_frames * channels;
if(!buf) if(!buf)
{ {
buf = new Sint16[bufsize]; buf = new Sint16[bufsize];
mixbuf = new Sint32[bufsize];
} }
memset(buf, 0, bufsize*sizeof(Uint16)); memset(buf, 0, bufsize*sizeof(Uint16));
memset(mixbuf, 0, bufsize*sizeof(Uint32));
SoundMixBuffer mix;
for(unsigned i = 0; i < sounds.size(); ++i) for(unsigned i = 0; i < sounds.size(); ++i)
{ {
@@ -83,8 +81,7 @@ bool RageSound_DSound_Software::GetPCM()
/* Call the callback. */ /* Call the callback. */
unsigned got = sounds[i]->snd->GetPCM((char *) buf, len, play_pos); unsigned got = sounds[i]->snd->GetPCM((char *) buf, len, play_pos);
SOUNDMAN->MixAudio( mix.write((Sint16 *) buf, got);
(Uint8 *) locked_buf, (Uint8 *) buf, got, SDL_MIX_MAXVOLUME/2);
if(got < len) if(got < len)
{ {
@@ -94,6 +91,8 @@ bool RageSound_DSound_Software::GetPCM()
} }
} }
mix.read((Sint16 *) locked_buf);
str_ds->release_output_buf(locked_buf, len); str_ds->release_output_buf(locked_buf, len);
return true; return true;
stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ bool RageSound_WaveOut::GetPCM()
unsigned got = sounds[i]->snd->GetPCM((char *) buf, chunksize, last_cursor_pos); unsigned got = sounds[i]->snd->GetPCM((char *) buf, chunksize, last_cursor_pos);
SOUNDMAN->MixAudio( SOUNDMAN->MixAudio(
(Uint8 *) buffers[b].lpData, (Uint8 *) buf, got, SDL_MIX_MAXVOLUME/2); (Sint16 *) buffers[b].lpData, buf, got, .5);
if(got < chunksize) if(got < chunksize)
{ {