mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-20 22:30:05 +02: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
908 lines
34 KiB
C
908 lines
34 KiB
C
/* add.c -- add two signals */
|
|
/* CHANGE LOG
|
|
* 19May92 rbd fix t0 to mean time rather than samples
|
|
fix to logically stop and terminate at MAX of 2 inputs
|
|
* 28Apr03 dm changes for portability and fix compiler warnings
|
|
*/
|
|
|
|
/* DOCUMENTATION:
|
|
Most DSP modules in Nyquist select a single fetch routine
|
|
and use it until the signal terminates. The ADD operation
|
|
instead can use a number of different fetch routines in sequence.
|
|
This allows ADD to do the most efficient computation, such as
|
|
simply copying pointers when only one input signal is defined
|
|
(the other is zero.)
|
|
Here's what the functions assume and do:
|
|
add_s1_s2_nn_fetch: both arguments (s1, s2) have signals; add
|
|
them.
|
|
add_s1_nn_fetch: only s1 is active, so pass along pointers if
|
|
possible. Revert to add_s1_s2_nn_fetch when s2 becomes active.
|
|
add_s2_nn_fetch: symetric with add_s1_nn_fetch.
|
|
add_zero_fill_nn_fetch: fill in when one input has terminated and
|
|
the other hasn't begun.
|
|
|
|
An important optimization (we think) is the ability to collapse
|
|
ADD operations. When one operand goes to zero, the ADD just
|
|
passes along pointers to blocks from the other operand. In some
|
|
cases, we can just splice out the ADD suspension and link
|
|
directly to the suspension of the second operand.
|
|
|
|
Doing this requires that there be no scale factors, so ADD does
|
|
not deal with scaling. If an operand comes in with a scale
|
|
factor, ADD will create a rescaling of the operand.
|
|
*/
|
|
|
|
#include "switches.h"
|
|
#include "stdio.h"
|
|
#ifndef mips
|
|
#include "stdlib.h"
|
|
#endif
|
|
#include "xlisp.h"
|
|
#include "sound.h"
|
|
#include "falloc.h"
|
|
#include "cext.h"
|
|
#include "scale.h"
|
|
#include "multiseq.h"
|
|
#include "add.h"
|
|
#include "assert.h"
|
|
|
|
|
|
#define debugA 0
|
|
#define A if (debugA)
|
|
/* I don't know how these debug switches (A and D) differ: */
|
|
#define D A
|
|
|
|
/* switch B is/was to look for a particular zero block length bug */
|
|
#define debugB 0
|
|
#define B if (debugB | debugA)
|
|
|
|
/* #define GC_DEBUG 1 */
|
|
|
|
|
|
void add_s1_s2_nn_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
int cnt = 0; /* how many samples computed */
|
|
int togo;
|
|
int n;
|
|
sample_block_type out;
|
|
register sample_block_values_type out_ptr;
|
|
register sample_block_values_type s1_ptr_reg;
|
|
register sample_block_values_type s2_ptr_reg;
|
|
register sample_block_values_type out_ptr_reg;
|
|
|
|
#ifdef GC_DEBUG
|
|
snd_list_report(snd_list, "add_s1_s2_nn_fetch");
|
|
#endif
|
|
/* assume the 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, "add_s1_s2_nn_fetch");
|
|
snd_list->block = out;
|
|
out_ptr = out->samples;
|
|
A nyquist_printf("add[%p,%p] (s1_s2_nn) %p new block %p\n",
|
|
susp->s1, susp->s2, susp, out);
|
|
|
|
/* fill up the new block */
|
|
while (cnt < max_sample_block_len && susp->terminate_bits == 0) {
|
|
A nyquist_printf("add[%p,%p] (s1_s2_nn) %p starting outer loop, cnt %d\n",
|
|
susp->s1, susp->s2, susp, cnt);
|
|
|
|
/* first compute how many samples to generate in inner loop: */
|
|
/* don't overflow the output sample block: */
|
|
togo = max_sample_block_len - cnt;
|
|
|
|
/* don't run past the s1 input sample block: */
|
|
A nyquist_printf("add[%p,%p]: look for samples (for s1) \n", susp->s1, susp->s2);
|
|
/* if (!susp->s1->list->block) watch_susp(susp->s1->list->u.susp); */
|
|
susp_check_term_log_block_samples(s1, s1_bptr, s1_ptr, s1_cnt, 1, 3);
|
|
A nyquist_printf("add[%p,%p]: found samples (for s1) s1_cnt=%d\n",
|
|
susp->s1, susp->s2, (int)susp->s1_cnt);
|
|
togo = MIN(togo, susp->s1_cnt);
|
|
if (susp->terminate_bits & 1) {
|
|
A nyquist_printf("add[%p,%p]: terminate bits on (for s1) togo=%d\n",
|
|
susp->s1, susp->s2, togo);
|
|
}
|
|
|
|
/* don't run past the s2 input sample block: */
|
|
A nyquist_printf("add[%p,%p]: look for samples (for s2) \n", susp->s1, susp->s2);
|
|
susp_check_term_log_block_samples(s2, s2_bptr, s2_ptr, s2_cnt, 2, 3);
|
|
A nyquist_printf("add[%p,%p]: found samples (for s2) s2_cnt=%d\n",
|
|
susp->s1, susp->s2, (int)susp->s2_cnt);
|
|
togo = MIN(togo, susp->s2_cnt);
|
|
A if (susp->terminate_bits & 2) {
|
|
nyquist_printf("add[%p,%p]: terminate bits on (for s2) togo=%d\n",
|
|
susp->s1, susp->s2, togo);
|
|
}
|
|
|
|
/* don't run past logical stop time (need to check this even
|
|
* if a sound has terminated)
|
|
*/
|
|
A nyquist_printf(
|
|
"add[%p,%p] (s1_s2_nn) %p: logically_stopped %d, logical_stop_cnt %d, s1 logical_stop_cnt %ld, s2 logical_stop_cnt %ld \n",
|
|
susp->s1, susp->s2, susp, susp->logically_stopped,
|
|
(int) susp->susp.log_stop_cnt,
|
|
susp->s1->logical_stop_cnt,
|
|
susp->s2->logical_stop_cnt);
|
|
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN &&
|
|
(susp->logical_stop_bits == 3)) {
|
|
int to_stop = susp->susp.log_stop_cnt - (susp->susp.current + cnt);
|
|
A nyquist_printf("add[%p,%p]: to_stop = %d\n", susp->s1, susp->s2, to_stop);
|
|
/* logical stops have to be indicated on block boundaries */
|
|
if (to_stop < togo) {
|
|
if (to_stop == 0) {
|
|
if (cnt) {
|
|
togo = 0;
|
|
break; /* block is non-empty, log-stop on next block */
|
|
} else /* to_stop is 0, indicate logical stop immediately */
|
|
susp->logically_stopped = true;
|
|
} else {
|
|
/* logical stop will take place on the following block,
|
|
* so compute up to logical stop and return partial block
|
|
*/
|
|
togo = to_stop;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* check please */
|
|
if (susp->terminate_bits) {
|
|
break;
|
|
}
|
|
|
|
/* don't run past terminate time */
|
|
if (susp->terminate_cnt != UNKNOWN &&
|
|
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
|
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
|
D nyquist_printf("add[%p,%p]: togo = %d\n", susp->s1, susp->s2, togo);
|
|
if (togo == 0) break;
|
|
}
|
|
|
|
n = togo;
|
|
A nyquist_printf("add[%p,%p] (s1_s2_nn) %p starting inner loop, n %d\n",
|
|
susp->s1, susp->s2, susp, n);
|
|
s1_ptr_reg = susp->s1_ptr;
|
|
s2_ptr_reg = susp->s2_ptr;
|
|
out_ptr_reg = out_ptr;
|
|
if (n) do { /* the inner sample computation loop */
|
|
/* scale? */
|
|
/*A nyquist_printf("add_s1_s2_nn: %g + %g\n", *s1_ptr_reg, *s2_ptr_reg); */
|
|
*out_ptr_reg++ = *(s1_ptr_reg++) + *(s2_ptr_reg++);
|
|
} while (--n); /* inner loop */
|
|
/* using s1_ptr_reg is a bad idea on RS/6000 */
|
|
susp->s1_ptr += togo;
|
|
/* using s2_ptr_reg is a bad idea on RS/6000 */
|
|
susp->s2_ptr += togo;
|
|
/* using out_ptr_reg is a bad idea on RS/6000 */
|
|
out_ptr += togo;
|
|
susp_took(s1_cnt, togo);
|
|
susp_took(s2_cnt, togo);
|
|
cnt += togo;
|
|
} /* outer loop */
|
|
|
|
A nyquist_printf("add[%p,%p] (s1_s2_nn) %p ending outer loop, cnt %d\n",
|
|
susp->s1, susp->s2, susp, cnt);
|
|
|
|
snd_list->block_len = cnt;
|
|
|
|
/* test for logical stop - normally this is detected by
|
|
* susp.log_stop_cnt == susp->susp.current, but then the logical
|
|
* stop flag is set on the NEXT block. To remember to set on the
|
|
* NEXT block, set susp->logically_stopped, which is also tested
|
|
* below. One special case is if the current block should indicate
|
|
* logically stopped (this happens sometimes when the sounds have
|
|
* zero logical length) then susp->logically_stopped will be set
|
|
* (see above) and we just never test susp->susp.log_stop_cnt.
|
|
*/
|
|
if (susp->logically_stopped) {
|
|
A nyquist_printf("add[%p,%p] (s1_s2_nn) %p->logically_stopped already true\n",
|
|
susp->s1, susp->s2, susp);
|
|
snd_list->logically_stopped = true;
|
|
} else if (susp->susp.log_stop_cnt == susp->susp.current &&
|
|
susp->logical_stop_bits == 3) {
|
|
A nyquist_printf("add[%p,%p] (s1_s2_nn) %p->logically_stopped set to true\n",
|
|
susp->s1, susp->s2, susp);
|
|
susp->logically_stopped = true;
|
|
}
|
|
|
|
/* test for termination of s1 */
|
|
if (susp->terminate_bits == 3) {
|
|
D nyquist_printf("add[%p,%p] (s1_s2_nn) s1 and s2 terminated, unrefed\n",
|
|
susp->s1, susp->s2);
|
|
/* free susp and point to terminal zeros (leaving pending snd_lists)*/
|
|
if (cnt) {
|
|
/* we have samples, put zero_block at end */
|
|
snd_list_unref(snd_list->u.next);
|
|
snd_list->u.next = zero_snd_list;
|
|
} else {
|
|
/* no samples generated */
|
|
snd_list_terminate(snd_list);
|
|
}
|
|
D nyquist_printf("add[%p,%p] (s1_s2_nn) %p terminated.\n",
|
|
susp->s1, susp->s2, susp);
|
|
} else {
|
|
if (susp->terminate_bits & 1) {
|
|
D nyquist_printf("add[%p,%p] (s1_s2_nn) s1 terminated, unrefed\n",
|
|
susp->s1, susp->s2);
|
|
sound_unref(susp->s1);
|
|
susp->s1 = NULL;
|
|
susp->susp.fetch = add_s2_nn_fetch;
|
|
D nyquist_printf("add_s1_s2_nn_fetch: add_s2_nn_fetch installed\n");
|
|
if (cnt == 0) {
|
|
D nyquist_printf("add[%p,%p]: calling add_s2_nn_fetch\n",
|
|
susp->s1, susp->s2);
|
|
add_s2_nn_fetch(a_susp, snd_list);
|
|
}
|
|
}
|
|
else if (susp->terminate_bits & 2) {
|
|
D nyquist_printf("add[%p,%p] (s1_s2_nn) s2 terminated, unrefed\n",
|
|
susp->s1, susp->s2);
|
|
sound_unref(susp->s2);
|
|
susp->s2 = NULL;
|
|
susp->susp.fetch = add_s1_nn_fetch;
|
|
D stdputstr("add_s1_s2_nn_fetch: add_s1_nn_fetch installed\n");
|
|
if (cnt == 0) {
|
|
D nyquist_printf("add[%p,%p]: calling add_s1_nn_fetch\n",
|
|
susp->s1, susp->s2);
|
|
add_s1_nn_fetch(a_susp, snd_list);
|
|
}
|
|
}
|
|
|
|
/* add a new snd_list for the susp */
|
|
susp->susp.current += cnt;
|
|
}
|
|
|
|
} /* add_s1_s2_nn_fetch */
|
|
|
|
|
|
|
|
/* Note that add_s1_nn_fetch and add_s2_nn_fetch are symetric.
|
|
* They should probably be made into one routine, but for now,
|
|
* any changes to one should be made to the other.
|
|
*/
|
|
void add_s1_nn_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
/* expansion of add_s_nn_fetch(snd_list,s1,s2,1); follows: */
|
|
int togo, s2_start=0;
|
|
int n;
|
|
sample_block_type out;
|
|
register sample_block_values_type out_ptr;
|
|
|
|
D nyquist_printf("add_s1_nn_fetch(susp %p, snd_list %p, s1_cnt %d)\n",
|
|
susp, snd_list, (int)susp->s1_cnt);
|
|
|
|
#ifdef GC_DEBUG
|
|
snd_list_report(snd_list, "add_s1_nn_fetch");
|
|
#endif
|
|
/*
|
|
* first compute how many samples to copy (or transfer)
|
|
*/
|
|
|
|
/* see what the next samples look like */
|
|
susp_check_term_log_block_samples(s1, s1_bptr,
|
|
s1_ptr, s1_cnt, 1, 3);
|
|
B if (susp->terminate_bits & 1)
|
|
nyquist_printf("add[%p,%p]: s1 terminates\n", susp->s1, susp->s2);
|
|
|
|
/* don't run past the s1 input sample block: */
|
|
togo = susp->s1_cnt;
|
|
B if (togo == 0) stdputstr("togo is zero at checkpoint 1\n");
|
|
|
|
/* don't run past terminate time of this signal */
|
|
/* if (susp->s1_ptr == zero_block->samples) { -sep21 RBD*/
|
|
if (susp->terminate_bits & 1) {
|
|
if (susp->s2) {
|
|
s2_start = (long) ((susp->s2->t0 - susp->susp.t0) *
|
|
susp->s2->sr + 0.5);
|
|
D nyquist_printf("add_s_nn_fetch: s2_start %d\n", s2_start);
|
|
}
|
|
togo = 0;
|
|
B if (togo == 0) stdputstr("togo is zero at checkpoint 2\n");
|
|
if (susp->s2 && susp->susp.current == s2_start) {
|
|
/* s2 starting and s1 stops */
|
|
/* go to s2 alone state */
|
|
sound_unref(susp->s1);
|
|
susp->s1 = NULL;
|
|
susp->susp.fetch = add_s2_nn_fetch;
|
|
D stdputstr("add_s_nn_fetch: other installed, calling now...\n");
|
|
add_s2_nn_fetch(a_susp, snd_list);
|
|
} else if (susp->s2 && susp->susp.current < s2_start) {
|
|
/* s2 not started and s1 stops */
|
|
/* go to zero-fill state */
|
|
sound_unref(susp->s1);
|
|
susp->s1 = NULL;
|
|
susp->susp.fetch = add_zero_fill_nn_fetch;
|
|
B stdputstr("add_s_nn_fetch: zero_fill installed\n");
|
|
add_zero_fill_nn_fetch(a_susp, snd_list);
|
|
} else if (susp->s2) {
|
|
D stdputstr("add_s_nn_fetch: unexpected condition\n");
|
|
EXIT(1);
|
|
} else /* no s2 */ {
|
|
snd_list_terminate(snd_list);
|
|
}
|
|
D nyquist_printf("add_s_nn_fetch: special return, susp %p\n", susp);
|
|
return; /* fetching taken care of by another routine */
|
|
}
|
|
/* 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 &&
|
|
susp->logical_stop_bits == 3) {
|
|
int to_stop = susp->susp.log_stop_cnt - susp->susp.current;
|
|
if (to_stop < togo) {
|
|
if (to_stop == 0) {
|
|
susp->logically_stopped = true;
|
|
} else togo = to_stop;
|
|
}
|
|
B if (togo == 0) stdputstr("togo is zero at checkpoint 3\n");
|
|
D nyquist_printf("add_s1_nn_fetch: to_stop %d togo %d\n", to_stop, togo);
|
|
}
|
|
|
|
/* consider other signal? don't run past its start time... */
|
|
if (susp->s2) {
|
|
s2_start = ROUND32((susp->s2->t0 - susp->susp.t0) *
|
|
susp->s2->sr);
|
|
if (s2_start < susp->susp.current + togo)
|
|
togo = MIN(togo, s2_start - susp->susp.current);
|
|
B if (togo == 0) stdputstr("togo is zero at checkpoint 4\n");
|
|
}
|
|
|
|
/*
|
|
* 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)
|
|
* 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 */
|
|
if (0) nyquist_printf("add[%p,%p] (s%d_nn) %p starting uncopy, togo %d\n", susp->s1, susp->s2,
|
|
1, susp, togo);
|
|
snd_list->block = susp->s1_bptr;
|
|
(susp->s1_bptr->refcnt)++;
|
|
if (0) nyquist_printf("add[%p,%p] (s%d_nn) %p shared block %p zero_block %p\n",susp->s1, susp->s2,
|
|
1, susp, susp->s1_bptr, zero_block);
|
|
|
|
susp_took(s1_cnt, togo);
|
|
snd_list->block_len = togo;
|
|
|
|
/* if other is terminated and sound_types match, collapse */
|
|
/* NOTE: in order to collapse, we need s1 to be generating
|
|
* blocks and linking them onto a sound list. This is true
|
|
* when the get_next fn is SND_get_next. (A counterexample is
|
|
* SND_get_zeros, which returns zero blocks but does not link
|
|
* them onto the sound list.
|
|
*/
|
|
if (0) nyquist_printf("s2 %p thissr %g suspsr %g get_next %d lsc %d\n",
|
|
susp->s2, susp->s1->sr, susp->susp.sr,
|
|
susp->s1->get_next == SND_get_next,
|
|
susp->s1->logical_stop_cnt == UNKNOWN);
|
|
if (susp->s2 == NULL && susp->s1->sr == susp->susp.sr &&
|
|
susp->s1->get_next == SND_get_next &&
|
|
susp->s1->logical_stop_cnt == UNKNOWN) {
|
|
snd_list_type addend_list;
|
|
D nyquist_printf("add[%p,%p]: collapsing! LSC %d\n", susp->s1, susp->s2,
|
|
(int)susp->s1->logical_stop_cnt);
|
|
D sound_print_tree(susp->s1);
|
|
/* will "current" values match? */
|
|
/* test for logical stop */
|
|
if (susp->logically_stopped) {
|
|
snd_list->logically_stopped = true;
|
|
}
|
|
else if (susp->susp.log_stop_cnt == susp->susp.current) {
|
|
susp->logically_stopped = true;
|
|
}
|
|
/* free the superfluous sound_type and susp */
|
|
addend_list = susp->s1->list->u.next;
|
|
snd_list_ref(addend_list);
|
|
snd_list_unref(snd_list->u.next);
|
|
snd_list->u.next = addend_list;
|
|
return;
|
|
}
|
|
} else {
|
|
/*
|
|
* we want to copy a partial block
|
|
*/
|
|
|
|
/* assume the 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, "add_s1_nn_fetch");
|
|
snd_list->block = out;
|
|
out_ptr = out->samples;
|
|
B nyquist_printf("add[%p,%p] (s1_nn) %p new block %p, s1_ptr %p block %p s1_cnt %d togo %d\n", susp->s1, susp->s2, susp, out, susp->s1_ptr, susp->s1_bptr->samples, (int)susp->s1_cnt, togo);
|
|
n = togo;
|
|
B if (togo == 0) stdputstr("togo is zero at checkpoint 5\n");
|
|
B if (togo == 0) nyquist_printf(
|
|
"add[%p,%p] (s%d_nn) %p starting copy loop, togo %d\n",
|
|
susp->s1, susp->s2, 1, 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;
|
|
|
|
D stdputstr("testing...");
|
|
/*
|
|
* test for termination or change of state,
|
|
* note s2_start computed earlier
|
|
*/
|
|
if (susp->s2 && susp->susp.current == s2_start &&
|
|
susp->s1->list != zero_snd_list) {
|
|
/* s2 starting and s1 continues */
|
|
/* go to s1+s2 state */
|
|
susp->susp.fetch = add_s1_s2_nn_fetch;
|
|
D stdputstr("add_s_nn_fetch: add_s1_s2_fetch installed\n");
|
|
} else if (susp->terminate_bits == 3) {
|
|
/* s2 finished and s1 stops */
|
|
/* go to terminal state */
|
|
susp->s1 = NULL;
|
|
D nyquist_printf("add_s_nn_fetch: go to terminal state. susp->s2 %p, \
|
|
susp->susp.current %d, s2_start %d, susp->s1->list %p, \
|
|
zero_snd_list %p\n", susp->s2, (int)susp->susp.current,
|
|
s2_start, susp->s1->list, zero_snd_list);
|
|
/* !!! free resources and set up pointers to terminal snd_list */
|
|
/* !!! logically stopped? */
|
|
}
|
|
|
|
/* test for logical stop */
|
|
if (susp->logically_stopped) {
|
|
D stdputstr("add_s_nn_fetch: snd_list->logically_stopped\n");
|
|
snd_list->logically_stopped = true;
|
|
} else if (susp->susp.log_stop_cnt == susp->susp.current &&
|
|
susp->logical_stop_bits == 3) {
|
|
D stdputstr("add_s_nn_fetch: susp->logically_stopped\n");
|
|
susp->logically_stopped = true;
|
|
}
|
|
D {
|
|
if (susp->logically_stopped || snd_list->logically_stopped)
|
|
stdputstr("STOPPED\n");
|
|
else nyquist_printf("ok: current %d\n", (int)susp->susp.current); }
|
|
}
|
|
|
|
|
|
void add_s2_nn_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
int togo, s1_start=0;
|
|
int n;
|
|
sample_block_type out;
|
|
register sample_block_values_type out_ptr;
|
|
|
|
D nyquist_printf("add_s2_nn_fetch(susp %p, snd_list %p)\n",
|
|
susp, snd_list);
|
|
|
|
#ifdef GC_DEBUG
|
|
snd_list_report(snd_list, "add_s2_nn_fetch");
|
|
#endif
|
|
|
|
/*
|
|
* first compute how many samples to copy (or transfer)
|
|
*/
|
|
|
|
/* see what the next samples look like */
|
|
susp_check_term_log_block_samples(s2, s2_bptr,
|
|
s2_ptr, s2_cnt, 2, 3);
|
|
|
|
/* don't run past the s2 input sample block: */
|
|
togo = susp->s2_cnt;
|
|
assert(togo > 0);
|
|
|
|
/* don't run past terminate time of this signal */
|
|
/* if (susp->s2_ptr == zero_block->samples) { -sep21 RBD*/
|
|
if (susp->terminate_bits & 2) {
|
|
if (susp->s1) {
|
|
s1_start = ROUND32((susp->s1->t0 - susp->susp.t0) *
|
|
susp->s1->sr);
|
|
if (0) nyquist_printf("add_s_nn_fetch: s1_start %d\n", s1_start);
|
|
}
|
|
togo = 0;
|
|
if (susp->s1 && susp->susp.current == s1_start) {
|
|
/* s1 starting and s2 stops */
|
|
/* go to s1 alone state */
|
|
sound_unref(susp->s2);
|
|
susp->s2 = NULL;
|
|
susp->susp.fetch = add_s1_nn_fetch;
|
|
D stdputstr("add_s_nn_fetch: other installed, calling now...\n");
|
|
add_s1_nn_fetch(a_susp, snd_list);
|
|
} else if (susp->s1 && susp->susp.current < s1_start) {
|
|
/* s1 not started and s2 stops */
|
|
/* go to zero-fill state */
|
|
sound_unref(susp->s2);
|
|
susp->s2 = NULL;
|
|
susp->susp.fetch = add_zero_fill_nn_fetch;
|
|
D stdputstr("add_s_nn_fetch: zero_fill installed\n");
|
|
add_zero_fill_nn_fetch(a_susp, snd_list);
|
|
} else if (susp->s1) {
|
|
D stdputstr("add_s_nn_fetch: unexpected condition\n");
|
|
EXIT(1);
|
|
} else /* no s1 */ {
|
|
snd_list_terminate(snd_list);
|
|
}
|
|
D nyquist_printf("add_s_nn_fetch: special return, susp %p\n", susp);
|
|
return; /* fetching taken care of by another routine */
|
|
}
|
|
/* 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 &&
|
|
/* check if we've seen the logical stop from s2. If so then
|
|
log_stop_cnt is max of s1 and s2 stop times */
|
|
(susp->logical_stop_bits & 2)) {
|
|
int to_stop;
|
|
D nyquist_printf("add_s2_nn_fetch: susp->susp.log_stop_cnt %ld\n",
|
|
susp->susp.log_stop_cnt);
|
|
D nyquist_printf("add_s2_nn_fetch: susp->susp.current %ld\n",
|
|
susp->susp.current);
|
|
to_stop = susp->susp.log_stop_cnt - susp->susp.current;
|
|
// to_stop can be less than zero if we've been adding in sounds with
|
|
// t0 less than the time when the sound is added. E.g. if the user
|
|
// wants a sequence of two sounds that start at 0, the second sound
|
|
// will be spliced onto the first because we don't look at it until
|
|
// the first finishes -- we cannot go back in time and start adding
|
|
// from time 0. This creates a mismatch between the sample count and
|
|
// the logical time, so we could actually set a logical stop time that
|
|
// is back in history, and therefore before susp.current, resulting
|
|
// in a negative to_stop. The problem is really with trying to
|
|
// sequence two sounds rather than two behaviors, and a warning has
|
|
// already been issued, so we'll just try not to crash here. It's too
|
|
// late to compute the correct answer, which would respect t0 of both
|
|
// sounds.
|
|
if (to_stop < 0) to_stop = 0;
|
|
if (to_stop < togo) {
|
|
if (to_stop == 0) {
|
|
susp->logically_stopped = true;
|
|
} else togo = to_stop;
|
|
}
|
|
B if (togo == 0) stdputstr("togo is zero at checkpoint 3\n");
|
|
D nyquist_printf("add_s2_nn_fetch: to_stop %d togo %d\n", to_stop, togo);
|
|
}
|
|
|
|
/* consider other signal? don't run past its start time... */
|
|
if (susp->s1) {
|
|
s1_start = ROUND32((susp->s1->t0 - susp->susp.t0) *
|
|
susp->s1->sr);
|
|
if (s1_start < susp->susp.current + togo)
|
|
togo = MIN(togo, s1_start - susp->susp.current);
|
|
assert(togo > 0);
|
|
}
|
|
|
|
/*
|
|
* 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)
|
|
* 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->s2_ptr == susp->s2_bptr->samples &&
|
|
susp->s2_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 */
|
|
D nyquist_printf("add[%p,%p] (s%d_nn) %p starting uncopy, togo %d\n", susp->s2, susp->s1,
|
|
2, susp, togo);
|
|
snd_list->block = susp->s2_bptr;
|
|
(susp->s2_bptr->refcnt)++;
|
|
D nyquist_printf("add[%p,%p] (s%d_nn) %p shared block %p zero_block %p\n",susp->s2, susp->s1,
|
|
2, susp, susp->s2_bptr, zero_block);
|
|
|
|
susp_took(s2_cnt, togo);
|
|
snd_list->block_len = togo;
|
|
|
|
/* if other is terminated and sound_types match, collapse */
|
|
/* NOTE: in order to collapse, we need s2 to be generating
|
|
* blocks and linking them onto a sound list. This is true
|
|
* when the get_next fn is SND_get_next. (A counterexample is
|
|
* SND_get_zeros, which returns zero blocks but does not link
|
|
* them onto the sound list.
|
|
*/
|
|
if (0) nyquist_printf("s1 %p thissr %g suspsr %g get_next %d lsc %d\n",
|
|
susp->s1, susp->s2->sr, susp->susp.sr,
|
|
susp->s2->get_next == SND_get_next,
|
|
susp->s2->logical_stop_cnt == UNKNOWN);
|
|
if (susp->s1 == NULL && susp->s2->sr == susp->susp.sr &&
|
|
susp->s2->get_next == SND_get_next &&
|
|
susp->s2->logical_stop_cnt == UNKNOWN) {
|
|
snd_list_type addend_list;
|
|
D nyquist_printf("add[%p,%p]: collapsing! LSC %d\n",
|
|
susp->s2, susp->s1, (int)susp->s2->logical_stop_cnt);
|
|
D sound_print_tree(susp->s2);
|
|
/* will "current" values match? */
|
|
/* test for logical stop */
|
|
if (susp->logically_stopped) {
|
|
snd_list->logically_stopped = true;
|
|
}
|
|
else if (susp->susp.log_stop_cnt == susp->susp.current) {
|
|
susp->logically_stopped = true;
|
|
}
|
|
/* free the superfluous sound_type and susp */
|
|
addend_list = susp->s2->list->u.next;
|
|
snd_list_ref(addend_list);
|
|
snd_list_unref(snd_list->u.next);
|
|
snd_list->u.next = addend_list;
|
|
return;
|
|
} else {
|
|
D nyquist_printf("s1 == NULL, but no collapse, lsc %ld\n",
|
|
susp->s2->logical_stop_cnt);
|
|
}
|
|
} else {
|
|
/*
|
|
* we want to copy a partial block
|
|
*/
|
|
|
|
/* assume the 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, "add_s2_nn_fetch");
|
|
snd_list->block = out;
|
|
out_ptr = out->samples;
|
|
B nyquist_printf("add[%p,%p] (s2_nn) %p new block %p\n",
|
|
susp->s2, susp->s1, susp, out);
|
|
n = togo;
|
|
if (n == 0)
|
|
stdputstr("zero block length error in add_s2_nn_fetch\n");
|
|
assert(n > 0);
|
|
B nyquist_printf(
|
|
"add[%p,%p] (s2_nn) %p starting copy loop, togo %d\n",
|
|
susp->s2, susp->s1, susp, togo);
|
|
while (n--) { /* the inner sample computation loop */
|
|
/* scale? */
|
|
*out_ptr++ = *(susp->s2_ptr++);
|
|
} /* inner loop */
|
|
|
|
susp_took(s2_cnt, togo);
|
|
snd_list->block_len = togo;
|
|
}
|
|
|
|
/* add a new snd_list for the susp */
|
|
susp->susp.current += togo;
|
|
|
|
if (0) stdputstr("testing...");
|
|
/*
|
|
* test for termination or change of state,
|
|
* note s1_start computed earlier
|
|
*/
|
|
if (susp->s1 && susp->susp.current == s1_start &&
|
|
susp->s2->list != zero_snd_list) {
|
|
/* s1 starting and s2 continues */
|
|
/* go to s1+s2 state */
|
|
susp->susp.fetch = add_s1_s2_nn_fetch;
|
|
D stdputstr("add_s_nn_fetch: add_s1_s2_fetch installed\n");
|
|
}
|
|
/* else if (!susp->s1 && susp->s2->list == zero_snd_list) { */
|
|
else if (susp->terminate_bits == 3) {
|
|
/* s1 finished and s2 stops */
|
|
/* go to terminal state */
|
|
susp->s2 = NULL;
|
|
D nyquist_printf("add_s_nn_fetch: go to terminal state. susp->s1 %p, \
|
|
susp->susp.current %d, s1_start %d, susp->s2->list %p, \
|
|
zero_snd_list %p\n", susp->s1, (int)susp->susp.current,
|
|
s1_start, susp->s2->list, zero_snd_list);
|
|
/* !!! free resources and set up pointers to terminal snd_list */
|
|
/* !!! logically stopped? */
|
|
}
|
|
|
|
/* test for logical stop */
|
|
if (susp->logically_stopped) {
|
|
D stdputstr("add_s_nn_fetch: snd_list->logically_stopped\n");
|
|
snd_list->logically_stopped = true;
|
|
} else if (susp->susp.log_stop_cnt == susp->susp.current &&
|
|
(susp->logical_stop_bits & 2)) {
|
|
D stdputstr("add_s_nn_fetch: susp->logically_stopped\n");
|
|
susp->logically_stopped = true;
|
|
}
|
|
if (0) {
|
|
if (susp->logically_stopped || snd_list->logically_stopped)
|
|
stdputstr("STOPPED\n");
|
|
else
|
|
nyquist_printf("ok: current %d\n", (int)susp->susp.current);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void add_zero_fill_nn_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
int togo, s_start=0;
|
|
|
|
#ifdef GC_DEBUG
|
|
snd_list_report(snd_list, "add_zero_fill_nn_fetch");
|
|
#endif
|
|
togo = max_sample_block_len;
|
|
|
|
if (0) fprintf(STDERR, "add_zero_fill_nn_fetch, susp.current %d\n",
|
|
(int)susp->susp.current);
|
|
/* don't run past start time ... */
|
|
if (susp->s1) {
|
|
s_start = ROUND32((susp->s1->t0 - susp->susp.t0) * susp->s1->sr);
|
|
if (s_start < susp->susp.current + togo) {
|
|
togo = s_start - susp->susp.current;
|
|
}
|
|
} else if (susp->s2) {
|
|
s_start = ROUND32((susp->s2->t0 - susp->susp.t0) * susp->s2->sr);
|
|
if (s_start < susp->susp.current + togo) {
|
|
togo = s_start - susp->susp.current;
|
|
}
|
|
}
|
|
|
|
snd_list->block_len = togo;
|
|
susp->susp.current += togo;
|
|
/*
|
|
* test for change of state,
|
|
* note s_start computed earlier
|
|
*/
|
|
if (susp->s1 && susp->susp.current == s_start) {
|
|
/* s1 starting, go to s1 state */
|
|
susp->susp.fetch = add_s1_nn_fetch;
|
|
D stdputstr("add_zero_fill_nn_fetch: add_s1_nn_fetch installed\n");
|
|
} else if (susp->s2 && susp->susp.current == s_start) {
|
|
/* s2 starting, go to s2 state */
|
|
susp->susp.fetch = add_s2_nn_fetch;
|
|
D stdputstr("add_zero_fill_nn_fetch: add_s2_nn_fetch installed\n");
|
|
}
|
|
} /* add_zero_fill_nn_fetch */
|
|
|
|
|
|
void add_free(snd_susp_type a_susp)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
sound_unref(susp->s1);
|
|
sound_unref(susp->s2);
|
|
ffree_generic(susp, sizeof(add_susp_node), "add_free");
|
|
}
|
|
|
|
|
|
void add_mark(snd_susp_type a_susp)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
/* nyquist_printf("add_mark(%p)\n", susp);*/
|
|
/* nyquist_printf("marking s1@%p in add@%p\n", susp->s1, susp);*/
|
|
sound_xlmark(susp->s1);
|
|
/* nyquist_printf("marking s2@%p in add@%p\n", susp->s2, susp);*/
|
|
sound_xlmark(susp->s2);
|
|
|
|
}
|
|
|
|
|
|
void add_print_tree(snd_susp_type a_susp, int n)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
indent(n);
|
|
nyquist_printf("logically_stopped %d logical_stop_bits %d terminate_bits %d\n",
|
|
susp->logically_stopped, susp->logical_stop_bits, susp->terminate_bits);
|
|
indent(n);
|
|
stdputstr("s1:");
|
|
if (susp->s1) sound_print_tree_1(susp->s1, n);
|
|
else stdputstr(" NULL\n");
|
|
|
|
indent(n);
|
|
stdputstr("s2:");
|
|
if (susp->s2) sound_print_tree_1(susp->s2, n);
|
|
else stdputstr(" NULL\n");
|
|
}
|
|
|
|
|
|
sound_type snd_make_add(sound_type s1, sound_type s2)
|
|
{
|
|
register add_susp_type susp;
|
|
rate_type sr = MAX(s1->sr, s2->sr);
|
|
time_type t0 = MIN(s1->t0, s2->t0);
|
|
int interp_desc = 0;
|
|
double sample_offset;
|
|
|
|
/* sort commutative signals: (S1 S2) */
|
|
snd_sort_2(&s1, &s2, sr);
|
|
|
|
falloc_generic(susp, add_susp_node, "snd_make_add");
|
|
|
|
/* select a susp fn based on sample rates */
|
|
interp_desc = (interp_style(s1, sr) << 2) + interp_style(s2, sr);
|
|
switch (interp_desc) {
|
|
case INTERP_nn:
|
|
case INTERP_ns:
|
|
case INTERP_ss:
|
|
/* eliminate scale factor on s1 if any */
|
|
if (((interp_desc >> INTERP_SHIFT) & INTERP_MASK) == INTERP_s) {
|
|
/* stdputstr("add: prescaling s1\n");*/
|
|
s1 = snd_make_normalize(s1);
|
|
}
|
|
/* eliminate scale factor on s2 if any */
|
|
if ((interp_desc & INTERP_MASK) == INTERP_s) {
|
|
/* stdputstr("add: prescaling s2\n"); */
|
|
s2 = snd_make_normalize(s2);
|
|
}
|
|
sample_offset = (s2->t0 - s1->t0) * sr;
|
|
if (sample_offset >= 0.5) { /* s1 starts first */
|
|
susp->susp.fetch = add_s1_nn_fetch;
|
|
D stdputstr("snd_make_add: add_s1_nn_fetch installed\n");
|
|
} else if (sample_offset < -0.5) { /* s2 starts first */
|
|
susp->susp.fetch = add_s2_nn_fetch;
|
|
D stdputstr("snd_make_add: add_s2_nn_fetch installed\n");
|
|
} else { /* equal start times */
|
|
susp->susp.fetch = add_s1_s2_nn_fetch;
|
|
D stdputstr("snd_make_add: add_s1_s2_nn_fetch installed\n");
|
|
}
|
|
break;
|
|
case INTERP_ni:
|
|
case INTERP_nr:
|
|
errputstr("add: can't interpolate!\n");
|
|
EXIT(1);
|
|
default:
|
|
errputstr("add: can't add these operands!\n");
|
|
EXIT(1);
|
|
}
|
|
|
|
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 = add_free;
|
|
susp->susp.sr = sr;
|
|
susp->susp.t0 = t0;
|
|
susp->susp.mark = add_mark;
|
|
susp->susp.print_tree = add_print_tree;
|
|
susp->susp.name = "add";
|
|
susp->logically_stopped = false;
|
|
susp->susp.log_stop_cnt = UNKNOWN;
|
|
susp->started = false;
|
|
susp->susp.current = 0;
|
|
susp->s1 = s1;
|
|
susp->s1_cnt = 0;
|
|
susp->s2 = s2;
|
|
susp->s2_cnt = 0;
|
|
#ifdef UPSAMPLECODE
|
|
susp->susp.s2_phase = 0.0;
|
|
susp->susp.s2_phase_incr = s2->sr / sr;
|
|
susp->susp.output_per_s2 = sr / s2->sr;
|
|
#endif
|
|
return sound_create((snd_susp_type)susp, t0, sr, 1.0);
|
|
}
|
|
|
|
|
|
sound_type snd_add(sound_type s1, sound_type s2)
|
|
{
|
|
sound_type s1_copy = sound_copy(s1);
|
|
sound_type s2_copy = sound_copy(s2);
|
|
/* nyquist_printf("snd_add %p %p copied to %p %p\n", s1, s2, s1_copy, s2_copy); */
|
|
return snd_make_add(s1_copy, s2_copy);
|
|
}
|