summaryrefslogtreecommitdiff
path: root/arm7/lib/include
diff options
context:
space:
mode:
Diffstat (limited to 'arm7/lib/include')
-rw-r--r--arm7/lib/include/SND_exChannel.h5
-rw-r--r--arm7/lib/include/SND_lockChannel.h15
2 files changed, 5 insertions, 15 deletions
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index 66a1d78f..9ebedc76 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -31,4 +31,9 @@ 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);
+void SND_StopUnlockedChannel(u32 channelMask, u32 weak);
+void SND_LockChannel(u32 channelMask, u32 weak);
+void SND_UnlockChannel(u32 channelMask, u32 weak);
+u32 SND_GetLockedChannel(u32 weak);
+
#endif //GUARD_SND_EXCHANNEL_H
diff --git a/arm7/lib/include/SND_lockChannel.h b/arm7/lib/include/SND_lockChannel.h
deleted file mode 100644
index 461745b3..00000000
--- a/arm7/lib/include/SND_lockChannel.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef GUARD_SND_LOCKCHANNEL_H
-#define GUARD_SND_LOCKCHANNEL_H
-
-#include "nitro/types.h"
-
-void SND_StopUnlockedChannel(u32 channelMask, u32 weak);
-void SND_LockChannel(u32 channelMask, u32 weak);
-void SND_UnlockChannel(u32 channelMask, u32 weak);
-u32 SND_GetLockedChannel(u32 weak);
-
-// TODO remove these externs if lockChannel is merged with exChannel
-extern u32 sLockedChannelMask;
-extern u32 sWeakLockedChannelMask;
-
-#endif //GUARD_SND_LOCKCHANNEL_H