summaryrefslogtreecommitdiff
path: root/arm7/lib/include
diff options
context:
space:
mode:
authorMichael Panzlaff <michael.panzlaff@fau.de>2021-07-07 02:27:19 +0200
committerMichael Panzlaff <michael.panzlaff@fau.de>2021-08-25 18:03:47 +0200
commit6fda29badc3e915d019ab6f6c1cddc19d18614b2 (patch)
treeafd1c99f0dca88ae0d3ac2f265e729ff7531bfa2 /arm7/lib/include
parentc607834736e32183b56150e478f90ee7edc233af (diff)
arm7: decompile SND_channel
Diffstat (limited to 'arm7/lib/include')
-rw-r--r--arm7/lib/include/SND_channel.h4
-rw-r--r--arm7/lib/include/SND_exChannel.h12
-rw-r--r--arm7/lib/include/SND_lfo.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/arm7/lib/include/SND_channel.h b/arm7/lib/include/SND_channel.h
index 718e7e2b..ea179968 100644
--- a/arm7/lib/include/SND_channel.h
+++ b/arm7/lib/include/SND_channel.h
@@ -3,6 +3,8 @@
#include "nitro/types.h"
+#include "SND_exChannel.h"
+
void SND_SetupChannelPcm(
s32 chnIdx,
const void *data,
@@ -40,6 +42,6 @@ void SND_SetChannelPan(s32 chnIdx, s32 pan);
void SND_SetChannelTimer(s32 chnIdx, s32 timer);
// TODO move this function to SND_exChannel.c
-u16 CalcDecayCoeff(s32 value);
+u16 CalcDecayCoeff(int value);
#endif //GUARD_SND_CHANNEL_H
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index dfd93f21..fcc3a548 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -6,8 +6,6 @@
#include "nitro/SND_exChannel_shared.h"
#include "nitro/SND_main_shared.h"
-typedef void (*SNDExChannelCallback)(struct SNDExChannel *chn, s32 status, void *userData);
-
void SND_ExChannelInit(void);
void SND_UpdateExChannel(void);
void SND_ExChannelMain(BOOL step);
@@ -26,10 +24,10 @@ void SND_FreeExChannel(struct SNDExChannel *chn);
BOOL SND_IsChannelActive(s32 idx);
// TODO internal functions, move these so exChannel
-s32 ExChannelSweepUpdate(struct SNDExChannel *chn, BOOL step);
-s32 ExChannelLfoUpdate(struct SNDExChannel *chn, BOOL step);
-void ExChannelStart(struct SNDExChannel *chn, s32);
-s32 ExChannelVolumeCmp(struct SNDExChannel *chn_a, struct SNDExChannel *chn_b);
-void ExChannelSetup(struct SNDExChannel *, SNDExChannelCallback callback, void *callbackUserData, s32 priority);
+int ExChannelSweepUpdate(struct SNDExChannel *chn, BOOL step);
+int ExChannelLfoUpdate(struct SNDExChannel *chn, BOOL step);
+void ExChannelStart(struct SNDExChannel *chn, int length);
+int ExChannelVolumeCmp(struct SNDExChannel *chn_a, struct SNDExChannel *chn_b);
+void ExChannelSetup(struct SNDExChannel *, SNDExChannelCallback callback, void *callbackUserData, int priority);
#endif //GUARD_SND_EXCHANNEL_H
diff --git a/arm7/lib/include/SND_lfo.h b/arm7/lib/include/SND_lfo.h
index 05d4647e..43055c27 100644
--- a/arm7/lib/include/SND_lfo.h
+++ b/arm7/lib/include/SND_lfo.h
@@ -8,6 +8,6 @@
void SND_InitLfoParam(struct SNDLfoParam *lfoParam);
void SND_StartLfo(struct SNDLfo *lfo);
void SND_UpdateLfo(struct SNDLfo *lfo);
-s32 SND_LfoGetValue(struct SNDLfo *lfo);
+int SND_GetLfoValue(struct SNDLfo *lfo);
#endif //GUARD_SND_LFO_H