Fix Missing Custom Sequences #2649
Merged
Conversation
This file contains 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
…in AudioCollection to fix missing custom sequences on load.
briaguya-ai
reviewed
Apr 1, 2023
| @@ -1366,16 +1368,23 @@ void AudioLoad_Init(void* heap, size_t heapSize) { | |||
| int startingSeqNum = MAX_AUTHENTIC_SEQID; // 109 is the highest vanilla sequence | |||
There was a problem hiding this comment.
is MAX_AUTHENTIC_SEQID a lie? are there authentic sequences with higher ids than 109?
There was a problem hiding this comment.
No, the sequences end there, but AudioCollection has more than just sequences in it, like the sound fonts at 130-136 which were the original issue.
There was a problem hiding this comment.
It's a bit cumbersome to have a sequence map in audio_load.c and AudioCollection, but I'm not sure how to unify them.
There was a problem hiding this comment.
So yeah, as mentioned elsewhere, it's more than just the instruments in there. the sound effects are added in as well later on.
…ction`'s sequenceMap size to account for all audio assets already loaded into that sequenceMap. This gives a non-arbitrary number in addition to the vanilla sequence count to allocate with for `audio_load`'s sequenceMap. Added `HasSequenceNum` to `AudioCollection` as well to streamline the check against `AudioCollection`'s sequenceMap to skip the non-sequence assets in there. Added clarification comment for seqNum and MAX_AUTHENTIC_SEQID section.
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Turns out there are sounds loaded into
AudioCollectionthat aren't sequences, and the custom sequence loading code was assuming this wasn't the case. This modifies the custom sequence loading code to bypass these known vanilla items that are inAudioCollectionblockingseqNumassignment.Fixes #2566 but will change indexes assigned with Audio Manager while this problem existed.
Build Artifacts