dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-04-28 14:25:07 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update sdlsoundev to support SDL2

Browse Source
This commit is contained in:
Nathan Fulton 2016-03-14 12:31:40 -04:00
parent 86207a0b94
commit b3827e22e4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
game/sdl/sdlsounddev.cpp
View File

@ -31,7 +31,7 @@ public:
virtual int GetVolume();
private:
void InitAudioBuffer(byte *pbBuffer);
void InitAudioBuffer(byte *pbBuffer, int len);
bool m_fEnable;
long m_tSilence;
@ -77,6 +77,7 @@ bool SdlSoundDevice::Init()
m_spec.format = AUDIO_U8;
m_spec.channels = 1;
m_spec.samples = kcbBuffer;
m_spec.size = kcbBuffer;
m_spec.callback = AudioCallback;
m_spec.userdata = this;
@ -203,11 +204,12 @@ int SdlSoundDevice::GetVolume()
void AudioCallback(void *pvUser, Uint8* stream, int len)
{
SDL_memset(stream, 0, len);
SdlSoundDevice *psndd = (SdlSoundDevice *)pvUser;
psndd->InitAudioBuffer(stream);
psndd->InitAudioBuffer(stream, len);
}
void SdlSoundDevice::InitAudioBuffer(byte *pbBuffer)
void SdlSoundDevice::InitAudioBuffer(byte *pbBuffer, int len)
{
// Don't send buffers to the device if not enabled
@ -218,7 +220,7 @@ void SdlSoundDevice::InitAudioBuffer(byte *pbBuffer)
// Fill the buffer and queue it for playing
MixChannels(m_achnl, ARRAYSIZE(m_achnl), pbBuffer, m_spec.size);
MixChannels(m_achnl, ARRAYSIZE(m_achnl), pbBuffer, len);
SDL_UnlockAudio();
}