mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-08 10:03:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Isolate JKRHeap operator overloads" (#39)

Browse Source
This commit is contained in:
TakaRikka
2026-03-06 19:49:35 -08:00
committed by GitHub
parent b7c482fb87
commit 78d4169929
630 changed files with 3349 additions and 3452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Z2AudioCS/SpkMixingBuffer.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
SpkMixingBuffer::SpkMixingBuffer(JKRHeap* heap) {
JUT_ASSERT(25, heap);
for (s32 chan = 0; chan < ARRAY_SIZE(mBuffer); chan++) {
mBuffer[chan] = JKR_NEW_ARGS (heap, 0) s16[cSamplesPerAudioPacket];
mBuffer[chan] = new (heap, 0) s16[cSamplesPerAudioPacket];
JUT_ASSERT(29, mBuffer[chan]);
bzeroBuffer(chan);
}
src/Z2AudioCS/SpkSound.cpp
+3 -3
View File
@@ -331,7 +331,7 @@ bool SpkSoundHolder::startSound(s32 chan, s32 soundNum, SpkSoundHandle* handle)
}
}
SpkSound* new_sound_p = JKR_NEW SpkSound();
SpkSound* new_sound_p = new SpkSound();
if (new_sound_p == NULL) {
JUT_WARN(520, "%s", "cannot new SpkSound\n");
return false;
@@ -344,7 +344,7 @@ bool SpkSoundHolder::startSound(s32 chan, s32 soundNum, SpkSoundHandle* handle)
bool startResult = new_sound_p->start(chan, soundNum);
if (!startResult) {
JUT_WARN(532, "%s", "cannot start SpkSound\n");
JKR_DELETE(new_sound_p);
delete new_sound_p;
return false;
}
@@ -421,7 +421,7 @@ void SpkSoundHolder::freeDeadSound(s32 chan) {
JSULink<SpkSound>* next = it->getNext();
if (it->getObject()->isDead()) {
mSoundList[chan].remove(it);
JKR_DELETE(it->getObject());
delete it->getObject();
}
it = next;
}
src/Z2AudioCS/SpkSystem.cpp
+6 -7
View File
@@ -1,12 +1,11 @@
#include "Z2AudioCS/SpkSystem.h"
#include "../../libs/JSystem/include/JSystem/JKernel/JKRHeap.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "Z2AudioCS/SpkMixingBuffer.h"
#include "Z2AudioCS/SpkSound.h"
#include "Z2AudioCS/SpkSpeakerCtrl.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JKernel/JKRHeap.h"
template<> SpkSystem* JASGlobalInstance<SpkSystem>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template<> SpkSoundHolder* JASGlobalInstance<SpkSoundHolder>::sInstance JAS_GLOBAL_INSTANCE_INIT;
@@ -21,9 +20,9 @@ SpkSystem::SpkSystem(JKRHeap* heap) : JASGlobalInstance(true) {
}
mHeap = heap;
mMixingBuffer = JKR_NEW_ARGS (heap, 0) SpkMixingBuffer(heap);
mMixingBuffer = new (heap, 0) SpkMixingBuffer(heap);
JUT_ASSERT(35, mMixingBuffer);
mSoundHolder = JKR_NEW_ARGS (heap, 0) SpkSoundHolder();
mSoundHolder = new (heap, 0) SpkSoundHolder();
JUT_ASSERT(38, mSoundHolder);
SpkSpeakerCtrl::setup();
SpkSpeakerCtrl::setMixingBuffer(mMixingBuffer);
@@ -32,7 +31,7 @@ SpkSystem::SpkSystem(JKRHeap* heap) : JASGlobalInstance(true) {
void SpkSystem::setResource(JKRArchive* resArc, u16 param_1, u16 param_2) {
JUT_ASSERT(71, mHeap);
JUT_ASSERT(72, resArc);
mData = JKR_NEW_ARGS (mHeap, 0) SpkData(resArc);
mData = new (mHeap, 0) SpkData(resArc);
JUT_ASSERT(75, mData);
mData->loadTable(param_1);
mData->loadWave(param_2);
src/Z2AudioCS/Z2AudioCS.cpp
+2 -2
View File
@@ -18,10 +18,10 @@ void Z2AudioCS::newSpkSoundMemPool() {
int Z2AudioCS::init(JKRHeap* heap, JKRArchive* res, s32 param_2, s32 param_3) {
JUT_ASSERT(59, heap);
JUT_ASSERT(60, res);
SpkSystem* spkSys = JKR_NEW_ARGS(heap, 0) SpkSystem(heap);
SpkSystem* spkSys = new(heap, 0) SpkSystem(heap);
JUT_ASSERT(67, spkSys);
sSpkHandles = JKR_NEW_ARGS (heap, 0) SpkSoundHandle[HANDLES_MAX];
sSpkHandles = new (heap, 0) SpkSoundHandle[HANDLES_MAX];
JUT_ASSERT(71, sSpkHandles);
spkSys->setResource(res, 2, 3);