mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #17361 from IntelOrca/fix-ogg-freeze

Browse Source 
Fix deadlock in AudioChannel and loop ride music
This commit is contained in:
Tulio Leao
2022-06-07 21:59:35 -03:00
committed by GitHub
parent 3fae2413db cd6e718c6f
commit 84a041e4a8
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -2,6 +2,7 @@
------------------------------------------------------------------------
- Feature: [#16825] Add Alpine Coaster track type.
- Feature: [#17011] Option to show ride vehicles as separate entries when selecting a ride to construct.
- Feature: [#17217] Add FLAC and OGG/vorbis as supported audio formats for ride music objects.
- Improved: [#7983] The red colour in the ride stat screen and the ride graphs now corresponds better to negative effects on a ride’s stats.
- Improved: [#13966] Music Style dropdown is now sorted by name.
- Improved: [#16978] Tree placement is more natural during map generation.

2
src/openrct2-ui/audio/AudioChannel.cpp
View File

@@ -254,7 +254,7 @@ namespace OpenRCT2::Audio
bytesRead += readLen;
_offset += readLen;
}
if (_offset >= _source->GetLength())
if (readLen == 0 || _offset >= _source->GetLength())
{
if (_loop == 0)
{

3
src/openrct2/ride/RideAudio.cpp
View File

@@ -226,7 +226,8 @@ namespace OpenRCT2::RideAudio
auto source = audioContext->CreateStreamFromWAV(std::move(stream));
if (source != nullptr)
{
auto channel = Mixer_Play_Music(source, MIXER_LOOP_NONE, true);
auto shouldLoop = musicObj->GetTrackCount() == 1;
auto channel = Mixer_Play_Music(source, shouldLoop ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE, true);
if (channel != nullptr)
{
_musicChannels.emplace_back(instance, channel, source);