MmlSeqTrack + Allocator

zeldaret · Nov 6, 2024 · 35319d7 · 35319d7
1 parent b3236b4
commit 35319d7
Show file tree

Hide file tree

Showing 12 changed files with 814 additions and 22 deletions.
diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
@@ -1553,9 +1553,11 @@ nw4r/snd/snd_MmlParser.cpp:
 
 nw4r/snd/snd_MmlSeqTrack.cpp:
 	.text       start:0x8046F640 end:0x8046F6F8
+	.data       start:0x8056DF48 end:0x8056DF58
 
 nw4r/snd/snd_MmlSeqTrackAllocator.cpp:
 	.text       start:0x8046F700 end:0x8046F850
+	.data       start:0x8056DF58 end:0x8056DF70
 
 nw4r/snd/snd_NandSoundArchive.cpp:
 	.text       start:0x8046F850 end:0x804700B8

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
@@ -37126,8 +37126,8 @@ __vt__Q34nw4r3snd18MemorySoundArchive = .data:0x8056DCF8; // type:object size:0x
 lbl_8056DD18 = .data:0x8056DD18; // type:object size:0x28
 jumptable_8056DD40 = .data:0x8056DD40; // type:object size:0x1F4 scope:local
 lbl_8056DF38 = .data:0x8056DF38; // type:object size:0x10
-lbl_8056DF48 = .data:0x8056DF48; // type:object size:0x10
-lbl_8056DF58 = .data:0x8056DF58; // type:object size:0x18
+__vt__Q44nw4r3snd6detail11MmlSeqTrack = .data:0x8056DF48; // type:object size:0x10
+__vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator = .data:0x8056DF58; // type:object size:0x18
 lbl_8056DF70 = .data:0x8056DF70; // type:object size:0x60
 lbl_8056DFD0 = .data:0x8056DFD0; // type:object size:0x20
 __vt__Q44nw4r3snd6detail10PlayerHeap = .data:0x8056DFF0; // type:object size:0x10

diff --git a/configure.py b/configure.py
@@ -728,8 +728,8 @@ def nw4rLib(lib_name, objects, extra_cflags=[], mw_version="Wii/1.3"):
             Object(Matching, "nw4r/snd/snd_MemorySoundArchive.cpp"),
             Object(NonMatching, "nw4r/snd/snd_MidiSeqPlayer.cpp"),
             Object(NonMatching, "nw4r/snd/snd_MmlParser.cpp"),
-            Object(NonMatching, "nw4r/snd/snd_MmlSeqTrack.cpp"),
-            Object(NonMatching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"),
+            Object(Matching, "nw4r/snd/snd_MmlSeqTrack.cpp"),
+            Object(Matching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"),
             Object(NonMatching, "nw4r/snd/snd_NandSoundArchive.cpp"),
             Object(Matching, "nw4r/snd/snd_PlayerHeap.cpp"),
             Object(NonMatching, "nw4r/snd/snd_RemoteSpeaker.cpp"),

diff --git a/include/nw4r/snd/snd_BasicPlayer.h b/include/nw4r/snd/snd_BasicPlayer.h
@@ -123,6 +123,9 @@ class BasicPlayer {
     f32 GetBiquadFilterValue() const {
         return mParamSet.mBiquadFilterValue;
     }
+    int GetBiquadFilterType() const {
+        return mParamSet.mBiquadFilter;
+    }
     void SetRemoteFilter(int filter);
 
     f32 GetRemoteSend(int remote) const;

diff --git a/include/nw4r/snd/snd_Channel.h b/include/nw4r/snd/snd_Channel.h
@@ -211,7 +211,7 @@ class Channel {
     bool mReleasePriorityFixFlag; // at 0x39
     bool field_0x3A; // at 0x3A
     u8 mBiquadFilter; // at 0x3B
-    bool mRemoteFilter; // at 0x3C
+    u8 mRemoteFilter; // at 0x3C
 
     f32 mUserVolume;      // at 0x40
     f32 mUserPitchRatio;  // at 0x44

diff --git a/include/nw4r/snd/snd_MmlParser.h b/include/nw4r/snd/snd_MmlParser.h
@@ -15,6 +15,7 @@ class SeqPlayer;
 class MmlParser {
 public:
     enum SeqArgType {
+        SEQ_ARG_NONE,
         SEQ_ARG_U8,
         SEQ_ARG_S16,
         SEQ_ARG_VMIDI,

diff --git a/include/nw4r/snd/snd_MmlSeqTrack.h b/include/nw4r/snd/snd_MmlSeqTrack.h
@@ -31,13 +31,8 @@ class MmlSeqTrack : public SeqTrack {
         mParser = pParser;
     }
 
-    MmlParserParam &GetMmlParserParam() {
-        return mMmlParserParam;
-    }
-
 private:
     const MmlParser *mParser;       // at 0xC0
-    MmlParserParam mMmlParserParam; // at 0xC4
 };
 
 } // namespace detail

diff --git a/include/nw4r/snd/snd_SeqTrack.h b/include/nw4r/snd/snd_SeqTrack.h
@@ -171,12 +171,6 @@ class SeqTrack {
     volatile s16 mTrackVariable[VARIABLE_NUM]; // at 0xA0
     SeqPlayer *mPlayer;                        // at 0xC0
     Channel *mChannelList;                     // at 0xC4
-    // ???
-    f32 mExtLpfFreq;                            // at 0x1C
-    f32 mExtMainSend;                           // at 0x20
-    f32 mExtFxSend[AUX_BUS_NUM];                // at 0x24
-    f32 mExtRemoteSend[WPAD_MAX_CONTROLLERS];   // at 0x30
-    f32 mExtRemoteFxSend[WPAD_MAX_CONTROLLERS]; // at 0x40
 };
 
 } // namespace detail