PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename known fields 

Former-commit-id: 78bbe70ce243df22d010bd592b317ef5e7e3d427
This commit is contained in:
Phillip Stephens 2023-10-26 12:56:19 -07:00
parent 6a56b467d7
commit c712d523b3
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Kyoto/Audio/CMidiManager.hpp
View File

@ -23,10 +23,10 @@ public:
void SetSongId(const short id); void SetSongId(const short id);
private: private:
u32 x0_; u32 x0_sysHandle;
CSfxHandle x4_; CSfxHandle x4_midiHandle;
short x8_; short x8_songId;
bool xa_; bool xa_available;
}; };
class CMidiData { class CMidiData {
public: public:

38
src/Kyoto/Audio/CMidiManager.cpp
View File

@ -8,28 +8,28 @@
rstl::reserved_vector< CMidiManager::CMidiWrapper, 3 > CMidiManager::mMidiWrappers; rstl::reserved_vector< CMidiManager::CMidiWrapper, 3 > CMidiManager::mMidiWrappers;
CMidiManager::CMidiWrapper::CMidiWrapper() : x0_(0), xa_(1) {} CMidiManager::CMidiWrapper::CMidiWrapper() : x0_sysHandle(0), xa_available(true) {}
const CSfxHandle& CMidiManager::CMidiWrapper::GetManagerHandle() const { return x4_; } const CSfxHandle& CMidiManager::CMidiWrapper::GetManagerHandle() const { return x4_midiHandle; }
const u32 CMidiManager::CMidiWrapper::GetAudioSysHandle() const { return x0_; } const u32 CMidiManager::CMidiWrapper::GetAudioSysHandle() const { return x0_sysHandle; }
const bool CMidiManager::CMidiWrapper::IsAvailable() const { return xa_; } const bool CMidiManager::CMidiWrapper::IsAvailable() const { return xa_available; }
const short CMidiManager::CMidiWrapper::GetSongId() const { return x8_; } const short CMidiManager::CMidiWrapper::GetSongId() const { return x8_songId; }
void CMidiManager::CMidiWrapper::SetAvailable(const bool v) { xa_ = v; } void CMidiManager::CMidiWrapper::SetAvailable(const bool v) { xa_available = v; }
void CMidiManager::CMidiWrapper::SetAudioSysHandle(const u32 handle) { x0_ = handle; } void CMidiManager::CMidiWrapper::SetAudioSysHandle(const u32 handle) { x0_sysHandle = handle; }
void CMidiManager::CMidiWrapper::SetMidiHandle(const CSfxHandle& handle) { x4_ = handle; } void CMidiManager::CMidiWrapper::SetMidiHandle(const CSfxHandle& handle) { x4_midiHandle = handle; }
void CMidiManager::CMidiWrapper::SetSongId(const short id) { x8_ = id; } void CMidiManager::CMidiWrapper::SetSongId(const short id) { x8_songId = id; }
CSfxHandle CMidiManager::Play(const CMidiData& data, unsigned short fadeTime, bool stopExisting, CSfxHandle CMidiManager::Play(const CMidiData& data, unsigned short fadeTime, bool stopExisting,
short volume) { short volume) {
bool bVar2 = false; bool foundExisting = false;
u32 uVar6 = 0; u32 sysHandle = 0;
CSfxHandle handle = LocateHandle(); CSfxHandle handle = LocateHandle();
if (!handle) { if (!handle) {
return CSfxHandle(); return CSfxHandle();
@ -44,8 +44,8 @@ CSfxHandle CMidiManager::Play(const CMidiData& data, unsigned short fadeTime, bo
} }
if (data.GetSongId() == mMidiWrappers[i].GetSongId()) { if (data.GetSongId() == mMidiWrappers[i].GetSongId()) {
bVar2 = true; foundExisting = true;
uVar6 = mMidiWrappers[i].GetAudioSysHandle(); sysHandle = mMidiWrappers[i].GetAudioSysHandle();
mMidiWrappers[i].SetAvailable(true); mMidiWrappers[i].SetAvailable(true);
} else { } else {
Stop(mMidiWrappers[i].GetManagerHandle(), fadeTime); Stop(mMidiWrappers[i].GetManagerHandle(), fadeTime);
@ -53,16 +53,16 @@ CSfxHandle CMidiManager::Play(const CMidiData& data, unsigned short fadeTime, bo
} }
} }
if (bVar2) { if (foundExisting) {
wrapper.SetAudioSysHandle(uVar6); wrapper.SetAudioSysHandle(sysHandle);
wrapper.SetSongId(data.GetSongId()); wrapper.SetSongId(data.GetSongId());
} else { } else {
u32 tmp = CAudioSys::SeqPlayEx(data.GetGroupId(), data.GetSongId(), data.GetData(), nullptr, 0); u32 sysHandle = CAudioSys::SeqPlayEx(data.GetGroupId(), data.GetSongId(), data.GetData(), nullptr, 0);
if (fadeTime != 0) { if (fadeTime != 0) {
CAudioSys::SeqVolume(0, 0, tmp, 0); CAudioSys::SeqVolume(0, 0, sysHandle, 0);
} }
CAudioSys::SeqVolume(volume, fadeTime, tmp, 0); CAudioSys::SeqVolume(volume, fadeTime, sysHandle, 0);
wrapper.SetAudioSysHandle(tmp); wrapper.SetAudioSysHandle(sysHandle);
wrapper.SetSongId(data.GetSongId()); wrapper.SetSongId(data.GetSongId());
} }