From 65da035e9b62f928da7a2b29c0e5a10a9c935b90 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 17 Oct 2021 22:17:37 +1000 Subject: [PATCH] Rename n_alSeqpSetFilter11 to n_alSeqpStop --- include/PR/libaudio.h | 52 +++++++++++++++--------------- ld/libfiles.ntsc-beta.inc | 2 +- ld/libfiles.ntsc-final.inc | 2 +- ld/libfiles.pal-final.inc | 2 +- src/lib/music.c | 14 ++++---- src/lib/naudio/n_seqpsetfilter11.c | 11 ------- src/lib/naudio/n_seqpstop.c | 11 +++++++ 7 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 src/lib/naudio/n_seqpsetfilter11.c create mode 100644 src/lib/naudio/n_seqpstop.c diff --git a/include/PR/libaudio.h b/include/PR/libaudio.h index 1cb3dd84e..8415fbcea 100644 --- a/include/PR/libaudio.h +++ b/include/PR/libaudio.h @@ -414,32 +414,32 @@ Acmd *alAudioFrame(Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen); * Audio Library event type definitions */ enum ALMsg { - AL_SEQ_REF_EVT, /* Reference to a pending event in the sequence. */ - AL_SEQ_MIDI_EVT, - AL_SEQP_MIDI_EVT, - AL_TEMPO_EVT, - AL_SEQ_END_EVT, - AL_NOTE_END_EVT, - AL_SEQP_ENV_EVT, - AL_SEQP_META_EVT, - AL_SEQP_PROG_EVT, - AL_SEQP_API_EVT, - AL_SEQP_VOL_EVT, - AL_SEQP_LOOP_EVT, - AL_SEQP_PRIORITY_EVT, - AL_SEQP_SEQ_EVT, - AL_SEQP_BANK_EVT, - AL_SEQP_PLAY_EVT, - AL_SEQP_STOP_EVT, - AL_SEQP_STOPPING_EVT, - AL_TRACK_END, - AL_CSP_LOOPSTART, - AL_CSP_LOOPEND, - AL_CSP_NOTEOFF_EVT, - AL_TREM_OSC_EVT, - AL_VIB_OSC_EVT, - AL_18_EVT, - AL_19_EVT + /*0x00*/ AL_SEQ_REF_EVT, /* Reference to a pending event in the sequence. */ + /*0x01*/ AL_SEQ_MIDI_EVT, + /*0x02*/ AL_SEQP_MIDI_EVT, + /*0x03*/ AL_TEMPO_EVT, + /*0x04*/ AL_SEQ_END_EVT, + /*0x05*/ AL_NOTE_END_EVT, + /*0x06*/ AL_SEQP_ENV_EVT, + /*0x07*/ AL_SEQP_META_EVT, + /*0x08*/ AL_SEQP_PROG_EVT, + /*0x09*/ AL_SEQP_API_EVT, + /*0x0a*/ AL_SEQP_VOL_EVT, + /*0x0b*/ AL_SEQP_LOOP_EVT, + /*0x0c*/ AL_SEQP_PRIORITY_EVT, + /*0x0d*/ AL_SEQP_SEQ_EVT, + /*0x0e*/ AL_SEQP_BANK_EVT, + /*0x0f*/ AL_SEQP_PLAY_EVT, + /*0x10*/ AL_SEQP_STOP_EVT, + /*0x11*/ AL_SEQP_STOPPING_EVT, + /*0x12*/ AL_TRACK_END, + /*0x13*/ AL_CSP_LOOPSTART, + /*0x14*/ AL_CSP_LOOPEND, + /*0x15*/ AL_CSP_NOTEOFF_EVT, + /*0x16*/ AL_TREM_OSC_EVT, + /*0x17*/ AL_VIB_OSC_EVT, + /*0x18*/ AL_18_EVT, + /*0x19*/ AL_19_EVT }; /* diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 884e4bc9e..410a9393f 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -80,7 +80,7 @@ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ - build/ROMID/lib/naudio/n_seqpsetfilter11.o (section); \ + build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ build/ROMID/lib/naudio/n_synallocfx.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 5a8bda4bc..2fee2c30f 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -77,7 +77,7 @@ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ - build/ROMID/lib/naudio/n_seqpsetfilter11.o (section); \ + build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ build/ROMID/lib/naudio/n_synallocfx.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 3d9d685bc..e1461de25 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -77,7 +77,7 @@ build/ROMID/lib/naudio/n_csq.o (section); \ build/ROMID/lib/lib_39be0.o (section); \ build/ROMID/lib/lib_39c80.o (section); \ - build/ROMID/lib/naudio/n_seqpsetfilter11.o (section); \ + build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ build/ROMID/lib/naudio/n_synallocfx.o (section); \ diff --git a/src/lib/music.c b/src/lib/music.c index 8faf0014d..c471fbc56 100644 --- a/src/lib/music.c +++ b/src/lib/music.c @@ -231,7 +231,7 @@ glabel var70053fd8 /* 1167c: 02340019 */ multu $s1,$s4 /* 11680: 00007812 */ mflo $t7 /* 11684: 026fc021 */ addu $t8,$s3,$t7 -/* 11688: 0c00e7dc */ jal n_alSeqpSetFilter11 +/* 11688: 0c00e7dc */ jal n_alSeqpStop /* 1168c: 8f0400f8 */ lw $a0,0xf8($t8) /* 11690: 3c08800b */ lui $t0,%hi(var800aaa38) /* 11694: 2508aa38 */ addiu $t0,$t0,%lo(var800aaa38) @@ -284,7 +284,7 @@ glabel music00011700 /* 11734: 3c048009 */ lui $a0,%hi(var80094ed8+0xf8) /* 11738: 008f2021 */ addu $a0,$a0,$t7 /* 1173c: 8c844fd0 */ lw $a0,%lo(var80094ed8+0xf8)($a0) -/* 11740: 0c00e7dc */ jal n_alSeqpSetFilter11 +/* 11740: 0c00e7dc */ jal n_alSeqpStop /* 11744: afa2001c */ sw $v0,0x1c($sp) /* 11748: 8fa2001c */ lw $v0,0x1c($sp) /* 1174c: ac400000 */ sw $zero,0x0($v0) @@ -392,7 +392,7 @@ glabel music00011884 /* 118ac: 26314ed8 */ addiu $s1,$s1,%lo(var80094ed8) /* 118b0: 2610aa38 */ addiu $s0,$s0,%lo(var800aaa38) .L000118b4: -/* 118b4: 0c00e7dc */ jal n_alSeqpSetFilter11 +/* 118b4: 0c00e7dc */ jal n_alSeqpStop /* 118b8: 8e2400f8 */ lw $a0,0xf8($s1) /* 118bc: 26100010 */ addiu $s0,$s0,0x10 /* 118c0: 26310108 */ addiu $s1,$s1,0x108 @@ -476,7 +476,7 @@ glabel var70053fec /* 11998: 01c2082a */ slt $at,$t6,$v0 /* 1199c: 54200009 */ bnezl $at,.L000119c4 /* 119a0: 8e0f000c */ lw $t7,0xc($s0) -/* 119a4: 0c00e7dc */ jal n_alSeqpSetFilter11 +/* 119a4: 0c00e7dc */ jal n_alSeqpStop /* 119a8: 00000000 */ nop /* 119ac: ae000000 */ sw $zero,0x0($s0) /* 119b0: ae000004 */ sw $zero,0x4($s0) @@ -487,7 +487,7 @@ glabel var70053fec .L000119c4: /* 119c4: 544f0008 */ bnel $v0,$t7,.L000119e8 /* 119c8: 26310001 */ addiu $s1,$s1,0x1 -/* 119cc: 0c00e7dc */ jal n_alSeqpSetFilter11 +/* 119cc: 0c00e7dc */ jal n_alSeqpStop /* 119d0: 00000000 */ nop /* 119d4: ae000000 */ sw $zero,0x0($s0) /* 119d8: ae000004 */ sw $zero,0x4($s0) @@ -801,7 +801,7 @@ glabel music0001190c /* 11d54: 0142082a */ slt $at,$t2,$v0 /* 11d58: 54200009 */ bnezl $at,.NB00011d80 /* 11d5c: 8e0b000c */ lw $t3,0xc($s0) -/* 11d60: 0c00ecd0 */ jal n_alSeqpSetFilter11 +/* 11d60: 0c00ecd0 */ jal n_alSeqpStop /* 11d64: 00000000 */ sll $zero,$zero,0x0 /* 11d68: ae000000 */ sw $zero,0x0($s0) /* 11d6c: ae000004 */ sw $zero,0x4($s0) @@ -812,7 +812,7 @@ glabel music0001190c .NB00011d80: /* 11d80: 544b0008 */ bnel $v0,$t3,.NB00011da4 /* 11d84: 26310001 */ addiu $s1,$s1,0x1 -/* 11d88: 0c00ecd0 */ jal n_alSeqpSetFilter11 +/* 11d88: 0c00ecd0 */ jal n_alSeqpStop /* 11d8c: 00000000 */ sll $zero,$zero,0x0 /* 11d90: ae000000 */ sw $zero,0x0($s0) /* 11d94: ae000004 */ sw $zero,0x4($s0) diff --git a/src/lib/naudio/n_seqpsetfilter11.c b/src/lib/naudio/n_seqpsetfilter11.c deleted file mode 100644 index 027cd038c..000000000 --- a/src/lib/naudio/n_seqpsetfilter11.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "synthInternals.h" - -void n_alSeqpSetFilter11(N_ALSeqPlayer *seqp) -{ - N_ALEvent evt; - - evt.type = AL_FILTER_11; - - n_alEvtqPostEvent(&seqp->evtq, &evt, 0, 0); -} diff --git a/src/lib/naudio/n_seqpstop.c b/src/lib/naudio/n_seqpstop.c new file mode 100644 index 000000000..b3d8a0b9c --- /dev/null +++ b/src/lib/naudio/n_seqpstop.c @@ -0,0 +1,11 @@ +#include +#include "n_libaudio.h" + +void n_alSeqpStop(N_ALSeqPlayer *seqp) +{ + N_ALEvent evt; + + evt.type = AL_SEQP_STOPPING_EVT; + + n_alEvtqPostEvent(&seqp->evtq, &evt, 0, 0); +}