Files
wii-ipl/include/bannerSound/AudioWaveUtility.h
coah a824e02a30 fix: restore 43U DOL hash on main (#213)
* fix: restore MSL extab flags and force-active stripped symbols

* fix: limit ChannelTitle novtable header changes to IPL_CHANNEL_TITLE_NOVTABLE

PR #182 made gui::EventHandler novtable and rewrote HermiteIntp for every
unit, which dropped __vt__Q23gui12EventHandler from linked scene units and
moved EventHandler::onEvent. Restore the pre-#182 definitions unless the
macro is defined.

* fix: restore u16 addrType in cdb::Manager::createNewRecord

The original symbol takes u16 (mangled UsUs); the enum parameter made
createNewRecord 4 bytes longer. Match the caller in iplNwc24Manager with a
u16 local assigned through if/else.

* fix: emit TVRC loop handlers after TVRCSendStartAsync

The original object places both alarm handlers at the end of .text.

* fix: construct scene::Date::mscMaxDate with utility::Date

The MaxDate wrapper emitted a weak MaxDate ctor that the original does
not have, shifting .text by 0x10 after iplDate. Go back to a plain
utility::Date followed by the 0x10-byte padding array.

* fix: define textinput PaneComponent dtor after PaneManager dtor

Matches the original object's function order, which also pulls the weak
GUIComponent dtor into place.

* fix: define EGG audio Arg and SoundHeapMgr ctors out of line

Emits IAudioMgr::Arg::Arg first and SoundHeapMgr's weak dtor ahead of its
ctor, matching the original eggAudioMgr function order.

* fix: define WaveFile dtors in AudioWavePlayer after the ctor

The original emits WavePacket's weak dtor first, then the WaveFileAiff and
WaveFileWav dtors. Declaring the dtors after getBit keeps the vtables in
AudioWaveUtility.

* fix: restore fork-point iplCSMtx string pooling

Moving "MTX34" into a static const array put it in .sdata2 and left the
pooled .sdata copy to be dead-stripped, shifting both sections.

* fix: share tiGUIManager's named 0.0f constant

drawLine_ and PaneComponent::contain now load lbl_81694EE8, as in the
original, instead of emitting their own 0.0f ahead of it in .sdata2.

* fix: force-active unreferenced iplDate and WDScan data

MWLD dead-strips scene::padding (the 0x10 bytes after Date::mscMaxDate)
and the unreferenced WDScan .sdata2 bytes lbl_81695063/lbl_81695067,
which shifted .bss and .sdata2.

* fix: unlink eggAudioExpMgr

MWCC emits the @52 calc thunk ahead of the @52 dtor thunk, but the
original has them the other way round, which swaps two vtable entries.
Link the original object until the order is matched.

* fix: shrink Calendar .data padding now that EventHandler has a vtable

With gui::EventHandler no longer novtable, its 0x18-byte vtable fills most
of the gap after __vt__Q33ipl5scene8Calendar; keep one 4-byte pad.
2026-09-27 23:26:31 -05:00

103 lines
2.9 KiB
C++

#ifndef AUDIO_WAVE_UTILITY_H
#define AUDIO_WAVE_UTILITY_H
#include <nw4r/snd/WavePlayer.h>
#include <revolution/types.h>
class WaveFile {
public:
virtual ~WaveFile(){};
virtual u32 getBit() const = 0;
virtual int getChannels() const = 0;
virtual f64 getSamplingRate() const = 0;
virtual s32 getFrames() const = 0;
virtual void* getDataBase() const = 0;
virtual void* getDataCur() const = 0;
virtual bool isLoop() const = 0;
virtual s32 getLoopStart() const = 0;
virtual s32 getLoopEnd() const = 0;
virtual s32 readData(s16* samples, s32 numSamples) = 0;
virtual void setDataCur(u32 sampleOffset) = 0;
private:
undefined4 unk_0x04; // 0x04
};
class WaveFileAiff : public WaveFile {
public:
WaveFileAiff();
virtual u32 getBit() const override;
virtual ~WaveFileAiff();
virtual int getChannels() const override { return mNumChans; }
virtual f64 getSamplingRate() const override { return mSamplingRate; }
virtual s32 getFrames() const override;
virtual void* getDataBase() const override;
virtual void* getDataCur() const override;
virtual bool isLoop() const override;
virtual s32 getLoopStart() const override;
virtual s32 getLoopEnd() const override;
virtual s32 readData(s16* samples, s32 numSamples) override;
virtual void setDataCur(u32 sampleOffset) override;
bool checkFile(const void* data, u32 length, bool ignoreSize);
bool init(const void* data, u32 length);
private:
f64 decodeIeeeExtended(u16 signExpon, u32 mantissaHi, u32 mantissaLo);
int mBits; // 0x08
int mNumChans; // 0x0C
f64 mSamplingRate; // 0x10
s32 mFrames; // 0x18
bool mIsLoop; // 0x1C
s32 mLoopStart; // 0x20
s32 mLoopEnd; // 0x24
s16* mpDataBase; // 0x28
s16* mpDataCur; // 0x2C
};
class WaveFileWav : public WaveFile {
public:
WaveFileWav();
virtual u32 getBit() const override;
virtual ~WaveFileWav();
virtual int getChannels() const override { return mNumChans; }
virtual f64 getSamplingRate() const override { return mSamplingRate; }
virtual s32 getFrames() const override;
virtual void* getDataBase() const override;
virtual void* getDataCur() const override;
virtual bool isLoop() const override;
virtual s32 getLoopStart() const override;
virtual s32 getLoopEnd() const override;
virtual s32 readData(s16* samples, s32 numSamples) override;
virtual void setDataCur(u32 sampleOffset) override;
bool checkFile(const void* data, u32 length, bool ignoreSize);
bool init(const void* data, u32 length);
private:
int mBits; // 0x08
int mNumChans; // 0x0C
u32 mSamplingRate; // 0x10
s32 mFrames; // 0x14
bool mIsLoop; // 0x18
s32 mLoopStart; // 0x1C
s32 mLoopEnd; // 0x20
s16* mpDataBase; // 0x24
s16* mpDataCur; // 0x28
};
#endif // AUDIO_WAVE_UTILITY_H