arm7: split SND into SND_global and SND_channel

4 files changed, 50 insertions, 49 deletions

diff --git a/arm7/lib/include/SND_channel.h b/arm7/lib/include/SND_channel.h
new file mode 100644
index 00000000..0c3cbe7b
--- /dev/null
+++ b/arm7/lib/include/SND_channel.h
@@ -0,0 +1,47 @@
+#ifndef GUARD_SND_CHANNEL_H
+#define GUARD_SND_CHANNEL_H
+
+#include "nitro/types.h"
+
+void SND_SetupChannelPcm(
+    int chnIdx,
+    const void *data,
+    int format,
+    int loop,
+    int loopStart,
+    int loopLen,
+    int volume,
+    int volumeDiv,
+    int timer,
+    int pan
+);
+
+void SND_SetupChannelPsg(
+    int chnIdx,
+    int waveDuty,
+    int volume,
+    int volumeDiv,
+    int timer,
+    int pan
+);
+
+void SND_SetupChannelNoise(
+    int chnIdx,
+    int volume,
+    int volumeDiv,
+    int timer,
+    int pan
+);
+
+void SND_StopChannel(int chnIdx, int hold);
+
+void SND_SetChannelVolume(int chnIdx, int volume, int volumeDiv);
+void SND_SetChannelTimer(int chnIdx, int timer);
+void SND_SetChannelPan(int chnIdx, int pan);
+
+BOOL SND_IsChannelActive(int idx);
+void SND_SetMasterPan(int pan);
+u32 SND_GetChannelControl(int idx);
+void SNDi_SetSurroundDecay(int decay);
+
+#endif //GUARD_SND_CHANNEL_H
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index a2d19971..99f8de21 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -21,7 +21,6 @@ void SND_ReleaseExChannel(struct SNDExChannel *chn);
 BOOL SND_IsExChannelActive(struct SNDExChannel *chn);
 struct SNDExChannel *SND_AllocExChannel(u32 channelMask, int priority, u32 flags, SNDExChannelCallback callback, void *callbackUserData);
 void SND_FreeExChannel(struct SNDExChannel *chn);
-BOOL SND_IsChannelActive(int idx);
 void SND_InvalidateWave(const void *start, const void *end);
 
 // TODO internal functions, move these so exChannel
@@ -42,47 +41,5 @@ void SND_InitLfoParam(struct SNDLfoParam *lfoParam);
 void SND_StartLfo(struct SNDLfo *lfo);
 void SND_UpdateLfo(struct SNDLfo *lfo);
 int SND_GetLfoValue(struct SNDLfo *lfo);
-void SNDi_SetSurroundDecay(int decay);
-
-void SND_SetupChannelPcm(
-    int chnIdx,
-    const void *data,
-    int format,
-    int loop,
-    int loopStart,
-    int loopLen,
-    int volume,
-    int volumeDiv,
-    int timer,
-    int pan
-);
-
-void SND_SetupChannelPsg(
-    int chnIdx,
-    int waveDuty,
-    int volume,
-    int volumeDiv,
-    int timer,
-    int pan
-);
-
-void SND_SetupChannelNoise(
-    int chnIdx,
-    int volume,
-    int volumeDiv,
-    int timer,
-    int pan
-);
-
-void SND_StopChannel(int chnIdx, int hold);
-
-void SND_SetChannelVolume(int chnIdx, int volume, int volumeDiv);
-void SND_SetChannelPan(int chnIdx, int pan);
-void SND_SetChannelTimer(int chnIdx, int timer);
-
-u32 SND_GetChannelControl(int idx);
-
-// TODO move this function to SND_exChannel.c
-u16 CalcDecayCoeff(int value);
 
 #endif //GUARD_SND_EXCHANNEL_H
diff --git a/arm7/lib/include/SND.h b/arm7/lib/include/SND_global.h
index 196377ed..47bb7a69 100644
--- a/arm7/lib/include/SND.h
+++ b/arm7/lib/include/SND_global.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_SND_H
-#define GUARD_SND_H
+#ifndef GUARD_SND_GLOBAL_H
+#define GUARD_SND_GLOBAL_H
 
 #include "nitro/types.h"
 
@@ -8,8 +8,7 @@ void SND_Disable(void);
 void SND_Shutdown(void);
 void SND_BeginSleep(void);
 void SND_EndSleep(void);
-void SND_SetMasterPan(int pan);
 void SND_SetMasterVolume(int vol);
 void SND_SetOutputSelector(int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer);
 
-#endif //GUARD_SND_H
+#endif //GUARD_SND_GLOBAL_H
diff --git a/arm7/lib/include/SND_main.h b/arm7/lib/include/SND_main.h
index fc72ae33..eba3ff44 100644
--- a/arm7/lib/include/SND_main.h
+++ b/arm7/lib/include/SND_main.h
@@ -12,7 +12,5 @@ u32 SND_WaitForIntervalTimer(void);
 void SND_SendWakeupMessage(void);
 void SNDi_LockMutex(void);
 void SNDi_UnlockMutex(void);
-void SND_SetMasterVolume(int vol);
-void SND_SetMasterPan(int pan);
 
 #endif //GUARD_SND_MAIN_H