zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set the appropriate start offset for restarted sounds

Browse source
This commit is contained in:
Chris Robinson 2016-05-02 13:34:46 -07:00 committed by Christoph Oelckers
parent c3cef91a4f
commit e1c8890c5e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/sound/oalsound.cpp
View file

@ -40,6 +40,8 @@
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#include <chrono>
#include "except.h" #include "except.h"
#include "doomstat.h" #include "doomstat.h"
#include "templates.h" #include "templates.h"
@ -1472,7 +1474,7 @@ FISoundChannel *OpenALSoundRenderer::StartSound3D(SoundHandle sfx, SoundListener
else else
alSourcef(source, AL_PITCH, PITCH(pitch)); alSourcef(source, AL_PITCH, PITCH(pitch));
if(!reuse_chan) if(!reuse_chan || reuse_chan->StartTime.AsOne == 0)
alSourcef(source, AL_SEC_OFFSET, 0.f); alSourcef(source, AL_SEC_OFFSET, 0.f);
else else
{ {
@ -1480,8 +1482,11 @@ FISoundChannel *OpenALSoundRenderer::StartSound3D(SoundHandle sfx, SoundListener
alSourcef(source, AL_SEC_OFFSET, reuse_chan->StartTime.Lo/1000.f); alSourcef(source, AL_SEC_OFFSET, reuse_chan->StartTime.Lo/1000.f);
else else
{ {
// FIXME: set offset based on the current time and the StartTime float offset = std::chrono::duration_cast<std::chrono::duration<float>>(
alSourcef(source, AL_SAMPLE_OFFSET, 0.f); std::chrono::steady_clock::now().time_since_epoch() -
std::chrono::steady_clock::time_point::duration(reuse_chan->StartTime.AsOne)
).count();
if(offset > 0.f) alSourcef(source, AL_SEC_OFFSET, offset);
} }
} }
if(getALError() != AL_NO_ERROR) if(getALError() != AL_NO_ERROR)
@ -1819,7 +1824,7 @@ void OpenALSoundRenderer::MarkStartTime(FISoundChannel *chan)
{ {
// FIXME: Get current time (preferably from the audio clock, but the system // FIXME: Get current time (preferably from the audio clock, but the system
// time will have to do) // time will have to do)
chan->StartTime.AsOne = 0; chan->StartTime.AsOne = std::chrono::steady_clock::now().time_since_epoch().count();
} }
float OpenALSoundRenderer::GetAudibility(FISoundChannel *chan) float OpenALSoundRenderer::GetAudibility(FISoundChannel *chan)