mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 07:37:24 -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 fa47658844
commit 3623b27f37
630 changed files with 3349 additions and 3452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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);