mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-17 08:30:06 +02:00
------------------------------------------------------------------------ r331 | rbd | 2020-10-13 12:40:12 -0500 (Tue, 13 Oct 2020) | 2 lines Also forgot to install NyquistWords.txt ------------------------------------------------------------------------ r330 | rbd | 2020-10-13 12:34:06 -0500 (Tue, 13 Oct 2020) | 2 lines Forgot to move nyquistman.pdf from docsrc/s2h to release ------------------------------------------------------------------------ r329 | rbd | 2020-10-13 11:32:33 -0500 (Tue, 13 Oct 2020) | 2 lines Updated some version numbers for 3.16. ------------------------------------------------------------------------ r328 | rbd | 2020-10-13 11:20:52 -0500 (Tue, 13 Oct 2020) | 2 lines Fixed NyquistIDE antialiasing for plot text, fix format of message. ------------------------------------------------------------------------ r327 | rbd | 2020-10-12 21:01:53 -0500 (Mon, 12 Oct 2020) | 2 lines Fixed a couple of format problems in manual. This version of Nyquist has been tested wtih macOS, Linux, 32&64-bit Windows. ------------------------------------------------------------------------ r326 | rbd | 2020-10-12 20:21:38 -0500 (Mon, 12 Oct 2020) | 1 line Modified WIN32 32-bit XLisp to use 64-bit FIXNUMs. This allows XLisp and Nyquist to handle big sounds even on 32-bit machines. Probably at some cost, but inner loops are mostly float and int32, and the Nyquist release is 64-bit anyway. Maybe we'll have to run some benchmarks on Audacity, which is still 32-bit on Windows. ------------------------------------------------------------------------ r325 | rbd | 2020-10-12 13:16:57 -0500 (Mon, 12 Oct 2020) | 1 line Win64 passes bigfiletest.lsp now. This version should work on all 64-bit systems now. These changes untested on Linux and macOS. ------------------------------------------------------------------------ r324 | rbd | 2020-10-11 21:31:53 -0500 (Sun, 11 Oct 2020) | 2 lines I couldn't free enough space on my linux box, so I adjusted the bigfiletest to write 8-bit ulaw. It's still >4GB and >4G samples. Works on Linux. ------------------------------------------------------------------------ r323 | rbd | 2020-10-11 19:41:25 -0500 (Sun, 11 Oct 2020) | 2 lines Missing file from last commit. ------------------------------------------------------------------------ r322 | rbd | 2020-10-11 19:36:08 -0500 (Sun, 11 Oct 2020) | 1 line Found another case where WIN64 needs int64_t instead of long for sample count. ------------------------------------------------------------------------ r321 | rbd | 2020-10-11 19:33:25 -0500 (Sun, 11 Oct 2020) | 3 lines Fixed s-save to handle optional and keyword parameters (which should never have been mixed in the first place). Documentation cleanup - should be final for this version. ------------------------------------------------------------------------ r320 | rbd | 2020-10-11 14:44:37 -0500 (Sun, 11 Oct 2020) | 2 lines Fixes to handle IRCAM sound format and tests for big file io working on macOS. ------------------------------------------------------------------------ r319 | rbd | 2020-10-10 21:31:58 -0500 (Sat, 10 Oct 2020) | 2 lines Changes for linux and to avoid compiler warnings on linux. ------------------------------------------------------------------------ r318 | rbd | 2020-10-10 20:50:23 -0500 (Sat, 10 Oct 2020) | 1 line This is the test used for Win64 version. ------------------------------------------------------------------------ r317 | rbd | 2020-10-10 20:34:34 -0500 (Sat, 10 Oct 2020) | 1 line This version works on Win64. Need to test changes on macOS and linux. ------------------------------------------------------------------------ r316 | rbd | 2020-10-10 19:59:15 -0500 (Sat, 10 Oct 2020) | 2 lines PWL changes to avoid compiler warning. ------------------------------------------------------------------------ r315 | rbd | 2020-10-10 19:34:04 -0500 (Sat, 10 Oct 2020) | 2 lines A few more changes for 64-bit sample counts on Win64 ------------------------------------------------------------------------ r314 | rbd | 2020-10-10 13:19:42 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed int64_t declaration in gate.alg ------------------------------------------------------------------------ r313 | rbd | 2020-10-10 12:07:40 -0500 (Sat, 10 Oct 2020) | 2 lines Fixes to gate for long sounds ------------------------------------------------------------------------ r312 | rbd | 2020-10-10 11:47:29 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed sound_save types for intgen ------------------------------------------------------------------------ r311 | rbd | 2020-10-10 11:09:01 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed a 64-bit sample count problem in siosc.alg ------------------------------------------------------------------------ r310 | rbd | 2020-10-10 11:03:12 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed sndmax to handle 64-bit sample counts. ------------------------------------------------------------------------ r309 | rbd | 2020-10-10 10:57:04 -0500 (Sat, 10 Oct 2020) | 2 lines Forgot to re-translate all tran/*.alg files with fix for int64 cast to int32. This version compiles on macOS and ready for test on Win64. ------------------------------------------------------------------------ r308 | rbd | 2020-10-10 10:16:05 -0500 (Sat, 10 Oct 2020) | 2 lines Everything seems to compile and run on macOS now. Moving changes to Windows for test. ------------------------------------------------------------------------ r307 | rbd | 2020-10-10 09:23:45 -0500 (Sat, 10 Oct 2020) | 1 line Added casts to avoid compiler warnings and to review changes to support 64-bit sample counts on Windows. Still not complete, and waiting to regenerate and compile tran directory code after updates to translation code that will insert more casts. ------------------------------------------------------------------------ r306 | rbd | 2020-10-09 21:55:15 -0500 (Fri, 09 Oct 2020) | 2 lines Rebuilt seqfnint.c from header files. ------------------------------------------------------------------------ r305 | rbd | 2020-10-09 21:53:33 -0500 (Fri, 09 Oct 2020) | 1 line Changed some FIXNUMS to LONG to avoid compiler warnings in seqfnint.c ------------------------------------------------------------------------ r304 | rbd | 2020-10-09 21:44:03 -0500 (Fri, 09 Oct 2020) | 2 lines I discovered forgotten regression-test.lsp and added test that requires 64-bit sample counts to pass. Fixed a few bugs revealed by running the type-checking regression tests. ------------------------------------------------------------------------ r303 | rbd | 2020-10-09 12:28:58 -0500 (Fri, 09 Oct 2020) | 2 lines Changes for 64-bit sample counts broke mult-channel s-save. Fixed in the commit for macOS. ------------------------------------------------------------------------ r302 | rbd | 2020-10-09 10:03:39 -0500 (Fri, 09 Oct 2020) | 2 lines Changed snd-play to return samples computed and used that to make a test for computing long sounds that would overflow 32-bit length counts. ------------------------------------------------------------------------ r301 | rbd | 2020-10-09 09:11:26 -0500 (Fri, 09 Oct 2020) | 2 lines corrected mistake in delaycv.alg and re-translated ------------------------------------------------------------------------ r300 | rbd | 2020-10-09 09:09:06 -0500 (Fri, 09 Oct 2020) | 2 lines Fix to delaycv.alg -- "s" changed to "input" to avoid matching "s" in "sample_type". ------------------------------------------------------------------------ r299 | rbd | 2020-10-09 09:03:33 -0500 (Fri, 09 Oct 2020) | 4 lines To avoid compiler warnings, XLisp interfaces to C int and long are now specified as LONG rather than FIXNUM, and the stubs that call the C functions cast FIXNUMs from XLisp into longs before calling C functions. ------------------------------------------------------------------------ r298 | rbd | 2020-10-08 22:20:26 -0500 (Thu, 08 Oct 2020) | 2 lines This commit has many more fixes to handle long (64-bit) sounds, including a lot of fixes for warnings by Visual Studio assigning int64_t to long (works on macOS, doesn't work on VS). This was compiled and tested on macOS, and even computed a 27.1-hour sound using OSC, LP, SUM and MULT (haven't tested I/O yet). ------------------------------------------------------------------------ r297 | rbd | 2020-10-07 13:04:02 -0500 (Wed, 07 Oct 2020) | 2 lines This is a major cleanup. It started with the goal of changing long to int64_t for sample counts so that on 64-bit windows, where long is only 32-bits, the sample counts would nevertheless be 64-bit allowing long sounds, which was a limitation for long recordings in Audacity. Since I was using compiler warnings to track possible loss-of-precision conversions from 64-bit sample counts, and there were *many* warnings, I started cleaning up *all* the warnings and ended up with a very large set of changes, including "modernizing" C declarations that date back to XLisp and CMU MIDI Toolkit code and were never changed. This version runs all the examples.sal code on macOS, but will surely have problems on Windows and Linux given the number of changes. ------------------------------------------------------------------------ r296 | rbd | 2020-10-06 13:34:20 -0500 (Tue, 06 Oct 2020) | 2 lines More changes from long to int64_t for sample counts. ------------------------------------------------------------------------ r295 | rbd | 2020-10-06 11:53:49 -0500 (Tue, 06 Oct 2020) | 2 lines More work on using 64-bit sample counts. Changed MAX_STOP from 32-bit to 64-bit limit. ------------------------------------------------------------------------ r294 | rbd | 2020-10-06 11:48:05 -0500 (Tue, 06 Oct 2020) | 2 lines Made some changes so that sample counts are int64_t (for windows) instead of long to support sample counts above 31 bits. ------------------------------------------------------------------------ r293 | rbd | 2020-10-04 21:30:55 -0500 (Sun, 04 Oct 2020) | 2 lines Fixed a few minor things for Linux and tested on Linux. ------------------------------------------------------------------------ r292 | rbd | 2020-10-04 21:00:28 -0500 (Sun, 04 Oct 2020) | 2 lines Update extensions: all are minor changes. ------------------------------------------------------------------------ r291 | rbd | 2020-09-24 13:59:31 -0500 (Thu, 24 Sep 2020) | 2 lines New implementation of seq and seqrep, added get-real-time, documented get-real-time, fixed examples.sal and examples.lsp which are now in lib rather than extensions (so they are now back in the basic installation), other cleanup. ------------------------------------------------------------------------ r290 | rbd | 2020-08-16 16:24:52 -0500 (Sun, 16 Aug 2020) | 2 lines Fixed bug in snd-gate, revised GATE and NOISE-GATE to handle multi-channel sound. RMS now handles multi-channel input. S-AVG added to take multichannel input (but not used, because RMS could not be written without making SND-SRATE convert multichannel sound to vector of floats. That seems to be going toward a fully vectorized model. Not going there for now. ------------------------------------------------------------------------ r289 | rbd | 2020-07-09 16:27:45 -0500 (Thu, 09 Jul 2020) | 2 lines Added GET-REAL-TIME function to XLISP. May not work yet on Windows. Various fixes for compiler warnings. I noticed FLAC doesn't work (I guess it never did) and I cannot figure out how this even links because flac_min seems to be undefined. Something to look at later.
483 lines
16 KiB
C
483 lines
16 KiB
C
/* sndseq.c -- return a signal until its logical stop, then
|
|
evaluate a closure to get a signal and convert to an add
|
|
of two signals */
|
|
|
|
/* CHANGE LOG
|
|
* --------------------------------------------------------------------
|
|
* 28Apr03 dm changes for portability and fix compiler warnings
|
|
*/
|
|
|
|
#include "stdio.h"
|
|
#ifndef mips
|
|
#include "stdlib.h"
|
|
#endif
|
|
#include "xlisp.h"
|
|
#include "sound.h"
|
|
#include "falloc.h"
|
|
#include "scale.h"
|
|
#include "add.h"
|
|
#include "extern.h"
|
|
#include "cext.h"
|
|
#include "assert.h"
|
|
#include "sndseq.h"
|
|
|
|
#define SNDSEQDBG 0
|
|
#define D if (SNDSEQDBG)
|
|
|
|
/* Note: this structure is identical to an add_susp structure up
|
|
to the field output_per_s2 so that we can convert this into
|
|
an add after eval'ing the closure. Since this struct is bigger
|
|
than an add, make sure not to clobber the "free" routine
|
|
(sndseq_free) or else we'll leak memory.
|
|
*/
|
|
typedef struct sndseq_susp_struct {
|
|
snd_susp_node susp;
|
|
boolean started;
|
|
int terminate_bits;
|
|
int64_t terminate_cnt;
|
|
int logical_stop_bits;
|
|
boolean logically_stopped;
|
|
sound_type s1;
|
|
int s1_cnt;
|
|
sample_block_type s1_bptr; /* block pointer */
|
|
sample_block_values_type s1_ptr;
|
|
sound_type s2;
|
|
int s2_cnt;
|
|
sample_block_type s2_bptr; /* block pointer */
|
|
sample_block_values_type s2_ptr;
|
|
|
|
/* support for interpolation of s2 */
|
|
sample_type s2_x1_sample;
|
|
double s2_phase;
|
|
double s2_phase_incr;
|
|
|
|
/* support for ramp between samples of s2 */
|
|
double output_per_s2;
|
|
|
|
/* sndseq-specific data starts here */
|
|
LVAL closure;
|
|
|
|
} sndseq_susp_node, *sndseq_susp_type;
|
|
|
|
|
|
void sndseq_fetch(snd_susp_type a_susp, snd_list_type snd_list);
|
|
void sndseq_zero_fill_fetch(sndseq_susp_type, snd_list_type);
|
|
void sndseq_free(snd_susp_type susp);
|
|
|
|
extern LVAL s_stdout;
|
|
|
|
void print_closure(LVAL val);
|
|
|
|
#ifdef SNDSEQDBG
|
|
|
|
LVAL print_stack[100];
|
|
int print_stack_index = 0;
|
|
|
|
#define ps_push(x) print_stack[print_stack_index++] = x
|
|
#define ps_pop(x) print_stack_index--
|
|
|
|
int in_cycle(LVAL x)
|
|
{
|
|
for (int i = 0; i < print_stack_index; i++) {
|
|
if (print_stack[i] == x) {
|
|
return TRUE;
|
|
}
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
/* print_closure -- show everything for debugging */
|
|
void print_lval(LVAL x)
|
|
{
|
|
LVAL next;
|
|
if (!x) {
|
|
printf("NIL");
|
|
return;
|
|
}
|
|
if (in_cycle(x)) {
|
|
printf("<CYCLE>");
|
|
return;
|
|
}
|
|
ps_push(x);
|
|
switch (ntype(x)) {
|
|
case CONS:
|
|
printf("(");
|
|
for (LVAL nptr = x; nptr != NIL; nptr = next) {
|
|
print_lval(car(nptr));
|
|
if ((next = cdr(nptr))) {
|
|
if (consp(next)) printf(" ");
|
|
else {
|
|
printf(" . ");
|
|
print_lval(next);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
printf(")");
|
|
break;
|
|
case SYMBOL:
|
|
printf("%s", getstring(getpname(x)));
|
|
break;
|
|
case FIXNUM:
|
|
printf(IFMT, getfixnum(x));
|
|
break;
|
|
case FLONUM:
|
|
printf("%g", getflonum(x));
|
|
break;
|
|
case EXTERN:
|
|
printf("<%s:%p>", getdesc(x)->type_name, getinst(x));
|
|
break;
|
|
case CLOSURE:
|
|
printf("<CLOSURE:%p>\n", x);
|
|
print_closure(x);
|
|
break;
|
|
default:
|
|
printf("<type %d>", ntype(x));
|
|
break;
|
|
}
|
|
ps_pop(x);
|
|
}
|
|
|
|
void print_closure(LVAL val)
|
|
{
|
|
printf("Name: "); print_lval(getname(val));
|
|
printf("\nType: "); print_lval(gettype(val));
|
|
printf("\nLambda: "); print_lval(getlambda(val));
|
|
printf("\nArgs: "); print_lval(getargs(val));
|
|
printf("\nOargs: "); print_lval(getoargs(val));
|
|
printf("\nRest: "); print_lval(getrest(val));
|
|
printf("\nKargs: "); print_lval(getkargs(val));
|
|
printf("\nAargs: "); print_lval(getaargs(val));
|
|
printf("\nBody: "); print_lval(getbody(val));
|
|
printf("\nEnv: "); print_lval(closure_getenv(val));
|
|
printf("\nFenv: "); print_lval(getfenv(val));
|
|
printf("\n");
|
|
}
|
|
|
|
#endif
|
|
|
|
void sndseq_mark(snd_susp_type a_susp)
|
|
{
|
|
D nyquist_printf("sndseq_mark: marking susp %p\n", a_susp);
|
|
sndseq_susp_type susp = (sndseq_susp_type) a_susp;
|
|
sound_xlmark(susp->s1);
|
|
if (susp->closure) {
|
|
D nyquist_printf("sndseq_mark: marking closure %p\n", susp->closure);
|
|
D print_closure(susp->closure);
|
|
mark(susp->closure);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* sndseq_fetch returns blocks of s1 until the logical stop time of s1 */
|
|
/**/
|
|
void sndseq_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
|
{
|
|
sndseq_susp_type susp = (sndseq_susp_type) a_susp;
|
|
int togo;
|
|
int n;
|
|
sample_block_type out;
|
|
register sample_block_values_type out_ptr;
|
|
|
|
/* nyquist_printf("sndseq_fetch called: s1_cnt %d\n", susp->s1_cnt); */
|
|
/*
|
|
* first compute how many samples to copy (or transfer)
|
|
*/
|
|
|
|
/* get next samples; in add, the call is:
|
|
* susp_check_term_log_block_samples(s1, s1_bptr, s1_ptr, s1_cnt, 1, 3);
|
|
*
|
|
* the plan here is tricky: if s1 has logically stopped, then evaluate
|
|
* the closure to get signal s2. Then convert sndseq into an add.
|
|
*/
|
|
if (susp->s1_cnt == 0) {
|
|
susp_get_block_samples(s1, s1_bptr, s1_ptr, s1_cnt);
|
|
if (susp->s1_ptr == zero_block->samples) {
|
|
susp->terminate_bits = 1; /* mark s1 as terminated */
|
|
}
|
|
/* nyquist_printf("sndseq_fetch: s1-lsc %d, current %d cnt %d\n",
|
|
susp->s1->logical_stop_cnt, susp->s1->current, susp->s1_cnt); */
|
|
}
|
|
|
|
if (susp->s1->logical_stop_cnt != UNKNOWN &&
|
|
susp->s1->logical_stop_cnt == susp->s1->current - susp->s1_cnt) {
|
|
time_type now = susp->susp.t0 + susp->susp.current / susp->susp.sr;
|
|
/* note: cons args are protected from GC: */
|
|
LVAL result;
|
|
int64_t delay; /* sample delay to s2 */
|
|
/* stats();gc();stats();*/
|
|
|
|
xlsave1(result);
|
|
|
|
D nyquist_printf("::::sndseq_fetch: about to eval closure at %g, "
|
|
"susp->susp.t0 %g, susp.current %d:\n",
|
|
now, susp->susp.t0, (int)susp->susp.current);
|
|
D nyquist_printf(" susp@%p(%s)\n", susp, susp->susp.name);
|
|
D (*susp->susp.print_tree)((snd_susp_type) susp, 4);
|
|
D nyquist_printf(" EVALUATE CLOSURE: ");
|
|
D print_lval(susp->closure);
|
|
D printf("\n");
|
|
result = xleval(cons(susp->closure, consa(cvflonum(now))));
|
|
|
|
susp->logical_stop_bits = 1; /* mark s1 as logically stopped */
|
|
if (exttypep(result, a_sound)) {
|
|
susp->s2 = sound_copy(getsound(result));
|
|
D nyquist_printf("sndseq: copied result from closure is %p\n",
|
|
susp->s2);
|
|
} else xlerror("closure did not return a (monophonic) sound", result);
|
|
D nyquist_printf("in sndseq: logically stopped; "
|
|
"%p returned from evform\n",
|
|
susp->s2);
|
|
susp->closure = NULL; /* allow garbage collection now */
|
|
result = NIL;
|
|
|
|
/**** Now convert to add ****/
|
|
susp->susp.mark = add_mark;
|
|
susp->susp.log_stop_cnt = UNKNOWN; /* will be recomputed by add */
|
|
susp->susp.print_tree = add_print_tree;
|
|
|
|
/* assume sample rates are the same */
|
|
if (susp->s1->sr != susp->s2->sr)
|
|
xlfail("in sndseq: sample rates must match");
|
|
|
|
/* take care of scale factor, if any */
|
|
if (susp->s2->scale != 1.0) {
|
|
// stdputstr("normalizing next sound in a seq\n");
|
|
susp->s2 = snd_make_normalize(susp->s2);
|
|
}
|
|
|
|
/* figure out which add fetch routine to use */
|
|
delay = ROUNDBIG((susp->s2->t0 - now) * susp->s1->sr);
|
|
if (susp->terminate_bits) { /* s1 is done, just get s2 now */
|
|
sound_unref(susp->s1);
|
|
susp->s1 = NULL;
|
|
if (delay > 0) { /* need to fill zeros */
|
|
susp->susp.fetch = add_zero_fill_nn_fetch;
|
|
susp->susp.name = "sndseq:add_zero_fill_nn_fetch";
|
|
} else {
|
|
susp->susp.fetch = add_s2_nn_fetch;
|
|
susp->susp.name = "sndseq:add_s2_nn_fetch";
|
|
}
|
|
} else if (delay > 0) { /* fill hole between s1 and s2 */
|
|
D stdputstr("using add_s1_nn_fetch\n");
|
|
susp->susp.fetch = add_s1_nn_fetch;
|
|
susp->susp.name = "sndseq:add_s1_nn_fetch";
|
|
} else {
|
|
susp->susp.fetch = add_s1_s2_nn_fetch;
|
|
susp->susp.name = "sndseq:add_s1_s2_nn_fetch";
|
|
}
|
|
|
|
susp->s2_phase_incr = susp->s2->sr / susp->susp.sr;
|
|
susp->output_per_s2 = susp->susp.sr / susp->s2->sr;
|
|
|
|
D stdputstr("in sndseq: calling add's fetch\n");
|
|
(*(susp->susp.fetch))(a_susp, snd_list);
|
|
D stdputstr("in sndseq: returned from add's fetch\n");
|
|
/* gc();*/
|
|
xlpop();
|
|
return;
|
|
}
|
|
|
|
/* don't run past the s1 input sample block: */
|
|
togo = susp->s1_cnt;
|
|
/* nyquist_printf("sndseq_fetch: togo initially %d then ", togo); */
|
|
|
|
/* don't run past terminate time */
|
|
if (susp->terminate_cnt != UNKNOWN &&
|
|
susp->terminate_cnt <= susp->susp.current + togo) {
|
|
togo = (int) (susp->terminate_cnt - susp->susp.current);
|
|
}
|
|
|
|
/* don't run past logical stop time */
|
|
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN) {
|
|
int64_t to_stop = susp->susp.log_stop_cnt - susp->susp.current;
|
|
togo = (int) MIN(togo, to_stop);
|
|
}
|
|
assert(togo >= 0);
|
|
|
|
/* nyquist_printf("%d\n", togo);*/
|
|
/*
|
|
* two cases: copy a partial block or manipulate pointers for copyless
|
|
* transfer of whole block (may not be full block):
|
|
*
|
|
* copy partial block when:
|
|
* o samples begin in middle of block
|
|
* o stopping time is before end of block (when other signal splits
|
|
* the block for this signal). This happens if the logical
|
|
* stop time was externally dictated and falls mid-block.
|
|
* transfer (copyless) block when:
|
|
* o the block is of maximum size
|
|
* o the block is small due to logical stop time or termination time
|
|
*/
|
|
if (susp->s1_ptr == susp->s1_bptr->samples && susp->s1_cnt == togo) {
|
|
/*
|
|
* we want to copy this whole block (starting at the beginning
|
|
* and going to the rest of the block) -- just do pointers.
|
|
*/
|
|
|
|
/* just fetch and pass blocks on */
|
|
/* nyquist_printf("sndseq (s1_nn) %x starting uncopy, togo %d\n", susp, togo); */
|
|
snd_list->block = susp->s1_bptr;
|
|
/* the zero_block indicates termination, don't copy it! Use
|
|
* internal_zero_block instead. It is also filled with zeros,
|
|
* but does not indicate termination. We must check for zero_block
|
|
* because the signal may have a logical stop time specified that
|
|
* extends beyond its termination time.
|
|
*/
|
|
if (snd_list->block == zero_block)
|
|
snd_list->block = internal_zero_block;
|
|
(snd_list->block->refcnt)++;
|
|
/* nyquist_printf("sndseq (s1_nn) %x shared block %x\n", susp, susp->s1_bptr);*/
|
|
|
|
susp_took(s1_cnt, togo);
|
|
snd_list->block_len = togo;
|
|
} else {
|
|
/*
|
|
* we want to copy a partial block
|
|
*/
|
|
|
|
/* snd_list is the one with a null block */
|
|
/* put a fresh, clean block in the snd_list (get new snd_list later) */
|
|
falloc_sample_block(out, "sndseq_fetch");
|
|
snd_list->block = out;
|
|
out_ptr = out->samples;
|
|
/* nyquist_printf("sndseq (s1_nn) %x new block %x\n", susp, out); */
|
|
|
|
n = togo;
|
|
/* nyquist_printf("sndseq (s1_nn) %x starting copy loop, togo %d\n", susp, togo); */
|
|
while (n--) { /* the inner sample computation loop */
|
|
/* scale? */
|
|
*out_ptr++ = *(susp->s1_ptr++);
|
|
} /* inner loop */
|
|
|
|
susp_took(s1_cnt, togo);
|
|
snd_list->block_len = togo;
|
|
}
|
|
|
|
/* add a new snd_list for the susp */
|
|
susp->susp.current += togo;
|
|
|
|
} /* sndseq_fetch */
|
|
|
|
|
|
void sndseq_free(snd_susp_type a_susp)
|
|
{
|
|
sndseq_susp_type susp = (sndseq_susp_type) a_susp;
|
|
sound_unref(susp->s2);
|
|
ffree_generic(susp, sizeof(sndseq_susp_node), "sndseq_free");
|
|
}
|
|
|
|
|
|
void sndseq_print_tree(snd_susp_type a_susp, int n)
|
|
{
|
|
sndseq_susp_type susp = (sndseq_susp_type) a_susp;
|
|
indent(n);
|
|
stdputstr("s1:");
|
|
sound_print_tree_1(susp->s1, n);
|
|
D { indent(n);
|
|
nyquist_printf("closure %p stored at %p\n",
|
|
susp->closure, &susp->closure);
|
|
}
|
|
D if (susp->closure && closurep(susp->closure)) {
|
|
LVAL body = getbody(susp->closure);
|
|
LVAL lambda = getlambda(susp->closure);
|
|
LVAL args = getargs(susp->closure);
|
|
nyquist_printf(" closure args@%p: ", args); stdprint(args);
|
|
nyquist_printf(" closure lambda@%p: ", lambda); stdprint(lambda);
|
|
nyquist_printf(" closure body@%p: ", body); stdprint(body);
|
|
}
|
|
indent(n);
|
|
stdputstr("closure:");
|
|
stdprint(susp->closure);
|
|
indent(n);
|
|
stdputstr("s2:");
|
|
sound_print_tree_1(susp->s2, n);
|
|
}
|
|
|
|
|
|
|
|
|
|
sound_type snd_make_sndseq(sound_type s1, LVAL closure)
|
|
{
|
|
sndseq_susp_type susp;
|
|
/* t0 specified as input parameter */
|
|
sample_type scale_factor = 1.0F;
|
|
sound_type result;
|
|
|
|
xlprot1(closure);
|
|
falloc_generic(susp, sndseq_susp_node, "snd_make_sndseq");
|
|
|
|
if (s1->scale != 1.0) {
|
|
/* stdputstr("normalizing first sound in a seq\n"); */
|
|
s1 = snd_make_normalize(s1);
|
|
}
|
|
|
|
susp->susp.fetch = sndseq_fetch;
|
|
|
|
susp->terminate_cnt = UNKNOWN;
|
|
susp->terminate_bits = 0; /* bits for s1 and s2 termination */
|
|
susp->logical_stop_bits = 0; /* bits for s1 and s2 logical stop */
|
|
|
|
/* initialize susp state */
|
|
susp->susp.free = sndseq_free;
|
|
susp->susp.sr = s1->sr;
|
|
susp->susp.t0 = s1->t0;
|
|
susp->susp.mark = sndseq_mark;
|
|
susp->susp.print_tree = sndseq_print_tree;
|
|
susp->susp.name = "sndseq";
|
|
susp->logically_stopped = false;
|
|
susp->susp.log_stop_cnt = s1->logical_stop_cnt;
|
|
if (!(susp->susp.log_stop_cnt >= 0 || susp->susp.log_stop_cnt == UNKNOWN)) {
|
|
xlerror("Behaviors in SEQ must appear in chronological order", closure);
|
|
}
|
|
susp->started = false;
|
|
susp->susp.current = 0;
|
|
susp->s1 = s1;
|
|
susp->s1_cnt = 0;
|
|
susp->s2 = NULL;
|
|
susp->s2_cnt = 0;
|
|
susp->s2_phase = 0.0;
|
|
susp->closure = closure;
|
|
result = sound_create((snd_susp_type)susp, susp->susp.t0,
|
|
susp->susp.sr, scale_factor);
|
|
D nyquist_printf("Created sndseq: ");
|
|
D sound_print_tree_1(result, 2);
|
|
xlpopn(1);
|
|
return result;
|
|
}
|
|
|
|
|
|
/* This was going to support a new construct, SEQV, but it was just a bad idea.
|
|
void change_seqclosure(LVAL snd, LVAL vars, LVAL closure)
|
|
{
|
|
if (listp(vars)) { // modify the closure
|
|
LVAL newenv;
|
|
LVAL binding;
|
|
LVAL envsublist; // don't save, always points into env
|
|
xlstkcheck(2);
|
|
xlsave(newenv); // initially just ((var . val) ...)
|
|
xlsave(binding);
|
|
while (vars) { // for each var in environment
|
|
LVAL var = car(vars);
|
|
// get value of sym in env:
|
|
binding = cons(var, xlgetvalue(var));
|
|
newenv = cons(binding, newenv);
|
|
vars = cdr(vars);
|
|
}
|
|
|
|
newenv = consa(newenv);
|
|
if (null(snd)) { // first sound gets to see all local variables
|
|
cdr(newenv) = closure_getenv(closure);
|
|
}
|
|
setenv(closure, newenv);
|
|
xlpopn(2);
|
|
}
|
|
}
|
|
*/
|
|
|
|
sound_type snd_sndseq(sound_type snd, LVAL closure)
|
|
{
|
|
return snd_make_sndseq(sound_copy(snd), closure);
|
|
}
|