mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 15:23:01 -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
libs/JSystem/src/JAudio2/JASTrack.cpp
+10 -10
View File
@@ -23,7 +23,7 @@ JASTrack::TList JASTrack::sTrackList;
JASTrack::~JASTrack() {
JUT_ASSERT(70, mStatus != STATUS_RUN);
for (int i = 1; i < 4; i++) {
JKR_DELETE(mChannelMgrs[i]);
delete mChannelMgrs[i];
}
}
@@ -34,7 +34,7 @@ void JASTrack::setChannelMgrCount(u32 count) {
mChannelMgrCount = 1;
for (int i = 1; i < count; i++) {
if (mChannelMgrs[i] == NULL) {
mChannelMgrs[i] = JKR_NEW TChannelMgr(this);
mChannelMgrs[i] = new TChannelMgr(this);
if (mChannelMgrs[i] == NULL) {
JUT_WARN(87, "%s", "Not enough JASTrackChannelMgr\n");
return;
@@ -44,7 +44,7 @@ void JASTrack::setChannelMgrCount(u32 count) {
}
for (u32 i = mChannelMgrCount; i < 4; i++) {
if (mChannelMgrs[i] != NULL) {
JKR_DELETE(mChannelMgrs[i]);
delete mChannelMgrs[i];
mChannelMgrs[i] = NULL;
}
}
@@ -81,7 +81,7 @@ void JASTrack::init() {
mChannelMgrCount = 1;
for (int i = 1; i < 4; i++) {
if (mChannelMgrs[i] != NULL) {
JKR_DELETE(mChannelMgrs[i]);
delete mChannelMgrs[i];
mChannelMgrs[i] = NULL;
}
}
@@ -201,7 +201,7 @@ void JASTrack::close() {
if (child != NULL) {
child->close();
if (child->mFlags.autoDelete) {
JKR_DELETE(child);
delete child;
mChildren[i] = NULL;
}
}
@@ -232,7 +232,7 @@ void JASTrack::closeChild(u32 track_no) {
getRootTrack()->updateSeq(false, 1.0f);
child->close();
if (child->mFlags.autoDelete) {
JKR_DELETE(child);
delete child;
mChildren[track_no] = NULL;
}
}
@@ -259,7 +259,7 @@ JASTrack* JASTrack::openChild(u32 trk_no) {
break;
}
} else {
child = JKR_NEW JASTrack();
child = new JASTrack();
if (child == NULL) {
JUT_WARN(388, "%s", "Not enough JASTrack\n");
return NULL;
@@ -736,7 +736,7 @@ int JASTrack::tickProc() {
getRootTrack()->updateSeq(false, 1.0f);
child->close();
if (child->mFlags.autoDelete) {
JKR_DELETE(child);
delete child;
mChildren[i] = NULL;
}
}
@@ -794,7 +794,7 @@ void JASTrack::TList::seqMain() {
if (seqMainRes < 0) {
Remove(&*it);
if (it->mFlags.autoDelete) {
JKR_DELETE(&*it);
delete &*it;
}
}
}
@@ -811,7 +811,7 @@ void JASTrack::TList::seqMain() {
if (seqMainRes < 0) {
Remove(&*it);
if (it->mFlags.autoDelete) {
JKR_DELETE(&*it);
delete &*it;
}
}
it = it2;