Skip to content

fix(audio): correct sample limit tracking and source leaks #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fbraz3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(audio): correct sample limit tracking and source leaks #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions Core/GameEngineDevice/Source/MiniAudioDevice/MiniAudioManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,10 @@ Bool MiniAudioManager::isPlayingLowerPriority(AudioEventRTS *event) const
for (auto it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
if (!(*it)->m_audioEventRTS) continue;
const AudioEventInfo *info = (*it)->m_audioEventRTS->getAudioEventInfo();
if (info && info->m_priority < priority) return true;
if (info && info->m_priority < priority) {
event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
return true;
}
}
return false;
}
Expand Down Expand Up @@ -1573,15 +1576,25 @@ UnsignedInt MiniAudioManager::getNumAvailable2DSamples() const
{
// GeneralsX @bugfix Mr. Meeseeks 27/06/2026 Fix available samples calculation to prevent voicelines culling
UnsignedInt max2D = getAudioSettings()->m_sampleCount2D;
UnsignedInt playing = (UnsignedInt)m_playingSounds.size();
UnsignedInt playing = 0;
for (auto it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
if ((*it) && (*it)->m_type == PAT_Sample) {
playing++;
}
}
return (max2D > playing) ? (max2D - playing) : 0;
}

//-------------------------------------------------------------------------------------------------
UnsignedInt MiniAudioManager::getNumAvailable3DSamples() const
{
// GeneralsX @bugfix Mr. Meeseeks 27/06/2026 Fix available samples calculation to prevent voicelines culling
// GeneralsX @bugfix Mr. Meeseeks 01/07/2026 Fix available samples calculation to only count 3D samples
UnsignedInt max3D = getAudioSettings()->m_sampleCount3D;
UnsignedInt playing = (UnsignedInt)m_playingSounds.size();
UnsignedInt playing = 0;
for (auto it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
if ((*it) && (*it)->m_type == PAT_3DSample) {
playing++;
}
}
return (max3D > playing) ? (max3D - playing) : 0;
}
4 changes: 2 additions & 2 deletions Core/GameEngineDevice/Source/OpenALAudioDevice/OpenALAudioManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,7 @@ Bool OpenALAudioManager::isPlayingLowerPriority(AudioEventRTS* event) const
if (!(*it)->m_audioEventRTS) continue; // GeneralsX @bugfix BenderAI 11/03/2026
const AudioEventInfo* info = (*it)->m_audioEventRTS->getAudioEventInfo();
if (info && info->m_priority < priority) {
//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
return true;
}
}
Expand All @@ -2142,7 +2142,7 @@ Bool OpenALAudioManager::isPlayingLowerPriority(AudioEventRTS* event) const
if (!(*it)->m_audioEventRTS) continue; // GeneralsX @bugfix BenderAI 11/03/2026
const AudioEventInfo* info = (*it)->m_audioEventRTS->getAudioEventInfo();
if (info && info->m_priority < priority) {
//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
return true;
}
}
Expand Down
10 changes: 10 additions & 0 deletions docs/DEV_BLOG/2026-07-DIARY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# July 2026

## 02/07/2026
### Audio Fix: Missing Voiceovers
Fixed a significant issue where in-game voiceovers (like "You are victorious" or General Challenge taunts) were not playing, especially during late-game or heavy combat scenarios.
The issue stemmed from two places:
1. **OpenAL and MiniAudio priority leaks:** When the maximum sample limits were hit (e.g., 64 2D sounds), the game would correctly attempt to cull lower priority sounds. However, `OpenALAudioManager` and `MiniAudioManager` were missing the logic to set the `handleToKill` inside `isPlayingLowerPriority()`. This resulted in the engines continuously generating new hardware sources without freeing older ones, eventually exhausting all physical sources (usually 256) and silently dropping new sounds.
2. **MiniAudio incorrect limits:** `MiniAudioManager::getNumAvailable2DSamples` was calculating available 2D samples against the size of the *entire* `m_playingSounds` list (which in MiniAudio includes 3D sounds and Streams/Music). This effectively kept the available samples at 0 at all times, making it always fall back to the broken priority handling.

Both issues have been resolved by adding proper counting filters in MiniAudio and uncommenting `event->setHandleToKill` in both audio managers' priority checks.
Loading