mirror of
https://github.com/HarbourMasters/Starship
synced 2026-06-25 02:12:05 -04:00
Audio_seqplayer finished (#154)
* heapsort * suff * load init * split * split data * begone asm * names * names and cleanup * let's try this * woo macros * general * bgm macro * names * audio_thread * Update Torch * I think it's time to move on * Merge remote-tracking branch 'upstream/master' into play * playback * bss * it's over --------- Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
This commit is contained in:
@@ -425,7 +425,7 @@ typedef struct SequenceChannel {
|
||||
/* 0x28 */ s32 pan;
|
||||
/* 0x2C */ f32 appliedVolume;
|
||||
/* 0x30 */ f32 freqMod;
|
||||
/* 0x34 */ u8 (*dynTable)[][2];
|
||||
/* 0x34 */ u8 (*dynTable)[2];
|
||||
/* 0x38 */ struct Note* noteUnused;
|
||||
/* 0x3C */ struct SequenceLayer* layerUnused;
|
||||
/* 0x40 */ Instrument* instrument;
|
||||
@@ -435,7 +435,7 @@ typedef struct SequenceChannel {
|
||||
/* 0x74 */ AdsrSettings adsr;
|
||||
/* 0x7C */ NotePool notePool;
|
||||
/* 0xBC */ s8 seqScriptIO[8]; // bridge between .seq script and audio lib, "io ports"
|
||||
/* 0xC4 */ Stereo stereo;
|
||||
/* 0xC4 */ u16 unkC4;
|
||||
} SequenceChannel; // size = 0xC8
|
||||
|
||||
// Might also be known as a Track, according to sm64 debug strings (?).
|
||||
@@ -1404,7 +1404,7 @@ extern AudioBufferParameters gAudioBufferParams;
|
||||
extern s32 gSampleDmaBuffSize;
|
||||
extern s32 gMaxAudioCmds;
|
||||
extern s32 gNumNotes;
|
||||
extern u16 gMaxTempo;
|
||||
extern s16 gMaxTempo;
|
||||
extern s8 gAudioSoundMode;
|
||||
extern volatile s32 gAudioTaskCountQ;
|
||||
extern s32 gCurAudioFrameDmaCount;
|
||||
|
||||
@@ -84,7 +84,7 @@ AudioBufferParameters gAudioBufferParams;
|
||||
s32 gSampleDmaBuffSize;
|
||||
s32 gMaxAudioCmds;
|
||||
s32 gNumNotes;
|
||||
u16 gMaxTempo;
|
||||
s16 gMaxTempo;
|
||||
s8 gAudioSoundMode;
|
||||
volatile s32 gAudioTaskCountQ;
|
||||
s32 gCurAudioFrameDmaCount;
|
||||
|
||||
@@ -666,7 +666,7 @@ void AudioHeap_Init(void) {
|
||||
gAudioBufferParams.ticksPerUpdateInv = 1.0f / gAudioBufferParams.ticksPerUpdate;
|
||||
gNumNotes = spec->numNotes;
|
||||
D_8014C1B0 = spec->unk_14;
|
||||
gMaxTempo = (gAudioBufferParams.ticksPerUpdate * 2880000.0f / gSeqTicksPerBeat) / gMaxTempoTvTypeFactors;
|
||||
gMaxTempo = (u16) ((gAudioBufferParams.ticksPerUpdate * 2880000.0f / gSeqTicksPerBeat) / gMaxTempoTvTypeFactors);
|
||||
gAudioBufferParams.specUnk4 = spec->unk_04;
|
||||
gAudioBufferParams.samplesPerFrameTarget *= gAudioBufferParams.specUnk4;
|
||||
gAudioBufferParams.maxAiBufferLength *= gAudioBufferParams.specUnk4;
|
||||
|
||||
@@ -491,7 +491,7 @@ void func_800128B4(void) {
|
||||
for (var_s1 = 0; var_s1 < gNumNotes; var_s1++) {
|
||||
gNotes[var_s1].listItem.u.value = &gNotes[var_s1];
|
||||
gNotes[var_s1].listItem.prev = NULL;
|
||||
func_800145BC(&gNoteFreeLists.disabled, &gNotes[var_s1]);
|
||||
func_800145BC(&gNoteFreeLists.disabled, &gNotes[var_s1].listItem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1033
-4
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user