github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-16 10:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Audio code converted to uintptr_t

Browse source
This commit is contained in:
Kenix 2022-05-16 20:16:56 -04:00
parent e6c959e500
commit 7a4da43d7b
7 changed files with 86 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/src/code/audio_heap.c
View file

@ -249,7 +249,7 @@ void AudioHeap_PopCache(s32 tableType) {
persistent->numEntries--;
}
void AudioHeap_InitMainPools(ptrdiff_t initPoolSize) {
void AudioHeap_InitMainPools(size_t initPoolSize) {
AudioHeap_AllocPoolInit(&gAudioContext.audioInitPool, gAudioContext.audioHeap, initPoolSize);
AudioHeap_AllocPoolInit(&gAudioContext.audioSessionPool, gAudioContext.audioHeap + initPoolSize,
gAudioContext.audioHeapSize - initPoolSize);
@ -1266,18 +1266,18 @@ void AudioHeap_DiscardSampleCaches(void) {
}
typedef struct {
u32 oldAddr;
u32 newAddr;
uintptr_t oldAddr;
uintptr_t newAddr;
size_t size;
u8 newMedium;
} StorageChange;
void AudioHeap_ChangeStorage(StorageChange* change, SoundFontSample* sample) {
if (sample != NULL) {
u32 start = change->oldAddr;
u32 end = change->oldAddr + change->size;
uintptr_t start = change->oldAddr;
uintptr_t end = change->oldAddr + change->size;
if (start <= (u32)sample->sampleAddr && (u32)sample->sampleAddr < end) {
if (start <= sample->sampleAddr && sample->sampleAddr < end) {
sample->sampleAddr = sample->sampleAddr - start + change->newAddr;
sample->medium = change->newMedium;
}