summaryrefslogtreecommitdiff
path: root/src/Z2AudioLib/Z2SoundHandles.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Z2AudioLib/Z2SoundHandles.cpp')
-rw-r--r--src/Z2AudioLib/Z2SoundHandles.cpp121
1 files changed, 65 insertions, 56 deletions
diff --git a/src/Z2AudioLib/Z2SoundHandles.cpp b/src/Z2AudioLib/Z2SoundHandles.cpp
index 68804a6d01..d59433bb01 100644
--- a/src/Z2AudioLib/Z2SoundHandles.cpp
+++ b/src/Z2AudioLib/Z2SoundHandles.cpp
@@ -1,40 +1,38 @@
-//
-// Generated By: dol2asm
-// Translation Unit: Z2SoundHandles
-//
-
#include "Z2AudioLib/Z2SoundHandles.h"
#include "JSystem/JAudio2/JAISoundInfo.h"
Z2SoundHandles::Z2SoundHandles() {
- mNumHandles = 0;
+ handleNum_ = 0;
}
Z2SoundHandles::~Z2SoundHandles() {
deleteHandlesPool();
}
-void Z2SoundHandles::initHandlesPool(u8 pNumHandles) {
- mNumHandles = pNumHandles;
+void Z2SoundHandles::initHandlesPool(u8 handleNum) {
+ handleNum_ = handleNum;
}
/* 802AB120-802AB200 2A5A60 00E0+00 1/1 1/1 0/0 .text deleteHandlesPool__14Z2SoundHandlesFv */
void Z2SoundHandles::deleteHandlesPool() {
- JSULink<Z2SoundHandlePool>* link;
- while (link = getFirst(), link != NULL) {
- Z2SoundHandlePool* handle = link->getObject();
+ JSULink<Z2SoundHandlePool>* i;
+ while (i = getFirst(), i != NULL) {
+ Z2SoundHandlePool* handle = i->getObject();
+ JUT_ASSERT(48, handle->getSupervisor() == this);
+
remove(handle);
delete handle;
}
- mNumHandles = 0;
+
+ handleNum_ = 0;
}
-Z2SoundHandlePool* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) {
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- Z2SoundHandlePool* handle = link->getObject();
+Z2SoundHandlePool* Z2SoundHandles::getHandleSoundID(JAISoundID soundID) {
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ Z2SoundHandlePool* handle = i->getObject();
if (handle->isSoundAttached()) {
- if ((*handle)->getID() == pSoundId) {
+ if ((*handle)->getID() == soundID) {
return handle;
}
}
@@ -43,12 +41,12 @@ Z2SoundHandlePool* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) {
return NULL;
}
-Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 pUserData) {
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- Z2SoundHandlePool* handle = link->getObject();
+Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 userData) {
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ Z2SoundHandlePool* handle = i->getObject();
if (handle->isSoundAttached()) {
- if ((*handle)->getUserData() == pUserData) {
+ if ((*handle)->getUserData() == userData) {
return handle;
}
}
@@ -60,21 +58,23 @@ Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 pUserData) {
/* 802AB2D8-802AB3D0 2A5C18 00F8+00 0/0 3/3 0/0 .text getFreeHandle__14Z2SoundHandlesFv
*/
Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() {
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- Z2SoundHandlePool* handle = link->getObject();
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ Z2SoundHandlePool* handle = i->getObject();
if (!handle->isSoundAttached()) {
return handle;
}
}
- if (getNumHandles() < mNumHandles)
- {
+ if (getNumHandles() < handleNum_) {
Z2SoundHandlePool* handle = new Z2SoundHandlePool();
if (handle != NULL) {
append(handle);
+ JUT_ASSERT(113, handle->getSupervisor() == this);
return handle;
}
+
+ JUT_WARN_DEVICE(118, 1, "%s", "cannot Alloc Handle !!\n");
}
return NULL;
@@ -82,46 +82,52 @@ Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() {
/* 802AB3D0-802AB4A0 2A5D10 00D0+00 0/0 2/2 0/0 .text
* getLowPrioSound__14Z2SoundHandlesF10JAISoundID */
-Z2SoundHandlePool* Z2SoundHandles::getLowPrioSound(JAISoundID pSoundId) {
- JAISoundInfo* sound_info = JASGlobalInstance<JAISoundInfo>::getInstance();
- Z2SoundHandlePool* handle;
- u32 low_prio = 0xffff;
- Z2SoundHandlePool* low_prio_handle = NULL;
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- handle = link->getObject();
+Z2SoundHandlePool* Z2SoundHandles::getLowPrioSound(JAISoundID soundID) {
+ JAISoundInfo* soundInfo = JASGlobalInstance<JAISoundInfo>::getInstance();
+ u32 low_prio = 0xFFFF;
+ Z2SoundHandlePool* rethandle = NULL;
+
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ Z2SoundHandlePool* handle = i->getObject();
if (!handle->isSoundAttached()) {
return handle;
}
- u32 prio = sound_info->getPriority(handle->getSound()->getID());
+
+ u32 prio = soundInfo->getPriority((*handle)->getID());
if (prio < low_prio) {
low_prio = prio;
- low_prio_handle = handle;
+ rethandle = handle;
}
}
- if (sound_info->getPriority(pSoundId) >= low_prio) {
- return low_prio_handle;
+
+ #if DEBUG
+ if (rethandle != NULL) {
+ JUT_ASSERT(163, rethandle->getSupervisor() == this);
+ }
+ #endif
+
+ if (soundInfo->getPriority(soundID) >= low_prio) {
+ return rethandle;
}
+
return NULL;
}
-void Z2SoundHandles::stopAllSounds(u32 fadeout) {
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- JAISoundHandle* handle = link->getObject();
- //! @meme: explicit operator bool call required to match and be similar
- //! to CHN_debug; could more concisely write handle->isSoundAttached
- //! (for some reason cast-to-bool doesn't work?)
- if (handle && handle->operator bool()) {
- (*handle)->stop(fadeout);
+void Z2SoundHandles::stopAllSounds(u32 fadeTime) {
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ JAISoundHandle* handle = i->getObject();
+ if (handle && (*handle)) {
+ (*handle)->stop(fadeTime);
}
}
}
bool Z2SoundHandles::isActive() const {
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- if (link->getObject()->isSoundAttached()) {
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ if (i->getObject()->isSoundAttached()) {
return true;
}
}
@@ -131,12 +137,15 @@ bool Z2SoundHandles::isActive() const {
/* 802AB538-802AB64C 2A5E78 0114+00 0/0 1/1 0/0 .text
* setPos__14Z2SoundHandlesFRCQ29JGeometry8TVec3<f> */
-void Z2SoundHandles::setPos(JGeometry::TVec3<f32> const& param_0) {
- JSULink<Z2SoundHandlePool>* link;
- for (link = getFirst(); link != NULL; link = link->getNext()) {
- Z2SoundHandlePool* handle = link->getObject();
+void Z2SoundHandles::setPos(const JGeometry::TVec3<f32>& pos) {
+ JSULink<Z2SoundHandlePool>* i;
+ for (i = getFirst(); i != NULL; i = i->getNext()) {
+ Z2SoundHandlePool* handle = i->getObject();
+ JUT_ASSERT(209, handle);
+ JUT_ASSERT(210, handle->getSupervisor() == this);
+
if (handle->isSoundAttached()) {
- handle->getSound()->setPos(param_0);
+ (*handle)->setPos(pos);
}
else {
remove(handle);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 05:21:58 +0000