id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-01-06 01:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc changes

Browse source
This commit is contained in:
Robert Beckebans 2013-01-03 21:25:34 +01:00
parent 00a459c61b
commit c47e78d6f3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neo/sound/OpenAL/AL_SoundVoice.cpp
View file

@ -346,6 +346,7 @@ int idSoundVoice_OpenAL::SubmitBuffer( idSoundSample_OpenAL* sample, int bufferN
return 0; return 0;
} }
#if 0
idSoundSystemLocal::bufferContext_t* bufferContext = soundSystemLocal.ObtainStreamBufferContext(); idSoundSystemLocal::bufferContext_t* bufferContext = soundSystemLocal.ObtainStreamBufferContext();
if( bufferContext == NULL ) if( bufferContext == NULL )
{ {
@ -356,6 +357,7 @@ int idSoundVoice_OpenAL::SubmitBuffer( idSoundSample_OpenAL* sample, int bufferN
bufferContext->voice = this; bufferContext->voice = this;
bufferContext->sample = sample; bufferContext->sample = sample;
bufferContext->bufferNumber = bufferNumber; bufferContext->bufferNumber = bufferNumber;
#endif
// TODO openal stream // TODO openal stream
@ -379,13 +381,23 @@ int idSoundVoice_OpenAL::SubmitBuffer( idSoundSample_OpenAL* sample, int bufferN
if( sample->format.basic.formatTag == idWaveFile::FORMAT_PCM ) if( sample->format.basic.formatTag == idWaveFile::FORMAT_PCM )
{ {
format = sample->NumChannels() == 1 ? AL_FORMAT_MONO_IMA4 : AL_FORMAT_STEREO_IMA4; format = sample->NumChannels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
}
else if( sample->format.basic.formatTag == idWaveFile::FORMAT_ADPCM )
{
format = sample->NumChannels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
}
else if( sample->format.basic.formatTag == idWaveFile::FORMAT_XMA2 )
{
format = sample->NumChannels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
} }
else else
{ {
format = sample->NumChannels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16; format = sample->NumChannels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
} }
int rate = sample->SampleRate(); /*44100*/
for( int j = 0; j < finishedbuffers && j < 1; j++ ) for( int j = 0; j < finishedbuffers && j < 1; j++ )
{ {
/* /*
@ -406,7 +418,7 @@ int idSoundVoice_OpenAL::SubmitBuffer( idSoundSample_OpenAL* sample, int bufferN
alBufferData( openalStreamingBuffer[j], format, sample->buffers[bufferNumber].buffer, sample->buffers[bufferNumber].bufferSize, sample->SampleRate() /*44100*/ ); alBufferData( openalStreamingBuffer[j], format, sample->buffers[bufferNumber].buffer, sample->buffers[bufferNumber].bufferSize, rate );
//openalStreamingOffset += MIXBUFFER_SAMPLES; //openalStreamingOffset += MIXBUFFER_SAMPLES;
} }