summaryrefslogtreecommitdiff
path: root/src/audio
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/effects.c3
-rw-r--r--src/audio/heap.c2
-rw-r--r--src/audio/internal.h2
-rw-r--r--src/audio/load.h2
-rw-r--r--src/audio/mixer.c2
-rw-r--r--src/audio/mixer.h8
-rw-r--r--src/audio/seqplayer.c19
-rw-r--r--src/audio/synthesis.c5
-rw-r--r--src/audio/synthesis.h1
9 files changed, 22 insertions, 22 deletions
diff --git a/src/audio/effects.c b/src/audio/effects.c
index 822ca29be..a2e63d294 100644
--- a/src/audio/effects.c
+++ b/src/audio/effects.c
@@ -12,7 +12,8 @@ void sequence_channel_process_sound(struct SequenceChannel* seqChannel, s32 reca
s32 i;
if (seqChannel->changes.as_bitfields.volume || recalculateVolume) {
- channelVolume = (seqChannel->volume * (seqChannel->volumeScale * seqChannel->seqPlayer->fadeVolume)) * seqChannel->seqPlayer->gameVolume;
+ channelVolume = (seqChannel->volume * (seqChannel->volumeScale * seqChannel->seqPlayer->fadeVolume)) *
+ seqChannel->seqPlayer->gameVolume;
if (seqChannel->seqPlayer->muted && (seqChannel->muteBehavior & MUTE_BEHAVIOR_SOFTEN) != 0) {
channelVolume = seqChannel->seqPlayer->muteVolumeScale * channelVolume;
}
diff --git a/src/audio/heap.c b/src/audio/heap.c
index 63482a163..99b481df5 100644
--- a/src/audio/heap.c
+++ b/src/audio/heap.c
@@ -664,7 +664,7 @@ void audio_reset_session(void) {
for (var_s5 = 0; var_s5 < 4; var_s5++) {
gSynthesisReverbs[var_s5].useReverb = 0;
}
-
+
gNumSynthesisReverbs = temp_s6->numReverbs;
for (var_s5 = 0; var_s5 < gNumSynthesisReverbs; var_s5++) {
reverb = &gSynthesisReverbs[var_s5];
diff --git a/src/audio/internal.h b/src/audio/internal.h
index 8d0dfbc17..c831bb12c 100644
--- a/src/audio/internal.h
+++ b/src/audio/internal.h
@@ -558,7 +558,7 @@ struct AudioBufferParametersEU {
* The version of that function in MK64 is significantly different
* from its SM64 counterpart
* Or we just have a poor understanding of this part of the system.
-**/
+ **/
struct EuAudioCmd {
union {
diff --git a/src/audio/load.h b/src/audio/load.h
index 4b4200c8c..94b48efb4 100644
--- a/src/audio/load.h
+++ b/src/audio/load.h
@@ -11,7 +11,7 @@
#define PRELOAD_BANKS 2
#define PRELOAD_SEQUENCE 1
-#define IS_SEQUENCE_CHANNEL_VALID(ptr) ((uintptr_t) (ptr) != (uintptr_t) &gSequenceChannelNone)
+#define IS_SEQUENCE_CHANNEL_VALID(ptr) ((uintptr_t) (ptr) != (uintptr_t) & gSequenceChannelNone)
struct SharedDma {
/*0x0*/ u8* buffer; // target, points to pre-allocated buffer
diff --git a/src/audio/mixer.c b/src/audio/mixer.c
index 9b8157ab5..b501b611a 100644
--- a/src/audio/mixer.c
+++ b/src/audio/mixer.c
@@ -1058,4 +1058,4 @@ void aUnkCmd19Impl(uint8_t f, uint16_t count, uint16_t out_addr, uint16_t in_add
out += 32;
nbytes -= 32 * sizeof(int16_t);
} while (nbytes > 0);
-} \ No newline at end of file
+}
diff --git a/src/audio/mixer.h b/src/audio/mixer.h
index 9aabd51b9..c5c04b51c 100644
--- a/src/audio/mixer.h
+++ b/src/audio/mixer.h
@@ -45,10 +45,8 @@ void aADPCMdecImpl(uint8_t flags, ADPCM_STATE state);
void aResampleImpl(uint8_t flags, uint16_t pitch, RESAMPLE_STATE state);
void aEnvSetup1Impl(uint8_t initial_vol_wet, uint16_t rate_wet, uint16_t rate_left, uint16_t rate_right);
void aEnvSetup2Impl(uint16_t initial_vol_left, uint16_t initial_vol_right);
-void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb,
- bool neg_left, bool neg_right,
- uint16_t dry_left_addr, uint16_t dry_right_addr,
- uint16_t wet_left_addr, uint16_t wet_right_addr);
+void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb, bool neg_left, bool neg_right,
+ uint16_t dry_left_addr, uint16_t dry_right_addr, uint16_t wet_left_addr, uint16_t wet_right_addr);
void aMixImpl(int16_t gain, uint16_t in_addr, uint16_t out_addr, uint16_t count);
void aS8DecImpl(uint8_t flags, ADPCM_STATE state);
void aAddMixerImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr);
@@ -91,4 +89,4 @@ void aUnkCmd19Impl(uint8_t f, uint16_t count, uint16_t out_addr, uint16_t in_add
#define aDownsampleHalf(pkt, nSamples, i, o) aDownsampleHalfImpl(nSamples, i, o)
#define aHiLoGain(pkt, g, buflen, i, a4) aHiLoGainImpl(g, buflen, i)
#define aUnkCmd3(pkt, a1, a2, a3) aUnkCmd3Impl(a1, a2, a3)
-#define aUnkCmd19(pkt, a1, a2, a3, a4) aUnkCmd19Impl(a1, a2, a3, a4) \ No newline at end of file
+#define aUnkCmd19(pkt, a1, a2, a3, a4) aUnkCmd19Impl(a1, a2, a3, a4)
diff --git a/src/audio/seqplayer.c b/src/audio/seqplayer.c
index c25eb8196..08354d231 100644
--- a/src/audio/seqplayer.c
+++ b/src/audio/seqplayer.c
@@ -733,14 +733,15 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer* layer) {
if (seqChannel) {}
}
-u8 get_instrument(struct SequenceChannel *seqChannel, u8 instId, struct Instrument **instOut, struct AdsrSettings *adsr) {
- struct CtlEntry *bank = GameEngine_LoadBank(seqChannel->bankId);
- if(instId >= bank->numInstruments) {
+u8 get_instrument(struct SequenceChannel* seqChannel, u8 instId, struct Instrument** instOut,
+ struct AdsrSettings* adsr) {
+ struct CtlEntry* bank = GameEngine_LoadBank(seqChannel->bankId);
+ if (instId >= bank->numInstruments) {
*instOut = NULL;
return 0;
}
struct Instrument* inst = bank->instruments[instId];
- if(inst == NULL) {
+ if (inst == NULL) {
*instOut = NULL;
return 0;
}
@@ -911,9 +912,9 @@ void sequence_channel_process_script(struct SequenceChannel* seqChannel) {
case 0xEB: {
cmd = m64_read_u8(state);
- struct AudioSequenceData *sequence = GameEngine_LoadSequence(seqPlayer->seqId);
+ struct AudioSequenceData* sequence = GameEngine_LoadSequence(seqPlayer->seqId);
cmd = sequence->banks[cmd];
- if(IS_BANK_LOAD_COMPLETE(cmd)) {
+ if (IS_BANK_LOAD_COMPLETE(cmd)) {
seqChannel->bankId = cmd;
}
}
@@ -1009,9 +1010,9 @@ void sequence_channel_process_script(struct SequenceChannel* seqChannel) {
case 0xC6: {
cmd = m64_read_u8(state);
- struct AudioSequenceData *sequence = GameEngine_LoadSequence(seqPlayer->seqId);
+ struct AudioSequenceData* sequence = GameEngine_LoadSequence(seqPlayer->seqId);
cmd = sequence->banks[cmd];
- if(IS_BANK_LOAD_COMPLETE(cmd)) {
+ if (IS_BANK_LOAD_COMPLETE(cmd)) {
seqChannel->bankId = cmd;
}
break;
@@ -1214,7 +1215,7 @@ void sequence_player_process_sequence(struct SequencePlayer* seqPlayer) {
if (seqPlayer->enabled == false) {
return;
}
-
+
GameEngine_LoadSequence(seqPlayer->seqId);
GameEngine_LoadBank(seqPlayer->defaultBank[0]);
diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c
index aecf4e732..d5855998c 100644
--- a/src/audio/synthesis.c
+++ b/src/audio/synthesis.c
@@ -474,7 +474,8 @@ Acmd* synthesis_process_note(s32 noteIndex, struct NoteSubEu* noteSubEu, struct
} else {
var_a0_2 = (temp_t6 * 9) + sampleAddr;
// var_a0_2 =
- // dma_sample_data((uintptr_t) (temp_t6 * 9) + sampleAddr, ALIGN(((loopInfo_2 * 9) + 16), 4),
+ // dma_sample_data((uintptr_t) (temp_t6 * 9) + sampleAddr, ALIGN(((loopInfo_2 * 9) + 16),
+ // 4),
// flags, &synthesisState->sampleDmaIndex);
// unsure flags?
}
@@ -576,7 +577,7 @@ Acmd* synthesis_process_note(s32 noteIndex, struct NoteSubEu* noteSubEu, struct
resampledTempLen + DMEM_ADDR_RESAMPLED);
break;
}
- //break;
+ // break;
}
if (noteSubEu->finished != false) {
break;
diff --git a/src/audio/synthesis.h b/src/audio/synthesis.h
index 870c6bfe0..e35627bb9 100644
--- a/src/audio/synthesis.h
+++ b/src/audio/synthesis.h
@@ -20,7 +20,6 @@
#define DMEM_ADDR_WET_LEFT_CH 0x840
#define DMEM_ADDR_WET_RIGHT_CH 0x9C0
-
/*
Its not clear what values these macros should have. Neither version seem to
line up for MK64. Maybe each game has unique values for these? I don't know
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-07 17:28:56 +0000