mirror of
https://github.com/cookiengineer/audacity
synced 2025-11-21 16:37:12 +01:00
------------------------------------------------------------------------
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
349 lines
11 KiB
C
349 lines
11 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"
|
|
|
|
#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;
|
|
long terminate_cnt;
|
|
int logical_stop_bits;
|
|
boolean logically_stopped;
|
|
sound_type s1;
|
|
long s1_cnt;
|
|
sample_block_type s1_bptr; /* block pointer */
|
|
sample_block_values_type s1_ptr;
|
|
sound_type s2;
|
|
long 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 sndseq_mark(snd_susp_type a_susp)
|
|
{
|
|
sndseq_susp_type susp = (sndseq_susp_type) a_susp;
|
|
sound_xlmark(susp->s1);
|
|
if (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;
|
|
long 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);
|
|
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 = susp->terminate_cnt - susp->susp.current;
|
|
}
|
|
|
|
/* don't run past logical stop time */
|
|
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN) {
|
|
int to_stop = susp->susp.log_stop_cnt - susp->susp.current;
|
|
togo = 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);
|
|
|
|
indent(n);
|
|
stdputstr("closure:");
|
|
stdprint(susp->closure);
|
|
|
|
indent(n);
|
|
stdputstr("s2:");
|
|
sound_print_tree_1(susp->s2, n);
|
|
}
|
|
|
|
|
|
|
|
|
|
sound_type snd_make_sndseq(s1, closure)
|
|
sound_type s1;
|
|
LVAL closure;
|
|
{
|
|
register 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->s2_phase_incr = ??
|
|
susp->output_per_s2 = ?? */
|
|
susp->closure = closure;
|
|
result = sound_create((snd_susp_type)susp, susp->susp.t0, susp->susp.sr, scale_factor);
|
|
xlpopn(1);
|
|
return result;
|
|
}
|
|
|
|
|
|
sound_type snd_sndseq(s1, closure)
|
|
sound_type s1;
|
|
LVAL closure;
|
|
{
|
|
sound_type s1_copy;
|
|
s1_copy = sound_copy(s1);
|
|
return snd_make_sndseq(s1_copy, closure);
|
|
}
|