mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-25 15:53:52 +02:00
Update nyquist to SVN r331 (r3.16+)
------------------------------------------------------------------------ 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.
This commit is contained in:
Leland Lucius
@@ -17,13 +17,13 @@
|
||||
(setf *debug* t)
|
||||
|
||||
;;**********
|
||||
;; combinations - generate all combinations
|
||||
;; combinations - generate all combinations
|
||||
;; Inputs:
|
||||
;; n - number of combinations to generate
|
||||
;; n - number of combinations to generate
|
||||
;; Result:
|
||||
;; list of the form
|
||||
;; ( (a1 b1) (a2 b2) (a3 b3) ... (an bn) )
|
||||
;;
|
||||
;; list of the form
|
||||
;; ( (a1 b1) (a2 b2) (a3 b3) ... (an bn) )
|
||||
;;
|
||||
;;**********
|
||||
|
||||
(defun combinations (n)
|
||||
@@ -194,14 +194,14 @@
|
||||
|
||||
|
||||
;; ****************
|
||||
;; header-list
|
||||
;; header-list
|
||||
;;
|
||||
;; Result:
|
||||
;; '( "s1" "s2" ... "sn" )
|
||||
;; where s1, s2, etc. are the strings for the header part of the
|
||||
;; resulting .c file
|
||||
;; '( "s1" "s2" ... "sn" )
|
||||
;; where s1, s2, etc. are the strings for the header part of the
|
||||
;; resulting .c file
|
||||
;; Notes:
|
||||
;; Kludgy. Fix this up for easier maintenance
|
||||
;; Kludgy. Fix this up for easier maintenance
|
||||
;; ****************
|
||||
|
||||
(if *ANSI*
|
||||
@@ -231,9 +231,9 @@
|
||||
;; make this work correctly if it is being assigned to a long, float, or
|
||||
;; double, and if a long, float, or double is being compared
|
||||
; '("\n#ifndef UNKNOWN\n"
|
||||
; "#define UNKNOWN -1\n"
|
||||
; "#define isunknown(x) ( (x) < 0)\n"
|
||||
; "#endif /* UNKNOWN */\n"))
|
||||
; "#define UNKNOWN -1\n"
|
||||
; "#define isunknown(x) ( (x) < 0)\n"
|
||||
; "#endif /* UNKNOWN */\n"))
|
||||
;-------------------------
|
||||
|
||||
|
||||
@@ -241,9 +241,9 @@
|
||||
;; code-gen -- do the output
|
||||
;;
|
||||
;; Inputs:
|
||||
;; alg -
|
||||
;; stream -
|
||||
;; hstream -
|
||||
;; alg -
|
||||
;; stream -
|
||||
;; hstream -
|
||||
;;**********
|
||||
|
||||
(defun code-gen (alg stream hstream)
|
||||
@@ -304,10 +304,10 @@
|
||||
;; commute-check --
|
||||
;;
|
||||
;; Purpose:
|
||||
;; see if interpolation spec is redundant due to commutativity
|
||||
;; see if interpolation spec is redundant due to commutativity
|
||||
;; Algorithm:
|
||||
;; for each list of "commutable" sounds, make sure spec asks for
|
||||
;; cannonical ordering: NONE > SCALE > INTERP > RAMP
|
||||
;; for each list of "commutable" sounds, make sure spec asks for
|
||||
;; cannonical ordering: NONE > SCALE > INTERP > RAMP
|
||||
;;**********
|
||||
(defun commute-check (alg spec)
|
||||
(let ((sounds (get-slot alg 'sound-args))
|
||||
@@ -337,10 +337,10 @@
|
||||
;; concatenate -- string concatenation
|
||||
;;
|
||||
;; Inputs:
|
||||
;; "s1" - string
|
||||
;; "s2" - string
|
||||
;; "s1" - string
|
||||
;; "s2" - string
|
||||
;; Result:
|
||||
;; "s1s2"
|
||||
;; "s1s2"
|
||||
;;**********
|
||||
|
||||
(defun concatenate (type s1 s2)
|
||||
@@ -360,11 +360,11 @@
|
||||
;; index -- find location of list element
|
||||
;;
|
||||
;; Inputs:
|
||||
;; atom - atom to be found in list
|
||||
;; lis - list searched for
|
||||
;; atom - atom to be found in list
|
||||
;; lis - list searched for
|
||||
;; Result:
|
||||
;; integer - index of atom in lis
|
||||
;; NIL - atom not member of lis
|
||||
;; integer - index of atom in lis
|
||||
;; NIL - atom not member of lis
|
||||
;;**********
|
||||
|
||||
(defun index (atom lis)
|
||||
@@ -379,10 +379,10 @@
|
||||
;; insert -- insert an atom at the front of each element of a list
|
||||
;;
|
||||
;; Inputs:
|
||||
;; atom -
|
||||
;; list-of-lists - lists of the form ( (L1) (L2) ... (Ln))
|
||||
;; atom -
|
||||
;; list-of-lists - lists of the form ( (L1) (L2) ... (Ln))
|
||||
;; Result:
|
||||
;; ( (atom L1) (atom L2) ... (atom Ln) )
|
||||
;; ( (atom L1) (atom L2) ... (atom Ln) )
|
||||
;;**********
|
||||
(defun insert (atom list-of-lists)
|
||||
(mapcar '(lambda (lis) (cons atom lis)) list-of-lists))
|
||||
@@ -407,7 +407,7 @@
|
||||
;; make-interpolation-list -- figure out the possible interpolation forms
|
||||
;;
|
||||
;; Inputs:
|
||||
;; alg - algorithm description
|
||||
;; alg - algorithm description
|
||||
;; Output:
|
||||
;; List of interpolation styles, e.g.
|
||||
;; ((NONE NONE) (NONE INTERP) (NONE RAMP)), where the styles
|
||||
@@ -433,7 +433,7 @@
|
||||
(setf sound-to-name (cons (cons (car sound-args)
|
||||
(car sound-names))
|
||||
sound-to-name))
|
||||
; (display "in make-interpolation-list" sound-to-name)
|
||||
; (display "in make-interpolation-list" sound-to-name)
|
||||
)))
|
||||
; (display "make-interpolation-list: " (reverse sound-args))
|
||||
(put-slot alg (reverse sound-args) 'sound-args)
|
||||
@@ -503,18 +503,18 @@
|
||||
;; make-schema-from-slots -- take attr/value pairs and make property list
|
||||
;;
|
||||
;; Inputs:
|
||||
;; slots - a list of the form
|
||||
;; (name
|
||||
;; (attribute1 value1) (attribute2 value2)
|
||||
;; ... (attributen valuen) )
|
||||
;; slots - a list of the form
|
||||
;; (name
|
||||
;; (attribute1 value1) (attribute2 value2)
|
||||
;; ... (attributen valuen) )
|
||||
;; Result:
|
||||
;; The atom 'name' with the attached property list
|
||||
;; The atom 'name' with the attached property list
|
||||
;; Effect:
|
||||
;; Adds properties to the atom 'name' based on the attribute-value
|
||||
;; pairs.
|
||||
;; Adds properties to the atom 'name' based on the attribute-value
|
||||
;; pairs.
|
||||
;; Notes:
|
||||
;; The property-list representation is chosen for time efficiency of
|
||||
;; access
|
||||
;; The property-list representation is chosen for time efficiency of
|
||||
;; access
|
||||
;;**********
|
||||
|
||||
(defun make-schema-from-slots (slots)
|
||||
@@ -535,8 +535,8 @@
|
||||
;; position -- find a pattern in a string
|
||||
;;
|
||||
;; Inputs:
|
||||
;; s -
|
||||
;; p -
|
||||
;; s -
|
||||
;; p -
|
||||
;;**********
|
||||
|
||||
(defun position (s p)
|
||||
@@ -552,10 +552,10 @@
|
||||
;; print a list of strings to a stream
|
||||
;;
|
||||
;; Inputs:
|
||||
;; strings - a list of strings
|
||||
;; stream - stream on which to write the strings
|
||||
;; strings - a list of strings
|
||||
;; stream - stream on which to write the strings
|
||||
;; Effect:
|
||||
;;
|
||||
;;
|
||||
;;**********
|
||||
|
||||
(defun print-strings (strings stream)
|
||||
@@ -565,11 +565,11 @@
|
||||
|
||||
;;**********
|
||||
;; put-slot:
|
||||
;;
|
||||
;;
|
||||
;; Inputs:
|
||||
;; schema - name of the schema
|
||||
;; value - value of the attribute to be added or modified
|
||||
;; property - name of the attribute to be modified
|
||||
;; schema - name of the schema
|
||||
;; value - value of the attribute to be added or modified
|
||||
;; property - name of the attribute to be modified
|
||||
;;
|
||||
;;**********
|
||||
|
||||
@@ -580,18 +580,18 @@
|
||||
|
||||
;;**********
|
||||
;; scale-check -- make sure scale method is not used on linear input or
|
||||
;; on input where scaling is factored into other computation;
|
||||
;; Also, don't use NONE scale method if sound appears on always-scale
|
||||
;; list (these sounds have low likelihood of ever using 'NONE method -
|
||||
;; see fmosc for an example). Note that if you say always-scale (removing
|
||||
;; on input where scaling is factored into other computation;
|
||||
;; Also, don't use NONE scale method if sound appears on always-scale
|
||||
;; list (these sounds have low likelihood of ever using 'NONE method -
|
||||
;; see fmosc for an example). Note that if you say always-scale (removing
|
||||
;; NONE) and linear or internal-scaling (removing SCALE),
|
||||
;; then you'll be in big trouble.
|
||||
;;
|
||||
;; Inputs:
|
||||
;; alg - algorithm description
|
||||
;; spec -
|
||||
;; alg - algorithm description
|
||||
;; spec -
|
||||
;; Notes:
|
||||
;;
|
||||
;;
|
||||
;;**********
|
||||
|
||||
(defun scale-check (alg spec)
|
||||
@@ -610,7 +610,7 @@
|
||||
(cond ((member snd always-scale)
|
||||
(setf result nil)
|
||||
(return))))))))
|
||||
(cond ((member 'SCALE spec) ; quick test
|
||||
(cond ((member 'SCALE spec) ; quick test
|
||||
(dotimes (n (length spec)) ; look at each method in spec
|
||||
(cond ((eq 'SCALE (nth n spec))
|
||||
(setf snd (nth n sounds))
|
||||
@@ -707,10 +707,10 @@
|
||||
;; translate -- main procedure
|
||||
;;
|
||||
;; Inputs:
|
||||
;; name - string which is name of file to translate
|
||||
;; name - string which is name of file to translate
|
||||
;; Effect:
|
||||
;; Reads the algorithm specification as "name.alg"
|
||||
;; Generates output files "name.c" and "name.h"
|
||||
;; Reads the algorithm specification as "name.alg"
|
||||
;; Generates output files "name.c" and "name.h"
|
||||
;;**********
|
||||
(defun translate (name)
|
||||
(prog* ((infile (concatenate 'string name ".alg"))
|
||||
@@ -766,12 +766,12 @@
|
||||
;; type-check-and-transform -- fix up slots in an algorithm schema
|
||||
;;
|
||||
;; Inputs:
|
||||
;; alg - the name of the algorithm; values are its property list
|
||||
;; alg - the name of the algorithm; values are its property list
|
||||
;; Notes:
|
||||
;; Report an error if required slot values are absent
|
||||
;; Any slot which should be a single value and is a list is
|
||||
;; coerced to be the car of the list
|
||||
;; Put argument string names on argument symbols for conversion.
|
||||
;; Report an error if required slot values are absent
|
||||
;; Any slot which should be a single value and is a list is
|
||||
;; coerced to be the car of the list
|
||||
;; Put argument string names on argument symbols for conversion.
|
||||
;;**********
|
||||
|
||||
(defun type-check-and-transform (alg)
|
||||
@@ -786,7 +786,7 @@
|
||||
|
||||
; fix single-value slots to not be stored as lists:
|
||||
; If the value is a list, the value is coerced to
|
||||
; be the car of the list
|
||||
; be the car of the list
|
||||
|
||||
(dolist
|
||||
(slot
|
||||
@@ -842,14 +842,14 @@
|
||||
;; write-header -- write a header file for the suspension create routine
|
||||
;;
|
||||
;; Inputs:
|
||||
;; alg - algorithm name
|
||||
;; stream - output stream for .h file
|
||||
;; alg - algorithm name
|
||||
;; stream - output stream for .h file
|
||||
;; Effect:
|
||||
;; Writes to the stream
|
||||
;; sound_type snd_make_NAME();
|
||||
;; Writes to the stream
|
||||
;; sound_type snd_make_NAME();
|
||||
;; Notes:
|
||||
;; Uses NAME property of algorithm to emit the procedure header to
|
||||
;; the .h file
|
||||
;; Uses NAME property of algorithm to emit the procedure header to
|
||||
;; the .h file
|
||||
;;**********
|
||||
|
||||
(setf c-to-xlisp-type '(
|
||||
@@ -861,8 +861,8 @@
|
||||
("sound_type" . "SOUND")
|
||||
("char *" . "STRING")
|
||||
("LVAL" . "ANY")
|
||||
("int" . "FIXNUM")
|
||||
("long" . "FIXNUM")
|
||||
("int" . "LONG")
|
||||
("long" . "LONG")
|
||||
("boolean" . "BOOLEAN")
|
||||
))
|
||||
|
||||
@@ -885,10 +885,10 @@
|
||||
; write the type specification for intgen
|
||||
(format stream " /* LISP: (snd-~A" lisp-name)
|
||||
(dolist (arg arguments)
|
||||
(let ((xltype (assoc (car arg) c-to-xlisp-type :test #'equal)))
|
||||
(cond ((null xltype)
|
||||
(error "couldn't translate c-type" (car arg))))
|
||||
(format stream " ~A" (cdr xltype))))
|
||||
(let ((xltype (assoc (car arg) c-to-xlisp-type :test #'equal)))
|
||||
(cond ((null xltype)
|
||||
(error "couldn't translate c-type" (car arg))))
|
||||
(format stream " ~A" (cdr xltype))))
|
||||
(format stream ") */~%")))
|
||||
|
||||
|
||||
@@ -896,12 +896,12 @@
|
||||
;; write-typedef -- compile the suspension type definition
|
||||
;;
|
||||
;; Inputs:
|
||||
;; alg - the algorithm specification
|
||||
;; stream - stream to which to write it
|
||||
;; alg - the algorithm specification
|
||||
;; stream - stream to which to write it
|
||||
;; Effect:
|
||||
;; typedef struct NAME_susp_struct {
|
||||
;; ...
|
||||
;; } NAME_susp_node, *NAME_susp_type;
|
||||
;; typedef struct NAME_susp_struct {
|
||||
;; ...
|
||||
;; } NAME_susp_node, *NAME_susp_type;
|
||||
;;
|
||||
;; A side-effect of write-typedef is the initialization
|
||||
;; of slot xlisp-pointers in alg. This is used later by
|
||||
@@ -935,7 +935,7 @@
|
||||
(cond ((any-ramp-or-interp-in interpolation-list)
|
||||
;---------------------
|
||||
; INTERP/RAMP:
|
||||
; boolean started;
|
||||
; boolean started;
|
||||
;---------------------
|
||||
(format stream " boolean started;~%")))
|
||||
|
||||
@@ -943,9 +943,9 @@
|
||||
terminate alg (terminate-check-needed terminate alg))
|
||||
(cond ((terminate-check-needed terminate alg)
|
||||
;----------------
|
||||
; long terminate_cnt;
|
||||
; int64_t terminate_cnt;
|
||||
;----------------
|
||||
(format stream " long terminate_cnt;~%")))
|
||||
(format stream " int64_t terminate_cnt;~%")))
|
||||
|
||||
(cond ((logical-stop-check-needed logical-stop)
|
||||
;----------------
|
||||
@@ -961,14 +961,14 @@
|
||||
; each possible interpolation
|
||||
(dotimes (n (length (get alg 'sound-args)))
|
||||
(let ((interpolation (union-of-nth interpolation-list n)))
|
||||
(setf name (nth n sound-names)) ; get name of signal
|
||||
(setf name (nth n sound-names)) ; get name of signal
|
||||
;------------------------
|
||||
; sound_type NAMEi;
|
||||
; long NAME_cnt;
|
||||
; sample_block_values_type NAME_ptr;
|
||||
; sound_type NAMEi;
|
||||
; int NAME_cnt;
|
||||
; sample_block_values_type NAME_ptr;
|
||||
;------------------------
|
||||
(format stream " sound_type ~A;~%" name)
|
||||
(format stream " long ~A_cnt;~%" name)
|
||||
(format stream " int ~A_cnt;~%" name)
|
||||
(format stream " sample_block_values_type ~A_ptr;~%" name)
|
||||
(cond ((or (member 'INTERP interpolation)
|
||||
(member 'RAMP interpolation))
|
||||
@@ -993,23 +993,23 @@
|
||||
(cond ((member 'RAMP interpolation)
|
||||
;-----------------
|
||||
; RAMP:
|
||||
; /* support for ramp between samples of NAME */
|
||||
; double output_per_NAME;
|
||||
; long NAME_n;
|
||||
; /* support for ramp between samples of NAME */
|
||||
; double output_per_NAME;
|
||||
; int64_t NAME_n;
|
||||
;-----------------
|
||||
(format stream
|
||||
"~% /* support for ramp between samples of ~A */~%" name)
|
||||
(format stream " double output_per_~A;~%" name)
|
||||
(format stream " long ~A_n;~%" name) ))))
|
||||
(format stream " int64_t ~A_n;~%" name) ))))
|
||||
|
||||
;----------------------------
|
||||
; STATE
|
||||
; TYPEi VARNAMEi ;
|
||||
; TYPEi VARNAMEi ;
|
||||
;----------------------------
|
||||
;; now write state variables
|
||||
;; (STATE (s1) (s2)... (sn) )
|
||||
;; each (si) is of the form
|
||||
;; ("type" "varname" "?" [TEMP])
|
||||
;; ("type" "varname" "?" [TEMP])
|
||||
(cond (state-list (format stream "~%")))
|
||||
(dolist (state state-list)
|
||||
(cond ((equal "LVAL" (car state))
|
||||
@@ -1026,7 +1026,7 @@
|
||||
(put-slot alg xlisp-pointers 'xlisp-pointers)
|
||||
|
||||
;----------------------------
|
||||
; } ALG-NAME_susp_node, *ALG-NAME_susp_type;
|
||||
; } ALG-NAME_susp_node, *ALG-NAME_susp_type;
|
||||
;----------------------------
|
||||
(format stream "} ~A_susp_node, *~A_susp_type;~%" alg-name alg-name)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user