1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-20 06:10:06 +02:00
Leland Lucius 68eec279fb Update nyquist to SVN r288 (r3.15+)
------------------------------------------------------------------------
    r288 | rbd | 2018-09-25 13:47:35 -0500 (Tue, 25 Sep 2018) | 2 lines

    removed some redundant files that moved to nyquist extensions

    ------------------------------------------------------------------------
    r287 | rbd | 2018-09-25 13:02:34 -0500 (Tue, 25 Sep 2018) | 2 lines

    Cleaning up: many things in demos have moved to Nyquist extensions

    ------------------------------------------------------------------------
    r286 | rbd | 2018-09-11 08:21:16 -0500 (Tue, 11 Sep 2018) | 2 lines

    Releasing 3.15 on Mac, finished extension manager update to allow a custom extension list file set in Preferences. Allow text copy of checksum when checksums do not match (so IDE can calculate the checksum for new extensions), describe this in manual.

    ------------------------------------------------------------------------
    r285 | rbd | 2018-09-05 08:00:03 -0500 (Wed, 05 Sep 2018) | 2 lines

    Changes for 3.15 on Mac and hopefully good for Windows too.

    ------------------------------------------------------------------------
    r284 | rbd | 2018-09-01 21:21:47 -0500 (Sat, 01 Sep 2018) | 2 lines

    Final change? for v3.14 on Mac

    ------------------------------------------------------------------------
    r283 | rbd | 2018-09-01 21:14:11 -0500 (Sat, 01 Sep 2018) | 2 lines

    Took out unicode char from fm-voices-chowning, added README to extensions directory

    ------------------------------------------------------------------------
    r282 | rbd | 2018-09-01 21:12:47 -0500 (Sat, 01 Sep 2018) | 1 line

    fixed some instrument defns for sound browser
    ------------------------------------------------------------------------
    r281 | rbd | 2018-09-01 19:56:55 -0500 (Sat, 01 Sep 2018) | 1 line

    Small changes for release on Windows: v3.14
    ------------------------------------------------------------------------
    r280 | rbd | 2018-09-01 19:56:07 -0500 (Sat, 01 Sep 2018) | 2 lines

    path problems in some extensions and minor changes for mac release

    ------------------------------------------------------------------------
    r279 | rbd | 2018-09-01 15:03:26 -0500 (Sat, 01 Sep 2018) | 2 lines

    change doc/README.txt to doc/readme-mac.txt in install dmg

    ------------------------------------------------------------------------
    r278 | rbd | 2018-09-01 14:58:10 -0500 (Sat, 01 Sep 2018) | 2 lines

    minor fix for mac release

    ------------------------------------------------------------------------
    r277 | rbd | 2018-09-01 14:40:10 -0500 (Sat, 01 Sep 2018) | 2 lines

    Retry release on Mac, minor changes.

    ------------------------------------------------------------------------
    r276 | rbd | 2018-08-31 23:44:45 -0500 (Fri, 31 Aug 2018) | 3 lines

    Updated documentation; building 3.14 for mac release

    ------------------------------------------------------------------------
    r275 | rbd | 2018-08-31 21:20:41 -0500 (Fri, 31 Aug 2018) | 1 line

    Fixed extension manager to update installed flags correctly (in Swing thread). Tested browser on Windows.
    ------------------------------------------------------------------------
    r274 | rbd | 2018-08-31 14:35:22 -0500 (Fri, 31 Aug 2018) | 1 line

    Forgot to add new file.
    ------------------------------------------------------------------------
    r273 | rbd | 2018-08-31 14:33:02 -0500 (Fri, 31 Aug 2018) | 1 line

    Changes for Windows including making paths look prettier using backslash or slash more consistently, adding some tests for empty lists, setting up nyquist directory using Registry's XLISPPATH.
    ------------------------------------------------------------------------
    r272 | rbd | 2018-08-31 14:12:12 -0500 (Fri, 31 Aug 2018) | 2 lines

    Everything seems to be working on OS X. Latest fix was to Sound Browser.

    ------------------------------------------------------------------------
    r271 | rbd | 2018-08-31 13:00:54 -0500 (Fri, 31 Aug 2018) | 2 lines

    Adapting to Java 10, fixing sound browser in the face of unloaded extensions.

    ------------------------------------------------------------------------
    r270 | rbd | 2018-08-30 13:18:11 -0500 (Thu, 30 Aug 2018) | 2 lines

    Installer code sets registry to user-selected nyquist directory.

    ------------------------------------------------------------------------
    r269 | rbd | 2018-08-30 12:53:21 -0500 (Thu, 30 Aug 2018) | 1 line

    Getting ready to releasea 3.14. These changes are from Windows.
    ------------------------------------------------------------------------
    r268 | rbd | 2018-08-29 20:06:41 -0500 (Wed, 29 Aug 2018) | 2 lines

    Changes for simpler installation with nyquist (lib, doc, runtime, demos) in user read/write file space.

    ------------------------------------------------------------------------
    r267 | rbd | 2018-08-26 20:45:14 -0500 (Sun, 26 Aug 2018) | 2 lines

    Added some documentation, worked on browser #anchor urls.

    ------------------------------------------------------------------------
    r266 | rbd | 2018-08-22 18:27:01 -0500 (Wed, 22 Aug 2018) | 2 lines

    Fixed some extensions to deal with piano, which now autoloads.

    ------------------------------------------------------------------------
    r265 | rbd | 2018-08-22 12:18:40 -0500 (Wed, 22 Aug 2018) | 2 lines

    added one more missing file for v3.13

    ------------------------------------------------------------------------
    r264 | rbd | 2018-08-22 10:54:15 -0500 (Wed, 22 Aug 2018) | 2 lines

    left out piano/autoload.lsp, needed for v3.13

    ------------------------------------------------------------------------
    r263 | rbd | 2018-08-22 10:09:16 -0500 (Wed, 22 Aug 2018) | 2 lines

    More cleanup for 3.13 release

    ------------------------------------------------------------------------
    r262 | rbd | 2018-08-22 09:54:45 -0500 (Wed, 22 Aug 2018) | 2 lines

    More changes for 3.13 including status dialog while downloading extensions.

    ------------------------------------------------------------------------
    r261 | rbd | 2018-08-19 21:34:23 -0500 (Sun, 19 Aug 2018) | 2 lines

    Updated documentation for v3.13

    ------------------------------------------------------------------------
    r260 | rbd | 2018-08-19 11:14:07 -0500 (Sun, 19 Aug 2018) | 2 lines

    Converted to using Extension Manager

    ------------------------------------------------------------------------
    r259 | rbd | 2018-05-20 19:08:34 -0500 (Sun, 20 May 2018) | 2 lines

    Forgot to commit this new file

    ------------------------------------------------------------------------
    r258 | rbd | 2018-03-10 12:11:22 -0600 (Sat, 10 Mar 2018) | 2 lines

    Substantial changes to pattern classes in xm.lsp to fix bug. The problems were obscure and unnoticed for a long time, but this new implementation is a major rewrite. I still need to test online course examples to make sure nothing is broken there. Otherwise, my assumption is there are few users and incompatibilities will not matter, so this is regarded as a minor bug fix. Also in this commit is some work on turning libraries and demos into Nyquist extensions supported by an extension manager within NyquistIDE.

    ------------------------------------------------------------------------
    r257 | rbd | 2018-01-21 14:40:58 -0600 (Sun, 21 Jan 2018) | 2 lines

    Built nyquist and NyquistIDE on Ubuntu 14.04 LTS and using Oracle Java 9. Minor changes (former build specified Java version 1.7).

    ------------------------------------------------------------------------
    r256 | rbd | 2017-09-24 14:05:06 -0500 (Sun, 24 Sep 2017) | 2 lines

    Fix type-checking bug in score-voice

    ------------------------------------------------------------------------
    r255 | rbd | 2017-09-24 10:35:08 -0500 (Sun, 24 Sep 2017) | 2 lines

    Updated nyqrelide.iss for Roger's newer windows laptop

    ------------------------------------------------------------------------
    r254 | rbd | 2017-09-24 10:27:05 -0500 (Sun, 24 Sep 2017) | 2 lines

    After testing on Windows 7, removed Test button from IDE, made fft_demo not depend so much on XLISPPATH to find pmorales/*.lsp

    ------------------------------------------------------------------------
    r253 | rbd | 2017-09-23 18:44:41 -0500 (Sat, 23 Sep 2017) | 1 line

    Changes to compile on MSVS Community 2015
    ------------------------------------------------------------------------
    r252 | rbd | 2017-09-23 17:01:44 -0500 (Sat, 23 Sep 2017) | 2 lines

    A few adjustments made to allow examples.sal to run even if "demos" is not on the XLISPPATH

    ------------------------------------------------------------------------
    r251 | rbd | 2017-09-23 16:14:27 -0500 (Sat, 23 Sep 2017) | 2 lines

    Minor changes to make this work on Ubuntu linux (or maybe any other linux)

    ------------------------------------------------------------------------
    r250 | rbd | 2017-09-23 14:32:52 -0500 (Sat, 23 Sep 2017) | 2 lines

    Fixed version number in IDE About box

    ------------------------------------------------------------------------
    r249 | rbd | 2017-09-23 14:17:16 -0500 (Sat, 23 Sep 2017) | 2 lines

    More fixes for 3.12. OS X version setting up symbolic links had bugs.

    ------------------------------------------------------------------------
    r248 | rbd | 2017-09-23 00:31:29 -0500 (Sat, 23 Sep 2017) | 2 lines

    Processed documentation for v3.12

    ------------------------------------------------------------------------
    r247 | rbd | 2017-09-22 21:59:18 -0500 (Fri, 22 Sep 2017) | 2 lines

    Preparing v3.12.

    ------------------------------------------------------------------------
    r246 | rbd | 2017-09-05 09:27:29 -0500 (Tue, 05 Sep 2017) | 1 line

    Fixes for Win10 and many changes to rounding throughout to avoid truncating to 32-bit ints when 64-bits might be available on some architectures. In particular, round() which returns double has been replaced by ROUND32, returning int, and ROUNDBIG returning intptr_t.
    ------------------------------------------------------------------------
    r245 | rbd | 2017-08-24 11:15:22 -0500 (Thu, 24 Aug 2017) | 2 lines

    Fixed bug affecting Linux: seq-write-smf was trying to close file twice causing nyquist crash. Fixed by adding intermediate helper function in seqinterf.c so SEQ-WRITE-SMF does not directly call seq_write_smf.

    ------------------------------------------------------------------------
    r244 | rbd | 2016-11-02 13:33:49 -0500 (Wed, 02 Nov 2016) | 2 lines

    Forgot to include this in the repo

    ------------------------------------------------------------------------
    r243 | rbd | 2016-10-11 12:23:21 -0500 (Tue, 11 Oct 2016) | 1 line

    Prepare for v3.11b
    ------------------------------------------------------------------------
    r242 | rbd | 2016-10-11 12:19:31 -0500 (Tue, 11 Oct 2016) | 2 lines

    Improved documentation and formatting. This is for version 3.11b (64-bit Windows only)

    ------------------------------------------------------------------------
    r241 | rbd | 2016-10-11 10:59:51 -0500 (Tue, 11 Oct 2016) | 2 lines

    Fixed bug in fftlib.c which took the negative of an unsigned long.

    ------------------------------------------------------------------------
    r240 | rbd | 2016-10-06 15:49:51 -0500 (Thu, 06 Oct 2016) | 2 lines

    Fixed spec-plot parameter checking, which was totally broken before.

    ------------------------------------------------------------------------
    r239 | rbd | 2016-10-06 15:23:22 -0500 (Thu, 06 Oct 2016) | 2 lines

    Better conversion into Latex and pdf manual. Other minor fixes.

    ------------------------------------------------------------------------
    r238 | rbd | 2016-08-25 13:01:45 -0500 (Thu, 25 Aug 2016) | 1 line

    Adding readme for top level download folder on SourceForge.
    ------------------------------------------------------------------------
    r237 | rbd | 2016-08-25 09:07:08 -0500 (Thu, 25 Aug 2016) | 1 line

    Install is now for x64 architecture. Fixed cell_aut demo to run in IDE sound browser. Modified NyquistThread to create default XLISPPATH from Nyquist dir instead of cwd.
    ------------------------------------------------------------------------
    r236 | rbd | 2016-08-24 21:25:56 -0500 (Wed, 24 Aug 2016) | 2 lines

    minor change during release from OS X

    ------------------------------------------------------------------------
    r235 | rbd | 2016-08-24 21:16:55 -0500 (Wed, 24 Aug 2016) | 2 lines

    Making new release

    ------------------------------------------------------------------------
    r234 | rbd | 2016-08-24 21:05:22 -0500 (Wed, 24 Aug 2016) | 2 lines

    Adding missing file to repo.

    ------------------------------------------------------------------------
    r233 | rbd | 2016-08-24 09:23:39 -0500 (Wed, 24 Aug 2016) | 1 line

    Fixed undefined freeimage problem by moving freeimage out of the conditional compilation. freeimage is defined so that when Nyquist shuts down it can free most of the memory it allocated, minimizing (false positive) reports of memory leaks, which are harmless (except that they obscure true positive messages and seem surprising to non-xlisp experts). Undefined SAVERESTORE flag the way it used to be because save and restore functions (other than freeimage) do not work with the Nyquist SOUND type extension to XLISP.
    ------------------------------------------------------------------------
    r232 | rbd | 2016-07-19 09:39:45 -0500 (Tue, 19 Jul 2016) | 2 lines

    I was going to keep "debug" versions separate because of the runtime overhead, but the code started to diverge and it's hard to maintain two versions, so we're going to make all the type checking standard. If you want an optimized version, you could strip out the calls to ny:typecheck using list processing and it would probably work. You could even write NY:OPTIMIZE that would poke into all the function definitions and destructively edit the code.

    ------------------------------------------------------------------------
    r231 | rbd | 2016-07-19 09:34:16 -0500 (Tue, 19 Jul 2016) | 2 lines

    moved to test/

    ------------------------------------------------------------------------
    r230 | rbd | 2016-07-19 09:32:11 -0500 (Tue, 19 Jul 2016) | 2 lines

    Added extensive type checking to nyquist built-in (but not primitive) functions, and added unit tests for type checking, and incorporated unit tests into regression-test.lsp, a new "grand" test sequence.

    ------------------------------------------------------------------------
    r229 | rbd | 2016-06-23 14:28:03 -0500 (Thu, 23 Jun 2016) | 2 lines

    New code to build NyquistIDE.app -- the old appbundler stuff is no longer needed

    ------------------------------------------------------------------------
    r228 | rbd | 2016-06-23 06:44:49 -0500 (Thu, 23 Jun 2016) | 2 lines

    Appbundler is Oracle software used to build NyquistIDE - originally from java.net, but it seems to be not an active project (maybe that is good) so let's keep a copy just in case.

    ------------------------------------------------------------------------
    r227 | rbd | 2016-06-22 16:02:26 -0500 (Wed, 22 Jun 2016) | 2 lines

    previous change to snd_list_unref was VERY wrong; here is the fix.

    ------------------------------------------------------------------------
    r226 | rbd | 2016-06-22 13:46:44 -0500 (Wed, 22 Jun 2016) | 2 lines

    inserted some memory-freeing code from upstream (Audacity); made snd_list_unref non-recursive; CMakeLists.txt was not working on Mac 10.11.5 -- still can't build NyquistIDE, so more changes are on the way

    ------------------------------------------------------------------------
    r225 | rbd | 2016-05-11 10:54:16 -0500 (Wed, 11 May 2016) | 2 lines

    Overhaul of new typechecking and parameter validation and error reporting code. Mostly untested, but tests to be done are in typechecks.sal

    ------------------------------------------------------------------------
    r224 | rbd | 2016-05-06 07:56:11 -0500 (Fri, 06 May 2016) | 2 lines

    Improved plot in nyqide, progress on validating parameters for SAL, spec-plot defined, autoload spec-plot and piano synthesis functions

    ------------------------------------------------------------------------
    r223 | rbd | 2016-05-03 13:07:14 -0500 (Tue, 03 May 2016) | 2 lines

    This contains work in progress on validating parameters in many nyquist functions, fixing liblo for win64, and some security (integer overflow) problems - probably does not compile

    ------------------------------------------------------------------------
    r222 | rbd | 2016-03-16 10:34:15 -0500 (Wed, 16 Mar 2016) | 2 lines

    Updated documentation with minor additions and corrections.

    ------------------------------------------------------------------------
    r221 | rbd | 2016-01-15 18:59:45 -0600 (Fri, 15 Jan 2016) | 2 lines

    Fixed file name for Browser

    ------------------------------------------------------------------------
    r220 | rbd | 2016-01-15 18:49:15 -0600 (Fri, 15 Jan 2016) | 2 lines

    Changes to fix compilation on OS X

    ------------------------------------------------------------------------
    r219 | rbd | 2016-01-15 18:31:23 -0600 (Fri, 15 Jan 2016) | 2 lines

    fixed build code for linux, made some c code more compatible

    ------------------------------------------------------------------------
    r218 | rbd | 2016-01-14 17:08:39 -0600 (Thu, 14 Jan 2016) | 1 line

    modifications from Windows 7 port (static libraries) and browser files pointed to demos/src new location.
    ------------------------------------------------------------------------
    r217 | rbd | 2016-01-14 13:04:24 -0600 (Thu, 14 Jan 2016) | 2 lines

    Now that cmake is in use, we do not need old Makefiles

    ------------------------------------------------------------------------
    r216 | rbd | 2016-01-11 02:00:08 -0600 (Mon, 11 Jan 2016) | 1 line

    fixed to compile on XCode
    ------------------------------------------------------------------------
    r215 | rbd | 2016-01-11 01:32:58 -0600 (Mon, 11 Jan 2016) | 1 line

    examples tried to play drums, but they may not be installed
    ------------------------------------------------------------------------
    r214 | rbd | 2016-01-11 01:05:00 -0600 (Mon, 11 Jan 2016) | 1 line

    more win7 fixes
    ------------------------------------------------------------------------
    r213 | rbd | 2016-01-11 00:42:57 -0600 (Mon, 11 Jan 2016) | 2 lines

    more file and path problems fixed

    ------------------------------------------------------------------------
    r212 | rbd | 2016-01-11 00:19:55 -0600 (Mon, 11 Jan 2016) | 2 lines

    fixed lpc demo

    ------------------------------------------------------------------------
    r211 | rbd | 2016-01-10 23:45:50 -0600 (Sun, 10 Jan 2016) | 1 line

    fix read-float, restore pianosyn.lsp
    ------------------------------------------------------------------------
    r210 | rbd | 2016-01-10 23:36:35 -0600 (Sun, 10 Jan 2016) | 1 line

    fix references to demo-snd.aiff which is in demos/audio now
    ------------------------------------------------------------------------
    r209 | rbd | 2016-01-10 22:32:08 -0600 (Sun, 10 Jan 2016) | 1 line

    getting 3.10 to run on windows, has temp debug info in pianosyn.lsp
    ------------------------------------------------------------------------
    r208 | rbd | 2016-01-10 20:49:37 -0600 (Sun, 10 Jan 2016) | 2 lines

    Forgot to add new demo files

    ------------------------------------------------------------------------
    r207 | rbd | 2016-01-10 20:31:40 -0600 (Sun, 10 Jan 2016) | 2 lines

    fixed downsample.c, other minor release problems

    ------------------------------------------------------------------------
    r206 | rbd | 2016-01-10 14:01:58 -0600 (Sun, 10 Jan 2016) | 2 lines

    missing files (maybe only cmupvdbg.h is really needed)

    ------------------------------------------------------------------------
    r205 | rbd | 2016-01-10 12:10:01 -0600 (Sun, 10 Jan 2016) | 2 lines

    No more scribe, so no more auto generation of text-only documentation. Hopefully HTML will suffice. PDF is now done by latex (but I forgot to move it into the doc directory before).

    ------------------------------------------------------------------------
    r204 | rbd | 2016-01-10 12:01:55 -0600 (Sun, 10 Jan 2016) | 2 lines

    Nearing release of 3.10 -- major changes are phasevocoder, convolution, demo documentation

    ------------------------------------------------------------------------
    r203 | rbd | 2016-01-10 11:38:35 -0600 (Sun, 10 Jan 2016) | 2 lines

    Made revisions for 3.10. Not quite done yet.

    ------------------------------------------------------------------------
    r202 | rbd | 2015-12-28 22:33:51 -0600 (Mon, 28 Dec 2015) | 2 lines

    Updating demos to SAL syntax and better "front page".

    ------------------------------------------------------------------------
    r201 | rbd | 2015-05-20 19:46:16 -0500 (Wed, 20 May 2015) | 2 lines

    Fixed more warnings about types. Still working on convolve though.

    ------------------------------------------------------------------------
    r200 | rbd | 2015-05-20 06:16:32 -0500 (Wed, 20 May 2015) | 2 lines

    Forgot to move the final pdf of the manual to doc.

    ------------------------------------------------------------------------
    r199 | rbd | 2015-05-20 06:14:25 -0500 (Wed, 20 May 2015) | 2 lines

    Fixed some documentation -- it might be complete now. Removed extra play command from organ.lsp.

    ------------------------------------------------------------------------
    r198 | rbd | 2015-05-19 21:32:24 -0500 (Tue, 19 May 2015) | 2 lines

    Fixed some problems and warnings when compiling on Ubuntu Linux

    ------------------------------------------------------------------------
    r197 | rbd | 2015-05-19 20:55:04 -0500 (Tue, 19 May 2015) | 2 lines

    Merged Win32 changes with OS X, removed some .sln and .vcproj files that are not needed now that we are using CMake

    ------------------------------------------------------------------------
    r196 | rbd | 2015-05-19 20:27:30 -0500 (Tue, 19 May 2015) | 1 line

    Got nyquist and jnyqide to build on Windows under Visual Studio Express 2013. Many changes to remove some compiler warnings.
    ------------------------------------------------------------------------
    r195 | rbd | 2015-05-14 21:52:33 -0500 (Thu, 14 May 2015) | 2 lines

    better device selection for ALSA and added cross-platform help to find and select devices; added icon to jny on Linux (should work on Windows)

    ------------------------------------------------------------------------
    r194 | rbd | 2015-05-12 21:08:59 -0500 (Tue, 12 May 2015) | 2 lines

    still more missing files

    ------------------------------------------------------------------------
    r193 | rbd | 2015-05-12 21:07:41 -0500 (Tue, 12 May 2015) | 2 lines

    more missing files

    ------------------------------------------------------------------------
    r192 | rbd | 2015-05-12 21:04:50 -0500 (Tue, 12 May 2015) | 2 lines

    another missing file

    ------------------------------------------------------------------------
    r191 | rbd | 2015-05-12 20:56:39 -0500 (Tue, 12 May 2015) | 2 lines

    repo missing a file

    ------------------------------------------------------------------------
    r190 | rbd | 2015-05-12 20:28:25 -0500 (Tue, 12 May 2015) | 2 lines

    repo is missing a file

    ------------------------------------------------------------------------
    r189 | rbd | 2015-05-12 20:16:10 -0500 (Tue, 12 May 2015) | 2 lines

    cleaned out files we don't use

    ------------------------------------------------------------------------
    r188 | rbd | 2015-05-12 12:42:57 -0500 (Tue, 12 May 2015) | 2 lines

    Updated liblo to v0.28 and tested that it compiles with nyquist on XCode

    ------------------------------------------------------------------------
    r187 | rbd | 2015-05-12 07:00:06 -0500 (Tue, 12 May 2015) | 2 lines

    FLAC changes were incomplete. This revision compiles.

    ------------------------------------------------------------------------
    r186 | rbd | 2015-05-12 06:39:06 -0500 (Tue, 12 May 2015) | 2 lines

    Updated FLAC to 1.3.1, removed unnecessary files from local copy of sources.

    ------------------------------------------------------------------------
    r185 | rbd | 2015-05-11 22:51:11 -0500 (Mon, 11 May 2015) | 2 lines

    I updated libvorbis from 1.3.5 and deleted unneeded files

    ------------------------------------------------------------------------
    r184 | rbd | 2015-05-11 22:29:41 -0500 (Mon, 11 May 2015) | 2 lines

    I decided to just keep sources in libraries that are needed to build Nyquist, so I'm removing lots of build and configuration files. So far, portaudio is updated to V19 and libogg is updated to 1.3.2

    ------------------------------------------------------------------------
    r183 | rbd | 2015-05-11 15:00:14 -0500 (Mon, 11 May 2015) | 2 lines

    macosxproject/CMakeLists.txt is now in place to generate nyquist.xcodeproj. Since it is generated by CMake, I removed it from the repo.

    ------------------------------------------------------------------------
    r182 | rbd | 2015-05-11 14:03:53 -0500 (Mon, 11 May 2015) | 2 lines

    Added sliders, documentation is now in latex, new Java build, CMake is used to create project in OS X, many other changes. This is NOT a release! Next step will be to get the CMake-built project into the right name and directory.

    ------------------------------------------------------------------------
    r181 | rbd | 2015-03-19 19:40:00 -0500 (Thu, 19 Mar 2015) | 2 lines

    This is a failed attempt to use PanDoc to make a Nyquist manual, now that Scribe seems to have died. This is the point where I am changing the code to write directly to Latex.

    ------------------------------------------------------------------------
    r180 | rbd | 2015-03-18 10:17:44 -0500 (Wed, 18 Mar 2015) | 2 lines

    Update version numbers to 3.10

    ------------------------------------------------------------------------
    r179 | rbd | 2015-03-17 20:17:35 -0500 (Tue, 17 Mar 2015) | 2 lines

    minor bug fixes

    ------------------------------------------------------------------------
    r178 | rbd | 2015-03-17 20:05:13 -0500 (Tue, 17 Mar 2015) | 1 line

    Various changes from Windows version.res
2019-12-15 19:34:50 -06:00

676 lines
26 KiB
C

/* multiseq.c -- return a multichannel signal until its logical stop, then
evaluate a closure to get another signal and convert to adds
of two multichannel 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 "multiseq.h"
#include "add.h"
#include "scale.h"
#include "extern.h"
#include "cext.h"
/* #define MULTISEQ_GC_DEBUG */
#ifdef MULTISEQ_GC_DEBUG
extern snd_list_type snd_list_to_watch;
#endif
/* #define GC_DEBUG */
#ifdef GC_DEBUG
extern sound_type sound_to_watch;
#endif
#define D if(0)
/* Design:
This operator implements sequences of multichannel signals.
A single data structure manages an array of susps that
initially are used to fetch blocks from the first multichannel
signal. When the LAST logical stop is reached, a closure
is evaluated to yield a new multichannel signal. The component
sounds of this are stored into the susps which are then
converted into add suspensions. The other managing structures
are then freed.
The main constraint here is that the conversion to add susps
must take place at the same time across all channels, so before
the conversion, a fetch from the susp can only be made if it is
known that the samples returned happen BEFORE the conversion will
take place. Since the conversion takes place at the maximum of
the logical stop times of all channels, we have to advance all
channels synchronously. We keep track of a greatest lower bound,
refered to as the horizon, on the maximum logical stop time. It
is safe to fetch blocks up to the horizon, but not beyond.
This synchronous fetching is done by a single routine and an
auxilliarly structure that manages the whole multichannel array
of susps. The basic idea is that a fetch from a
suspension gets forwarded to the managing structure, which
uses its array of susps to fetch from ALL suspensions up to
the requested time or until the logical stop, whichever comes
first. These "synchronous" fetches are not made by calling the
fetch routines on the suspensions to avoid infinite recursion.
At any time, there will be some set of channels whose logical
stop time is unknown. The "s1" fields (s1, s1_ptr, s1_bptr) of
these suspensions are used to look ahead by geting a block from
s1. If no logical stop is indicated, then we can append the block
to the snd_list and update the horizon, allowing fetches from other
susps. In other words, the s1_bptr of each susp provides a one
buffer lookahead by which we can obtain advance knowledge of the
maximum logical stop time.
The algorithm is as follows:
1. When fetch is called on a suspension, compute when any
prefetched samples will end (if there are none, then fetch
a block from s1 and compute the time at which the block ends).
This becomes the target time for other fetches.
2. Call multiseq_advance(), passing the target time and the
manager structure (which has pointers to all other channels).
(Note: every susp has a pointer to the manager).
The function of multiseq_advance() is to push the horizon for
the logical stop forward. This is done by
iterating over the array of susps until the target is reached.
Actually, the array contains pointers to the snd_list_node that
points to each susp and where the next block will be linked.
The goal of this loop is to satisfy the original fetch, which
means we have to push low_water to greater than or equal to the
target. (Low water is the minimum time of the next sample to
be returned by any multiseq susp.) This goal will be met unless
we reach the last logical stop time, in which case we evaluate
the closure for the next multichannel sound, convert
everything to add's and let the additions take care of returning
blocks.
3. The Iteration Loop:
low_water is the lowest sample count of the next sample
horizon is the greatest lower bound on the maximum logical stop time
Iterate over susps until low_water >= target
(Note: whenever data is fetched for a sound whose logical stop time
is unknown, update the horizon. If a logical stop time becomes known,
then test if the final maximum logical stop time is known (by keeping
a count of how many are still unknown), and if the count goes to zero,
evaluate the continuation and convert to multiple adds.)
(Another Note: we may reach the logical stop time and convert to
multiple adds before the loop terminates, in which case we return
without finishing the loop. Take care that the caller does the right
thing to produce a sample block in this case.)
3a. If a block hasn't been prefetched, do it.
3b. While the susp has prefetched a block that ends at or before horizon,
put the block on the snd_list and prefetch another block.
3c. If the susp hasn't a known logical stop time, set new_horizon to
the end time of the last sample prefetched in 3b.
3d. If new_horizon == horizon, signal an error, no progress was made.
3d. Set horizon to new_horizon and repeat the loop.
NOTE ON A BUG FIX (1 Jul 95): old code assumed that when a logical stop
was detected it was at the beginning of the next block, but if logical
stop is explicit, then it may be way in the future. We could convert
to adds at this point, but that would force early evaluation of the
closure, which we'd like to delay (be lazy when possible). Therefore,
we want to ignore knowledge of a logical stop time until the logical
stop time falls within the currently known block of samples. By "currently
known", I mean somewhere in the block referenced by ->s1_ptr and ->s1_cnt.
*/
/* extern LVAL s_stdout; */
void multiseq_convert(multiseq_type ms);
void multiseq_free(snd_susp_type a_susp);
sample_block_type multiseq_get_next(sound_type snd, long * cnt);
void multiseq_print_tree(snd_susp_type a_susp, int n);
#define susp_cnt_time(ssp, ms, cnt) (ssp->susp.t0 - ms->t0 + (cnt)/ssp->s1->sr)
#define susp_time(ssp, ms) susp_cnt_time(ssp, ms, \
(ssp->susp.current + ssp->s1_cnt))
#define susp_low_water(ssp, ms) susp_cnt_time(ssp, ms, ssp->susp.current)
#define susp_log_stop_time(ssp, ms) susp_cnt_time(ssp, ms, ssp->susp.log_stop_cnt)
/* multiseq_advance fetches from each channel to advance to target time */
/*
* If a channel terminates early, we must be careful: continuing to
* fetch will return pointers to the zero_block, but this will
* indicate termination to whoever is fetching from multiseq. We
* must check the pointers and substitute internal_zero_block to
* avoid premature termination.
*/
void multiseq_advance(multiseq_type ms, time_type target)
{
int i;
time_type new_horizon;
time_type new_low_water;
D nyquist_printf("multiseq_advance: %p->low_water %g, target %g\n",
ms, ms->low_water, target);
while (ms->low_water < target - 0.000001) {
new_horizon = 0.0;
D nyquist_printf("multiseq_advance loop: target %g low_water %g horizon %g\n",
target, ms->low_water, ms->horizon);
/* new_low_water will be a minimum over every
* channel, so start with a big number */
new_low_water = target;
for (i = 0; i < ms->nchans; i++) {
snd_list_type snd_list = ms->chans[i];
add_susp_type susp = (add_susp_type) snd_list->u.susp;
time_type my_hor;
time_type my_low_water;
D nyquist_printf("chans[%d]: ", i);
/* fetch up to horizon */
/* see if susp has an unprocessed block (test on susp->s1_ptr
* is probably not necessary, in fact, it isn't initialized
* until the first block is fetched, but s1_cnt is
*/
if (susp->s1_cnt && susp->s1_ptr &&
susp->s1_ptr == susp->s1_bptr->samples) {
/* do nothing, unprocessed block already there as a
* result of the initiating fetch
*/
} else if (susp->s1_cnt != 0) {
stdputstr("multiseq_advance: s1_cnt != 0\n");
EXIT(1); /* this should never happen */
} else { /* otherwise fetch it */
D stdputstr("prefetching samples ");
susp_get_block_samples(s1, s1_bptr, s1_ptr, s1_cnt);
if (susp->s1_ptr == zero_block->samples) {
susp->terminate_bits = 1;
susp->s1_bptr = internal_zero_block;
susp->s1_ptr = internal_zero_block->samples;
}
/* see if we've reached a logical stop
* (I can't believe this code block is in 3 places -
* there must be a better way... RBD)
*/
if (!susp->logical_stop_bits) {
if (susp->s1->logical_stop_cnt != UNKNOWN) {
if (susp->susp.current + susp->s1_cnt >=
susp->s1->logical_stop_cnt) {
susp->logical_stop_bits = 1;
susp->susp.log_stop_cnt =
susp->s1->logical_stop_cnt;
ms->not_logically_stopped_cnt--;
D nyquist_printf(
"snd_make_multiseq: Logical stop reached, not_logically_stopped_cnt %d\n",
ms->not_logically_stopped_cnt);
}
}
}
}
D nyquist_printf(" current %d cnt %d ",
(int)susp->susp.current, (int)susp->s1_cnt);
/* while the susp has prefetched a block that ends at or
* before horizon, put the block on the snd_list and
* prefetch another block
*/
while (susp_time(susp, ms) < ms->horizon + 0.000001) {
snd_list->block = susp->s1_bptr;
snd_list->block_len = (short) susp->s1_cnt;
susp->susp.current += susp->s1_cnt;
(susp->s1_bptr->refcnt)++;
susp->s1_cnt = 0;
#ifdef MULTISEQ_GC_DEBUG
nyquist_printf(
"multiseq: output block %p%s on snd_list %p to chan %d\n",
susp->s1_bptr,
(susp->s1_bptr == internal_zero_block ?
" (INTERNAL ZERO BLOCK)" : ""),
snd_list, i);
#endif
snd_list->u.next = snd_list_create(&(susp->susp));
#ifdef MULTISEQ_GC_DEBUG
snd_list_debug(snd_list, "multiseq_advance");
#endif
ms->chans[i] = snd_list = snd_list->u.next;
susp_get_block_samples(s1, s1_bptr, s1_ptr, s1_cnt);
if (susp->s1_ptr == zero_block->samples) {
susp->terminate_bits = 1;
susp->s1_bptr = internal_zero_block;
susp->s1_ptr = internal_zero_block->samples;
}
if (susp->s1_ptr != susp->s1_bptr->samples) {
stdputstr("bug in multiseq_advance\n");
EXIT(1);
}
/* see if we've reached a logical stop
* (I can't believe this code block is in 3 places -
* there must be a better way... RBD)
*/
if (!susp->logical_stop_bits) {
if (susp->s1->logical_stop_cnt != UNKNOWN) {
if (susp->susp.current + susp->s1_cnt >=
susp->s1->logical_stop_cnt) {
susp->logical_stop_bits = 1;
susp->susp.log_stop_cnt =
susp->s1->logical_stop_cnt;
ms->not_logically_stopped_cnt--;
D nyquist_printf(
"snd_make_multiseq: Logical stop reached, not_logically_stopped_cnt %d\n",
ms->not_logically_stopped_cnt);
}
}
}
D nyquist_printf("\n\toutput block, current %d cnt %d ",
(int)susp->susp.current, (int)susp->s1_cnt);
}
if (!susp->logical_stop_bits)
my_hor = susp_time(susp, ms);
else my_hor = susp_log_stop_time(susp, ms);
if (new_horizon < my_hor) {
D nyquist_printf("new_horizon %g ", my_hor);
new_horizon = my_hor;
}
if (ms->not_logically_stopped_cnt == 0) {
ms->horizon = new_horizon; /* pass t0 to multiseq_convert */
D stdputstr("Calling multiseq_convert\n");
multiseq_convert(ms);
return;
}
my_low_water = susp_low_water(susp, ms);
if (my_low_water < new_low_water) {
new_low_water = my_low_water;
}
D stdputstr("\n");
}
ms->low_water = new_low_water;
if (new_horizon <= ms->horizon) {
stdputstr("no progress in multiseq_advance\n");
EXIT(1);
} else {
ms->horizon = new_horizon;
}
}
}
/* multiseq_convert -- eval closure and convert to adds */
/**/
void multiseq_convert(multiseq_type ms)
{
LVAL result, new;
sound_type snd;
time_type now = ms->t0 + ms->horizon;
int i;
long size;
xlsave1(result);
result = xleval(cons(ms->closure, consa(cvflonum(now))));
if (exttypep(result, a_sound)) {
snd = sound_copy(getsound(result));
result = newvector(ms->nchans);
setelement(result, 0, cvsound(snd));
for (i = 1; i < ms->nchans; i++) {
setelement(result, i, cvsound(sound_zero(now, ms->sr)));
}
} else if (vectorp(result)) {
if (getsize(result) > ms->nchans) {
xlerror("too few channels", result);
} else if (getsize(result) < ms->nchans) {
new = newvector(ms->nchans);
for (i = 1; i < getsize(result); i++) {
setelement(new, i, getelement(result, i));
}
for (i = getsize(result); i < ms->nchans; i++) {
setelement(new, i, cvsound(sound_zero(now, ms->sr)));
}
result = new;
}
} else xlerror("closure did not return a (multi-channel) sound", result);
/* now result holds a vector of nchans, insert them into add_susp's */
for (i = 0; i < ms->nchans; i++) {
snd_list_type snd_list = ms->chans[i];
add_susp_type susp = (add_susp_type) snd_list->u.susp;
long sother_start;
/* remove backpointer to ms */
susp->multiseq = NULL;
susp->susp.print_tree = add_print_tree;
susp->susp.free = add_free;
susp->susp.mark = add_mark;
susp->s2 = sound_copy(getsound(getelement(result, i)));
if (susp->s1->sr != susp->s2->sr)
xlfail("multiseq: sample rates must match");
if (susp->s2->scale != 1.0) {
susp->s2 = snd_make_normalize(susp->s2);
}
sother_start = ROUNDBIG((susp->s2->t0 - susp->susp.t0) * susp->s2->sr);
D nyquist_printf("sother_start computed for %p: %d\n",
susp, (int)sother_start);
if (sother_start > susp->susp.current) {
D nyquist_printf("susp %p using add_s1_nn_fetch\n", susp);
susp->susp.fetch = add_s1_nn_fetch;
susp->susp.name = "multiseq:add_s1_nn_fetch";
} else if (susp->terminate_bits) { /* s1 is done, just get s2 now */
sound_unref(susp->s1);
susp->s1 = NULL;
D nyquist_printf("susp %p using add_s2_nn_fetch\n", susp);
susp->susp.fetch = add_s2_nn_fetch;
susp->susp.name = "multiseq:add_s2_nn_fetch";
} else {
D nyquist_printf("susp %p using add_s1_s2_nn_fetch\n", susp);
susp->susp.fetch = add_s1_s2_nn_fetch;
susp->susp.name = "multiseq:add_s1_s2_nn_fetch";
}
/* fix up logical stop info */
/* BUG: what if s2 is already stopped? */
susp->susp.log_stop_cnt = UNKNOWN;
susp->logically_stopped = false;
/* we need to compute at least 1 sample
* (at this point we don't really know if we've
* computed anything or not, so to be safe, do it.
*/
snd_list->u.next = snd_list_create(&(susp->susp));
snd_list->block = internal_zero_block;
(*(susp->susp.fetch))((snd_susp_type) susp, snd_list);
}
/* now free the multiseq struct */
size = sizeof(snd_list_type) * ms->nchans;
ffree_generic(ms->chans, size, "multiseq_convert");
ffree_generic(ms, sizeof(multiseq_node), "multiseq_convert(2)");
ms->closure = NIL; /* allow garbage collection now */
xlpop();
}
/* multiseq_fetch returns blocks of s1 until the logical stop time of s1's */
/*
* Fetch routines (in particular, the add_*_fetch routines that will
* be installed on this susp at a later time) expect to be called with
* a new snd_list installed and ready for a new block. However, since
* we are going to call multiseq_advance to pull blocks out of susps
* that will not be set up with a fresh snd_list in this way, it is
* simpler to dispose of the preallocated snd_list so that all susps
* look alike to multiseq_advance. Of course, multiseq_advance will
* redo the work of allocating a snd_list.
*
* If a channel terminates early, we must be careful: continuing to
* fetch will return pointers to the zero_block, but this will
* indicate termination to whoever is fetching from multiseq. We
* must check the pointers and substitute internal_zero_block to
* avoid premature termination.
*/
void multiseq_fetch(snd_susp_type a_susp, snd_list_type snd_list)
{
add_susp_type susp = (add_susp_type) a_susp;
time_type block_end_time;
/* undo the preallocation of a snd_list_node */
/* we can bypass the reference counting code because we
* know that this snd_list was just allocated and has no
* other references
*/
#ifdef MULTISEQ_GC_DEBUG
if (snd_list_to_watch == snd_list->u.next) {
nyquist_printf("multiseq_fetch: backing out snd_list_to_watch from %p\n",
snd_list_to_watch);
watch_snd_list(snd_list);
}
#endif
ffree_snd_list(snd_list->u.next, "multiseq_fetch");
snd_list->u.susp = (snd_susp_type) susp;
snd_list->block = NULL;
D nyquist_printf("multiseq_fetch called: susp %p s1_cnt %d\n",
susp, (int)susp->s1_cnt);
/* first compute how many samples we can generate from s1: */
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 */
susp->s1_bptr = internal_zero_block;
susp->s1_ptr = internal_zero_block->samples;
}
/* see if we've reached a logical stop
* (I can't believe this code block is in 3 places -
* there must be a better way... RBD)
*/
if (!susp->logical_stop_bits) {
if (susp->s1->logical_stop_cnt != UNKNOWN) {
if (susp->susp.current + susp->s1_cnt >=
susp->s1->logical_stop_cnt) {
susp->logical_stop_bits = 1;
susp->susp.log_stop_cnt =
susp->s1->logical_stop_cnt;
susp->multiseq->not_logically_stopped_cnt--;
D nyquist_printf(
"snd_make_multiseq: Logical stop reached, not_logically_stopped_cnt %d\n",
susp->multiseq->not_logically_stopped_cnt);
}
}
}
}
/* s1_cnt has the number of samples we can return */
/* now compute time of the last sample */
block_end_time = susp_time(susp, susp->multiseq);
D nyquist_printf("block_end_time of %p: %g\n", susp, block_end_time);
multiseq_advance(susp->multiseq, block_end_time);
}
/* multiseq_mark -- mark routine for multiseq susps */
/**/
void multiseq_mark(snd_susp_type a_susp)
{
add_susp_type susp = (add_susp_type) a_susp;
int i;
multiseq_type ms = susp->multiseq;
D nyquist_printf("multiseq_mark(%p)\n", susp);
/* nyquist_printf("marking s1@%p in add@%p\n", susp->s1, susp);*/
if (ms->closure) mark(ms->closure);
/* mark s1 of each susp in multiseq */
for (i = 0; i < ms->nchans; i++) {
snd_list_type snd_list = ms->chans[i];
if (snd_list) {
while (snd_list->block != NULL) {
if (snd_list == zero_snd_list) break;
snd_list = snd_list->u.next;
}
sound_xlmark(((add_susp_type) snd_list->u.susp)->s1);
}
}
}
/* snd_make_multiseq -- make a multiseq from an array and a closure */
/*
* NOTE: the resulting array of sounds will not use the normal
* SND_get_first and SND_get_next routines to fetch new blocks
* because these extend the snd_list of the sound immediately,
* and this would confuse multiseq_advance() which has to extend
* multiple snd_lists synchronously. So, we use multiseq_get_next()
* instead.
*/
LVAL snd_make_multiseq(LVAL s1, LVAL closure)
{
multiseq_type ms;
int i;
LVAL result;
xlsave1(result);
/* allocate multiseq */
falloc_generic(ms, multiseq_node, "snd_make_multiseq");
/* install its array of snd_list_type */
if (!vectorp(s1) || getsize(s1) == 0) {
ffree_generic(ms, sizeof(multiseq_node), "snd_make_multiseq");
xlerror("bad argument type", s1);
}
ms->nchans = getsize(s1);
ms->closure = closure;
ms->not_logically_stopped_cnt = 0;
ms->low_water = 0.0;
ms->horizon = 0.0;
falloc_generic_n(ms->chans, snd_list_type, ms->nchans,
"snd_make_multiseq");
/* allocate sounds to return */
result = newvector(ms->nchans);
/* ms->t0 will be the minimum of all t0's in array */
ms->t0 = (getsound(getelement(s1, 0)))->t0;
/* create sounds to return */
for (i = 0; i < ms->nchans; i++) {
add_susp_type susp;
sound_type snd;
falloc_generic(susp, add_susp_node, "snd_make_multiseq(add_susp)");
susp->s1 = sound_copy(getsound(getelement(s1, i)));
/* we used to only incr this if lsc was UNKNOWN, but
that's wrong. Should move this out of the loop now.
*/
if (susp->s1->scale != 1.0) {
/* stdputstr("normalizing first sound in a seq\n"); */
susp->s1 = snd_make_normalize(susp->s1);
}
ms->not_logically_stopped_cnt++;
D nyquist_printf("snd_make_multiseq: not_logically_stopped_cnt %d\n",
ms->not_logically_stopped_cnt);
susp->s1_cnt = 0;
susp->s2 = NULL;
susp->s2_cnt = 0;
susp->susp.fetch = multiseq_fetch;
susp->susp.free = multiseq_free;
susp->susp.sr = susp->s1->sr;
susp->susp.mark = multiseq_mark;
susp->susp.print_tree = multiseq_print_tree;
susp->susp.name = "multiseq";
susp->susp.t0 = susp->s1->t0;
susp->terminate_bits = 0; /* bits for s1 and s2 termination */
susp->terminate_cnt = UNKNOWN;
susp->logical_stop_bits = 0; /* bits for s1 and s2 log. stop */
susp->susp.log_stop_cnt = UNKNOWN;
susp->logically_stopped = false;
susp->started = false;
susp->susp.current = 0;
susp->multiseq = ms;
snd = sound_create((snd_susp_type) susp, susp->s1->t0, susp->susp.sr,
1.0);
#ifdef GC_DEBUG
if (snd == sound_to_watch) {
nyquist_printf("watched sound is channel %d\n", i);
}
#endif
setelement(result, i, cvsound(snd));
if (snd->list->block || !snd->list->u.susp) {
stdputstr("data inconsistency in snd_make_seq\n");
EXIT(1);
}
ms->chans[i] = snd->list;
D nyquist_printf("ms->chans[%d] = %p, %p->u.susp = %p\n",
i, snd->list, snd->list, snd->list->u.susp);
ms->t0 = MIN(ms->t0, susp->s1->t0);
ms->sr = susp->s1->sr; /* assume all samp rates are equal */
D nyquist_printf("Multiseq sound[%d]: \n", i);
D sound_print_tree(susp->s1);
}
D nyquist_printf("ms->t0 == %g\n", ms->t0);
xlpop();
return result;
}
/* note: snd_multiseq is a noop, just call snd_make_multiseq */
void multiseq_free(snd_susp_type a_susp)
{
add_susp_type susp = (add_susp_type) a_susp;
int i;
multiseq_type ms = susp->multiseq;
boolean dead = true;
sound_unref(susp->s1);
sound_unref(susp->s2); /* probably not necessary */
/* tricky part: remove pointer from ms->chans */
for (i = 0; i < ms->nchans; i++) {
if (ms->chans[i]) {
dead = false;
/*
* note that ms->chans is still a valid
* pointer (see snd_list_unref)
*/
if (ms->chans[i]->u.susp == (snd_susp_type) susp) {
ms->chans[i] = NULL;
D nyquist_printf("susp %p freed, ms@%p->chans[%d] = NULL\n",
susp, ms, i);
}
}
}
/* if last element is freed, free the multiseq struct too */
if (dead) {
i = sizeof(snd_list_type) * ms->nchans;
ffree_generic(ms->chans, i, "multiseq_free");
ffree_generic(ms, sizeof(multiseq_node), "multiseq_free(2)");
}
susp->multiseq = NULL; /* just to be safe */
ffree_generic(susp, sizeof(add_susp_node), "multiseq_free(3)");
}
void multiseq_print_tree(snd_susp_type a_susp, int n)
{
add_susp_type susp = (add_susp_type) a_susp;
int i;
indent(n);
if (!susp->multiseq) {
xlfail("internal error: missing multiseq structure");
}
nyquist_printf("multiseq@%p = [ ", susp->multiseq);
for (i = 0; i < susp->multiseq->nchans; i++) {
if (susp->multiseq->chans[i]) {
nyquist_printf("%p", susp->multiseq->chans[i]->u.susp);
} else {
stdputstr("NULL");
}
}
indent(n);
stdputstr("s1:");
sound_print_tree_1(susp->s1, n);
indent(n);
stdputstr("closure:");
stdprint(susp->multiseq->closure);
indent(n);
}