Merge pull request ddnet#7231 from Robyt3/Engine-Sound-Refactoring

Replace most global variables in engine sound with member variables, various other refactoring of engine sound
chillerbot · Sep 21, 2023 · 8009e86 · 8009e86
2 parents c975c39 + b9951dd
commit 8009e86
Show file tree

Hide file tree

Showing 5 changed files with 325 additions and 363 deletions.
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
@@ -2637,7 +2637,9 @@ void CClient::Update()
  if(m_DemoPlayer.IsPlaying() && IVideo::Current())
  {
  IVideo::Current()->NextVideoFrame();
- IVideo::Current()->NextAudioFrameTimeline(Sound()->GetSoundMixFunc());
+ IVideo::Current()->NextAudioFrameTimeline([this](short *pFinalOut, unsigned Frames) {
+ Sound()->Mix(pFinalOut, Frames);
+ });
  }
  else if(m_ButtonRender)
  Disconnect();