diff options
Diffstat (limited to 'arm7/lib/include')
-rw-r--r-- | arm7/lib/include/SND_alarm.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_bank.h | 14 | ||||
-rw-r--r-- | arm7/lib/include/SND_capture.h | 5 | ||||
-rw-r--r-- | arm7/lib/include/SND_channel.h | 25 | ||||
-rw-r--r-- | arm7/lib/include/SND_command.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_exChannel.h | 11 | ||||
-rw-r--r-- | arm7/lib/include/SND_global.h | 5 | ||||
-rw-r--r-- | arm7/lib/include/SND_lfo.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_main.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_seq.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_util.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_work.h | 2 |
12 files changed, 36 insertions, 38 deletions
diff --git a/arm7/lib/include/SND_alarm.h b/arm7/lib/include/SND_alarm.h index 1eca6fe8..51f01bcc 100644 --- a/arm7/lib/include/SND_alarm.h +++ b/arm7/lib/include/SND_alarm.h @@ -9,4 +9,4 @@ void SND_SetupAlarm(s32 idx, OSTick tick, OSTick period, u32 id); void SND_StartAlarm(s32 idx); void SND_StopAlarm(s32 idx); -#endif //GUARD_SND_ALARM_H +#endif // GUARD_SND_ALARM_H diff --git a/arm7/lib/include/SND_bank.h b/arm7/lib/include/SND_bank.h index 36bdc08f..e22410ca 100644 --- a/arm7/lib/include/SND_bank.h +++ b/arm7/lib/include/SND_bank.h @@ -1,11 +1,17 @@ #ifndef GUARD_SND_BANK_H #define GUARD_SND_BANK_H -#include "nitro/SND_bank_shared.h" #include "nitro/types.h" +#include "nitro/SND_bank_shared.h" -BOOL SND_ReadInstData(const struct SNDBankData *bankData, s32 program, s32 midiKey, struct SNDInstData *instData); +BOOL SND_ReadInstData( + const struct SNDBankData *bankData, s32 program, s32 midiKey, struct SNDInstData *instData); const struct SNDWaveData *SND_GetWaveDataAddress(const struct SNDWaveArc *waveArc, s32 wave); -BOOL SND_NoteOn(struct SNDExChannel *chn, s32 midiKey, s32 velocity, s32 length, const struct SNDBankData *bankData, const struct SNDInstData *instData); +BOOL SND_NoteOn(struct SNDExChannel *chn, + s32 midiKey, + s32 velocity, + s32 length, + const struct SNDBankData *bankData, + const struct SNDInstData *instData); -#endif //GUARD_SND_BANK_H +#endif // GUARD_SND_BANK_H diff --git a/arm7/lib/include/SND_capture.h b/arm7/lib/include/SND_capture.h index 1878f90e..f71ce18d 100644 --- a/arm7/lib/include/SND_capture.h +++ b/arm7/lib/include/SND_capture.h @@ -3,7 +3,8 @@ #include "nitro/types.h" -void SND_SetupCapture(int idx, int format, void *captureData, int size, BOOL loop, int capCtrlSrc, int capCtrlDst); +void SND_SetupCapture( + int idx, int format, void *captureData, int size, BOOL loop, int capCtrlSrc, int capCtrlDst); BOOL SND_IsCaptureActive(int idx); -#endif //GUARD_SND_CAPTURE_H +#endif // GUARD_SND_CAPTURE_H diff --git a/arm7/lib/include/SND_channel.h b/arm7/lib/include/SND_channel.h index 0c3cbe7b..b401029a 100644 --- a/arm7/lib/include/SND_channel.h +++ b/arm7/lib/include/SND_channel.h @@ -3,8 +3,7 @@ #include "nitro/types.h" -void SND_SetupChannelPcm( - int chnIdx, +void SND_SetupChannelPcm(int chnIdx, const void *data, int format, int loop, @@ -13,25 +12,11 @@ void SND_SetupChannelPcm( int volume, int volumeDiv, int timer, - int pan -); + int pan); -void SND_SetupChannelPsg( - int chnIdx, - int waveDuty, - 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_SetupChannelNoise(int chnIdx, int volume, int volumeDiv, int timer, int pan); void SND_StopChannel(int chnIdx, int hold); @@ -44,4 +29,4 @@ void SND_SetMasterPan(int pan); u32 SND_GetChannelControl(int idx); void SNDi_SetSurroundDecay(int decay); -#endif //GUARD_SND_CHANNEL_H +#endif // GUARD_SND_CHANNEL_H diff --git a/arm7/lib/include/SND_command.h b/arm7/lib/include/SND_command.h index c22cd459..db42d177 100644 --- a/arm7/lib/include/SND_command.h +++ b/arm7/lib/include/SND_command.h @@ -6,4 +6,4 @@ void SND_CommandInit(void); void SND_CommandProc(void); -#endif //GUARD_SND_COMMAND_H +#endif // GUARD_SND_COMMAND_H diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h index 2d9a5a8c..6e89cb72 100644 --- a/arm7/lib/include/SND_exChannel.h +++ b/arm7/lib/include/SND_exChannel.h @@ -9,7 +9,8 @@ void SND_ExChannelInit(void); void SND_UpdateExChannel(void); void SND_ExChannelMain(BOOL step); -BOOL SND_StartExChannelPcm(struct SNDExChannel *chn, const struct SNDWaveParam *wave, const void *data, s32 length); +BOOL SND_StartExChannelPcm( + struct SNDExChannel *chn, const struct SNDWaveParam *wave, const void *data, s32 length); BOOL SND_StartExChannelPsg(struct SNDExChannel *chn, s32 duty, s32 length); BOOL SND_StartExChannelNoise(struct SNDExChannel *chn, s32 length); s32 SND_UpdateExChannelEnvelope(struct SNDExChannel *chn, BOOL step); @@ -19,7 +20,11 @@ void SND_SetExChannelSustain(struct SNDExChannel *chn, s32 sustain); void SND_SetExChannelRelease(struct SNDExChannel *chn, s32 release); 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); +struct SNDExChannel *SND_AllocExChannel(u32 channelMask, + int priority, + u32 flags, + SNDExChannelCallback callback, + void *callbackUserData); void SND_FreeExChannel(struct SNDExChannel *chn); void SND_InvalidateWave(const void *start, const void *end); @@ -35,4 +40,4 @@ void SND_StartLfo(struct SNDLfo *lfo); void SND_UpdateLfo(struct SNDLfo *lfo); int SND_GetLfoValue(struct SNDLfo *lfo); -#endif //GUARD_SND_EXCHANNEL_H +#endif // GUARD_SND_EXCHANNEL_H diff --git a/arm7/lib/include/SND_global.h b/arm7/lib/include/SND_global.h index 47bb7a69..cb91db66 100644 --- a/arm7/lib/include/SND_global.h +++ b/arm7/lib/include/SND_global.h @@ -9,6 +9,7 @@ void SND_Shutdown(void); void SND_BeginSleep(void); void SND_EndSleep(void); void SND_SetMasterVolume(int vol); -void SND_SetOutputSelector(int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer); +void SND_SetOutputSelector( + int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer); -#endif //GUARD_SND_GLOBAL_H +#endif // GUARD_SND_GLOBAL_H diff --git a/arm7/lib/include/SND_lfo.h b/arm7/lib/include/SND_lfo.h index f3737f08..71e0febf 100644 --- a/arm7/lib/include/SND_lfo.h +++ b/arm7/lib/include/SND_lfo.h @@ -5,4 +5,4 @@ #include "nitro/SND_exChannel_shared.h" -#endif //GUARD_SND_LFO_H +#endif // GUARD_SND_LFO_H diff --git a/arm7/lib/include/SND_main.h b/arm7/lib/include/SND_main.h index eba3ff44..65e3f8d3 100644 --- a/arm7/lib/include/SND_main.h +++ b/arm7/lib/include/SND_main.h @@ -13,4 +13,4 @@ void SND_SendWakeupMessage(void); void SNDi_LockMutex(void); void SNDi_UnlockMutex(void); -#endif //GUARD_SND_MAIN_H +#endif // GUARD_SND_MAIN_H diff --git a/arm7/lib/include/SND_seq.h b/arm7/lib/include/SND_seq.h index 25b63a35..4e54c0ff 100644 --- a/arm7/lib/include/SND_seq.h +++ b/arm7/lib/include/SND_seq.h @@ -21,4 +21,4 @@ void SND_SetTrackAllocatableChannel(int player, u32 trackMask, u32 channelMask); void SND_InvalidateSeq(const void *start, const void *end); void SND_InvalidateBank(const void *start, const void *end); -#endif //GUARD_SND_SEQ_H +#endif // GUARD_SND_SEQ_H diff --git a/arm7/lib/include/SND_util.h b/arm7/lib/include/SND_util.h index 80534b94..3b20a79f 100644 --- a/arm7/lib/include/SND_util.h +++ b/arm7/lib/include/SND_util.h @@ -13,4 +13,4 @@ u16 SND_CalcTimer(int timer, int pitch); extern const s16 SNDi_DecibelSquareTable[128]; -#endif //GUARD_SND_UTIL_H +#endif // GUARD_SND_UTIL_H diff --git a/arm7/lib/include/SND_work.h b/arm7/lib/include/SND_work.h index 0125a52d..536d4bd0 100644 --- a/arm7/lib/include/SND_work.h +++ b/arm7/lib/include/SND_work.h @@ -10,4 +10,4 @@ void SND_SetPlayerLocalVariable(int player, int var, s16 value); void SND_SetPlayerGlobalVariable(int var, s16 value); void SND_UpdateSharedWork(void); -#endif //GUARD_SND_WORK_H +#endif // GUARD_SND_WORK_H |