mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 21:15:33 +00:00
Code Issues Releases Wiki Activity

Set the OpenAL source offset after setting the buffer

Browse source 
This is to work around a bug in the Rapture3D driver.
This commit is contained in:
Chris Robinson 2018-08-24 01:54:50 -07:00
parent c2c595407c
commit 4e3ae85c11
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwsound/openal_output.cpp
View file

@ -1145,14 +1145,24 @@ bool OpenAL_Output::playSound(Sound *sound, Sound_Handle data, float offset)
initCommon2D(source, sound->getPosition(), sound->getRealVolume(), sound->getPitch(), initCommon2D(source, sound->getPosition(), sound->getRealVolume(), sound->getPitch(),
sound->getIsLooping(), sound->getUseEnv()); sound->getIsLooping(), sound->getUseEnv());
alSourcei(source, AL_BUFFER, GET_PTRID(data));
alSourcef(source, AL_SEC_OFFSET, offset); alSourcef(source, AL_SEC_OFFSET, offset);
if(getALError() != AL_NO_ERROR) if(getALError() != AL_NO_ERROR)
{
alSourceRewind(source);
alSourcei(source, AL_BUFFER, 0);
alGetError();
return false; return false;
}
alSourcei(source, AL_BUFFER, GET_PTRID(data));
alSourcePlay(source); alSourcePlay(source);
if(getALError() != AL_NO_ERROR) if(getALError() != AL_NO_ERROR)
{
alSourceRewind(source);
alSourcei(source, AL_BUFFER, 0);
alGetError();
return false; return false;
}
mFreeSources.pop_front(); mFreeSources.pop_front();
sound->mHandle = MAKE_PTRID(source); sound->mHandle = MAKE_PTRID(source);
@ -1175,14 +1185,24 @@ bool OpenAL_Output::playSound3D(Sound *sound, Sound_Handle data, float offset)
initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(), initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(),
sound->getRealVolume(), sound->getPitch(), sound->getIsLooping(), sound->getRealVolume(), sound->getPitch(), sound->getIsLooping(),
sound->getUseEnv()); sound->getUseEnv());
alSourcei(source, AL_BUFFER, GET_PTRID(data));
alSourcef(source, AL_SEC_OFFSET, offset); alSourcef(source, AL_SEC_OFFSET, offset);
if(getALError() != AL_NO_ERROR) if(getALError() != AL_NO_ERROR)
{
alSourceRewind(source);
alSourcei(source, AL_BUFFER, 0);
alGetError();
return false; return false;
}
alSourcei(source, AL_BUFFER, GET_PTRID(data));
alSourcePlay(source); alSourcePlay(source);
if(getALError() != AL_NO_ERROR) if(getALError() != AL_NO_ERROR)
{
alSourceRewind(source);
alSourcei(source, AL_BUFFER, 0);
alGetError();
return false; return false;
}
mFreeSources.pop_front(); mFreeSources.pop_front();
sound->mHandle = MAKE_PTRID(source); sound->mHandle = MAKE_PTRID(source);