diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp index c3ec5b24f..1aaeb8f1a 100644 --- a/src/audio/AL/ALAudio.cpp +++ b/src/audio/AL/ALAudio.cpp @@ -275,8 +275,7 @@ void ALStream::update(double delta) { unqueueBuffers(alsource); uint preloaded = enqueueBuffers(alsource); - // alspeaker->stopped is assigned to false at ALSpeaker::play(...) - if (speaker->isStopped() && !alspeaker->manuallyStopped) { //TODO: -V560 false-positive? + if (speaker->isStopped()) { if (preloaded) { speaker->play(); } else if (isStopOnEnd()){ diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index ee35abeeb..1fa8a1966 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -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(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 {