Backport 2ship streamed audio#5457
Merged
Malkierian merged 5 commits intoHarbourMasters:developfrom Jun 28, 2025
Merged
Conversation
# Conflicts: # .github/workflows/apt-deps.txt # soh/CMakeLists.txt # soh/soh/resource/importer/AudioSampleFactory.h # soh/soh/resource/importer/AudioSequenceFactory.cpp # soh/soh/resource/importer/AudioSequenceFactory.h # soh/soh/resource/importer/AudioSoundFontFactory.h
Malkierian
approved these changes
Jun 25, 2025
Contributor
Malkierian
left a comment
There was a problem hiding this comment.
Future isn't fun to use yet, but all the new functionality works (amazingly well), and custom sequences still work.
ProverbialPennance
added a commit
to ProverbialPennance/just-one-more-repo
that referenced
this pull request
Jun 28, 2025
krazyjakee
pushed a commit
to krazyjakee/OOT
that referenced
this pull request
Sep 6, 2025
* Bring over changes from 2ship # Conflicts: # .github/workflows/apt-deps.txt # soh/CMakeLists.txt # soh/soh/resource/importer/AudioSampleFactory.h # soh/soh/resource/importer/AudioSequenceFactory.cpp # soh/soh/resource/importer/AudioSequenceFactory.h # soh/soh/resource/importer/AudioSoundFontFactory.h * Update xml format * Format and fix mixer for Windows * Fixes for new LUS * Good ole clang-format
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #4591
Backport streamed (MP3, WAV, etc..) audio support from 2ship.
Since custom audio support already exists in SoH, this PR is smaller than 2ships. It only includes the XML audio importer, and changes to the load order for sequences and sound fonts.
WAV, MP3, FLAC, and OGG are currently supported. WAV, MP3, and FLAC, are decoded by dr_libs and don't require the user to install any additional dependencies. OGG requires the user to install libogg, and libvorbis. Opus requires libopus, libopusfile.
Blocked by #5454
Build Artifacts