fix audio streams cleanup

This commit is contained in:
MihailRis 2026-11-03 22:26:03 +03:00
parent cb5bebf3ae
commit 1bb66ebf1f

View file

@ -349,7 +349,8 @@ void remove_lower_priority_speaker(int priority) {
for (auto it = speakers.begin(); it != speakers.end();) {
if (it->second->getPriority() < priority && it->second->isPaused()) {
it->second->stop();
it = speakers.erase(it);
streams.erase(it->first);
speakers.erase(it);
return;
}
it++;
@ -357,7 +358,8 @@ void remove_lower_priority_speaker(int priority) {
for (auto it = speakers.begin(); it != speakers.end();) {
if (it->second->getPriority() < priority) {
it->second->stop();
it = speakers.erase(it);
streams.erase(it->first);
speakers.erase(it);
return;
}
it++;
@ -445,6 +447,7 @@ speakerid_t audio::play_stream(
int channel
) {
std::shared_ptr<Stream> stream(open_stream(file, false));
stream->setStopOnEnd(true);
return play(stream, position, relative, volume, pitch, loop, channel);
}
@ -520,8 +523,8 @@ void audio::update(double delta) {
if (speaker->isStopped()) {
auto foundStream = streams.find(it->first);
if (foundStream == streams.end() ||
(!speaker->isManuallyStopped() &&
foundStream->second->isStopOnEnd())) {
speaker->isManuallyStopped() ||
foundStream->second->isStopOnEnd()) {
streams.erase(it->first);
it = speakers.erase(it);
} else {