mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-17 13:53:57 -07:00
ce74c41297
Sound items were only deleted after 'last play' when stopped, but they could also be left in 'paused' or 'initial' states, and were then not cleared until the game exits (effectively a memory leak). This affected particularly music & ambient sounds, which also used the most buffers(/memory). On MacOS (at least), this resulted in OpenAL errors & sound failures after a while playing the game, because MacOS has a max "in flight buffers" of 1024. Also clean up some control flow in CStreamItem Reported by: Eszett Thanks langbart for the consistent repro'. Fixes #5265 Differential Revision: https://code.wildfiregames.com/D3445 This was SVN commit r24762.
86 lines
1.8 KiB
C++
86 lines
1.8 KiB
C++
/* Copyright (C) 2021 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "CSoundItem.h"
|
|
|
|
#if CONFIG2_AUDIO
|
|
|
|
#include "soundmanager/SoundManager.h"
|
|
#include "soundmanager/data/SoundData.h"
|
|
|
|
#include <mutex>
|
|
|
|
CSoundItem::CSoundItem()
|
|
{
|
|
ResetVars();
|
|
}
|
|
|
|
CSoundItem::CSoundItem(CSoundData* sndData)
|
|
{
|
|
ResetVars();
|
|
if (InitOpenAL())
|
|
Attach(sndData);
|
|
}
|
|
|
|
CSoundItem::~CSoundItem()
|
|
{
|
|
Stop();
|
|
ReleaseOpenAL();
|
|
}
|
|
|
|
bool CSoundItem::IdleTask()
|
|
{
|
|
if ( m_ALSource == 0 )
|
|
return false;
|
|
|
|
HandleFade();
|
|
|
|
if (m_LastPlay && m_ALSource)
|
|
{
|
|
std::lock_guard<std::mutex> lock(m_ItemMutex);
|
|
int proc_state;
|
|
alGetSourcei(m_ALSource, AL_SOURCE_STATE, &proc_state);
|
|
AL_CHECK;
|
|
m_ShouldBePlaying = (proc_state != AL_STOPPED && proc_state != AL_INITIAL && proc_state != AL_PAUSED);
|
|
return m_ShouldBePlaying;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void CSoundItem::Attach(CSoundData* itemData)
|
|
{
|
|
if (m_SoundData != NULL)
|
|
{
|
|
CSoundData::ReleaseSoundData(m_SoundData);
|
|
m_SoundData = 0;
|
|
}
|
|
|
|
if (itemData != NULL)
|
|
{
|
|
AL_CHECK;
|
|
alSourcei(m_ALSource, AL_BUFFER, 0);
|
|
AL_CHECK;
|
|
m_SoundData = itemData->IncrementCount();
|
|
alSourcei(m_ALSource, AL_BUFFER, m_SoundData->GetBuffer());
|
|
|
|
AL_CHECK;
|
|
}
|
|
}
|
|
|
|
#endif // CONFIG2_AUDIO
|