n_synallocvoice

linker_scripts/us/symbol_addrs_code.txt

@@ -1382,8 +1382,8 @@ func_80048590 = 0x80048590; // type:func
 func_80048684 = 0x80048684; // type:func
 func_80048904 = 0x80048904; // type:func
 func_80048B90 = 0x80048B90; // type:func
-func_80048FA0 = 0x80048FA0; // type:func
-func_800490CC = 0x800490CC; // type:func
+n_alSynAllocVoice = 0x80048FA0; // type:func
+_allocatePVoice = 0x800490CC; // type:func
 n_alSynNew = 0x800491C0; // type:func
 n_alAudioFrame = 0x80049490; // type:func
 __n_allocParam = 0x800495F8; // type:func

src/49BA0.c

@@ -1,5 +0,0 @@
-#include "global.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/49BA0/func_80048FA0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/49BA0/func_800490CC.s")

src/libnaudio/n_synallocvoice.c

@@ -0,0 +1,148 @@
+/*====================================================================
+ *
+ * Copyright 1993, Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics,
+ * Inc.; the contents of this file may not be disclosed to third
+ * parties, copied or duplicated in any form, in whole or in part,
+ * without the prior written permission of Silicon Graphics, Inc.
+ *
+ * RESTRICTED RIGHTS LEGEND:
+ * Use, duplication or disclosure by the Government is subject to
+ * restrictions as set forth in subdivision (c)(1)(ii) of the Rights
+ * in Technical Data and Computer Software clause at DFARS
+ * 252.227-7013, and/or in similar or successor clauses in the FAR,
+ * DOD or NASA FAR Supplement. Unpublished - rights reserved under the
+ * Copyright Laws of the United States.
+ *====================================================================*/
+#include <os_internal.h>
+#include <ultraerror.h>
+#include "n_synthInternals.h"
+
+
+static s32 _allocatePVoice(N_PVoice **pvoice, s16 priority);
+
+s32 n_alSynAllocVoice(N_ALVoice *voice, ALVoiceConfig *vc)
+{
+    N_PVoice  *pvoice = 0;
+    ALFilter *f;
+    ALParam *update;
+    s32 stolen;
+    
+#ifdef _DEBUG
+    /* need two updates if voice is stolen */
+    if (n_syn->paramList == 0) {
+        __osError(ERR_ALSYN_NO_UPDATE, 0);
+        return 0;
+    } else if (n_syn->paramList->next == 0) {
+        __osError(ERR_ALSYN_NO_UPDATE, 0);
+        return 0;
+    }
+#endif    
+
+    voice->priority     = vc->priority;
+    voice->unityPitch   = vc->unityPitch;
+    voice->table        = 0;
+    voice->fxBus        = vc->fxBus;
+    voice->state        = AL_STOPPED;        
+    voice->pvoice       = 0;
+
+    stolen = _allocatePVoice(&pvoice, vc->priority);
+        
+    if (pvoice) {    /* if we were able to allocate a voice */
+        if (stolen) {
+                
+            pvoice->offset = 552;
+            pvoice->vvoice->pvoice = 0; /* zero stolen voice */
+
+#if 1
+	    pvoice->vvoice = voice;
+	    voice->pvoice = pvoice;
+#endif
+                
+            /*
+             * ramp down stolen voice
+             */
+            update = __n_allocParam();
+#ifdef SAMPLE_ROUND
+            update->delta      = SAMPLE184( n_syn->paramSamples );
+#else
+            update->delta      = n_syn->paramSamples;
+#endif
+            update->type       = AL_FILTER_SET_VOLUME;
+            update->data.i     = 0;
+            update->moredata.i = 368; /* pvoice->offset - 184 */
+
+	    n_alEnvmixerParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update);
+
+            /*
+             * stop stolen voice
+             */
+            update = __n_allocParam();
+            if (update) {
+#ifdef SAMPLE_ROUND
+	      update->delta  = SAMPLE184( n_syn->paramSamples + pvoice->offset);
+#else
+	      update->delta  = n_syn->paramSamples + pvoice->offset;
+#endif
+	      update->type   = AL_FILTER_STOP_VOICE;
+	      update->next   = 0;
+	      n_alEnvmixerParam(voice->pvoice, AL_FILTER_ADD_UPDATE, update);
+
+            } else {
+#ifdef _DEBUG                
+                __osError(ERR_ALSYN_NO_UPDATE, 0);
+#endif
+            }
+
+        } else {
+            pvoice->offset = 0;
+#if 1
+	    pvoice->vvoice = voice;
+	    voice->pvoice  = pvoice;
+#endif
+
+        }
+#if 0            
+        pvoice->vvoice = voice;     /* assign new voice  */
+        voice->pvoice  = pvoice;
+#endif
+    }
+    
+    return (pvoice != 0);    
+}
+
+s32 _allocatePVoice(N_PVoice **pvoice, s16 priority)
+{
+    ALLink      *dl;
+    N_PVoice      *pv;
+    s32         stolen = 0;
+    
+    if ((dl = n_syn->pLameList.next) != 0) { /* check the lame list first */
+        *pvoice = (N_PVoice *)dl;
+        alUnlink(dl);
+        alLink(dl, &n_syn->pAllocList);        
+    } else if ((dl = n_syn->pFreeList.next) != 0) { /* from the free list */
+        *pvoice = (N_PVoice *) dl;
+        alUnlink(dl);
+        alLink(dl, &n_syn->pAllocList);        
+    } else { /* steal one */
+        for (dl = n_syn->pAllocList.next; dl != 0; dl = dl->next) {
+            pv = (N_PVoice *)dl;
+
+            /*
+             * if it is lower priority and not already stolen, keep it
+             * as a candidate for stealing
+             */
+            if ((pv->vvoice->priority <= priority) && (pv->offset == 0)) {
+                *pvoice = pv;
+                priority = pv->vvoice->priority;
+                stolen = 1;
+            }
+        }
+    }
+    
+    return stolen;
+}
+

yamls/us/rom.yaml

@@ -95,7 +95,7 @@
     - [0x490A0, c]  # audio functions to 0x50C00
     - [0x49190, hasm, ../../src/unk_49190]
     - [0x49790, c]
-    - [0x49BA0, c]
+    - [0x49BA0, c, libnaudio/n_synallocvoice]
     - [0x49DC0, c, libnaudio/n_synthesizer]
     - [0x4A360, c, libnaudio/n_synsetpan]
     - [0x4A3E0, c]