DS Sound Streaming #302
DS Sound Streaming #302
Conversation
| #include <stdexcept> | ||
| #include <vector> | ||
|
|
||
| #ifdef _MSC_VER |
There was a problem hiding this comment.
Remove this, we don't need it.
| #include "client/sound/SoundSystem.hpp" | ||
| #include "client/sound/SoundData.hpp" | ||
|
|
||
| #define SOUND_SYSTEM SoundSystemDS |
|
|
||
| class SoundSystemDS : public SoundSystem | ||
| { | ||
| private: |
There was a problem hiding this comment.
Move this back to the top
| @@ -0,0 +1,312 @@ | |||
| #define WIN32_LEAN_AND_MEAN | |||
There was a problem hiding this comment.
This shouldn't be here, it should be right before the windows header
| #define WIN32_LEAN_AND_MEAN | ||
| #include "SoundStreamDS.hpp" | ||
| #include "client/app/AppPlatform.hpp" | ||
| #include <cassert> |
There was a problem hiding this comment.
Standard stuff should go above our local headers
|
|
||
| void SoundStreamDS::_deleteBuffers() | ||
| { | ||
| for (auto buffer : m_buffers) |
There was a problem hiding this comment.
Can't use foreach loops in C++98
| // Verify buffers were created | ||
| if (m_buffers.size() != 2 || !m_source) | ||
| { | ||
| LOG_I("Failed to create DirectSound buffers or source"); |
| @@ -0,0 +1,52 @@ | |||
| #pragma once | |||
| #include <windows.h> | |||
| #pragma comment(lib, "dsound.lib") | |||
| SPDX-License-Identifier: BSD-1-Clause | ||
| ********************************************************************/ | ||
|
|
||
| #define WIN32_LEAN_AND_MEAN |
| m_directsound->Release(); | ||
| } | ||
|
|
||
| WAVEFORMATEX SoundSystemDS::_getWaveFormat(const PCMSoundHeader& header, float pitch) const |
There was a problem hiding this comment.
This should go up here, since it's private.
BrentDaMage
left a comment
BrentDaMage
left a comment
There was a problem hiding this comment.
A couple minor things, but overall great.
| // Re-fill buffers after restoration | ||
| for (size_t i = 0; i < m_buffers.size(); ++i) | ||
| { | ||
| if (!_stream(i)) |
There was a problem hiding this comment.
cleanup this deep if statement. ex: have it call continue if _stream is true
| (lastWritePos >= m_bufferSize && writeCursor < m_bufferSize)) | ||
| { | ||
| int bufferId = (currentSegment + 1) % 2; | ||
| if (!_stream(bufferId)) |
There was a problem hiding this comment.
Probably cleanup this if as well
| } | ||
|
|
||
| result = m_directsound->SetCooperativeLevel(m_hWnd, DSSCL_NORMAL); | ||
| result = m_directsound->SetCooperativeLevel(m_hWnd, DSSCL_PRIORITY); |
There was a problem hiding this comment.
Why? What does this do? Please put it in a comment.
There was a problem hiding this comment.
The normal cooperative level doesn't have enough control over the buffer, basically causing the sound streaming to not work at all
2 participants
No description provided.