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

    removed some redundant files that moved to nyquist extensions

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

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

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

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

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

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

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

    Final change? for v3.14 on Mac

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

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

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

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

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

    path problems in some extensions and minor changes for mac release

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

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

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

    minor fix for mac release

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

    Retry release on Mac, minor changes.

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

    Updated documentation; building 3.14 for mac release

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

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

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

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

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

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

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

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

    Installer code sets registry to user-selected nyquist directory.

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

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

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

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

    Added some documentation, worked on browser #anchor urls.

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

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

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

    added one more missing file for v3.13

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

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

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

    More cleanup for 3.13 release

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

    More changes for 3.13 including status dialog while downloading extensions.

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

    Updated documentation for v3.13

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

    Converted to using Extension Manager

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

    Forgot to commit this new file

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

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

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

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

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

    Fix type-checking bug in score-voice

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

    Updated nyqrelide.iss for Roger's newer windows laptop

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

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

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

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

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

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

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

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

    Fixed version number in IDE About box

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

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

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

    Processed documentation for v3.12

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

    Preparing v3.12.

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

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

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

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

    Forgot to include this in the repo

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

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

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

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

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

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

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

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

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

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

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

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

    minor change during release from OS X

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

    Making new release

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

    Adding missing file to repo.

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

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

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

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

    moved to test/

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    Updated documentation with minor additions and corrections.

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

    Fixed file name for Browser

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

    Changes to fix compilation on OS X

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

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

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

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

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

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

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

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

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

    more file and path problems fixed

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

    fixed lpc demo

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

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

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

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

    Forgot to add new demo files

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

    fixed downsample.c, other minor release problems

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

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

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

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

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

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

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

    Made revisions for 3.10. Not quite done yet.

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

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

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

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

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

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

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

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

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

    Fixed some problems and warnings when compiling on Ubuntu Linux

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

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

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

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

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

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

    still more missing files

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

    more missing files

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

    another missing file

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

    repo missing a file

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

    repo is missing a file

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

    cleaned out files we don't use

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

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

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

    FLAC changes were incomplete. This revision compiles.

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

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

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

    I updated libvorbis from 1.3.5 and deleted unneeded files

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

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

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

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

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

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

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

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

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

    Update version numbers to 3.10

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

    minor bug fixes

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

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

531 lines
23 KiB
C

/* phasevocoder.c -- this is a time-stretching phase vocoder.
Design notes: we will use the "absolute" interface of the cmupv library.
"Absolute" means that rather than giving the phase vocoder a hop size
with which to move through the input (thus input position is
"relative"), a callback gives an exact input location. Thus, the input
parameters to the phase vocoder will be the input sound and a mapping
from output time to input time. For each frame of output, we'll get a
callback asking for input. In the callback, we'll evaluate the mapping
up to the frame's center time, using interpolation if necessary, and
then evaluate the input sound as needed to find an input frame at the
mapped time.
Because Nyquist sounds are computed incrementally, the phase vocoder
input position must be non-decreasing. This will result in an
interface similar to the sound-warp function. The documentation for
sound-warp has a detailed explanation of the warp-fn parameter that
maps between "score" time and real time.
It should be possible to build on the phase vocoder to provide pitch
manipulation as well as time stretching, including using high quality
resampling provided in sound-warp. Extending the sound-warp interface,
suppose we have two control functions. One, called warp-fn maps from
"score" time to real time (as in sound-warp). Another, called pitch-fn
provides a frequency scale factor (>0) as a function of "score" time.
For example, supposed the input is 10s long. To transpose continuously
from 0 to 12 semitones, the pitch-fn can be pwev(1, 10, 2), generating
an exponential sweep from 1 to 2 over the course of the sound. To
simultaneously slow the tempo gradually by a factor of 2, let's use
the same function, pwev(1, 10, 2). If we integrate, we get a function
from score time to real time (warp-fn), so taking the inverse, we get
a function from real time to score time, which can be used to find the
location of each input frame for processing.
This is not really the solution because we want to incorporate
additional stretching to allow for resampling to change the pitch.
Consider the construction of time stretching and pitch shifting
functions that simultaneously produce the right time mappings and
pitch shifting. We will first apply the phase vocoder, then apply
resampling.
Let V(u) be the mapping from phase vocoder output time to input time,
and let Vinv(t) be the inverse ov V(u).
Let W(u) be the mapping from phase vocoder output time to final output
time, i.e. this is the sound-warp mapping.
Let S(t) be the stretch factor to be applied at time t (of the input).
Let P(t) be the pitch transposition to be applied at time t (of the input).
We can compute Vinv(t) by considering the following: At time t, the
signal must be stretched by the product S(t)*P(t) because S(t) is the
stretch factor, and because we need to stretch by an additional factor
of P(t) so that when we resample to achieve pitch transposition,
effectively stretching by 1/P(t), the net stretch due to transposition
will be 1.
Thus, Vinv(t) = Integral[S(t)*P(t)]. V(u) is derived by taking the
inverse of Vinv(t), a primitive operation in Nyquist.
Now we need W(u). The input to the sound-warp (resampling) function
will have the pitch of the original signal because the phase vocoder
preserves pitch. At each point u, the pitch change applied to the
signal will be the inverse of the derivative of W(u):
Pitch change at u = 1/W'(u)
The "pitch change at u" is P(V(u)) and we know V, so we can write
W'(u) = 1/P(V(u))
thus, W(u) = Integral[1/P(V(u))]
INTERFACE WTIH CMUPV
--------------------
f is the input sound
g is the map from output to input
Samples are computed by pv_fetch which has a state[] field
available as well as an interface to get samples from input
signals. The state[] is only accessible to pv_fetch because
it is inside a pvshell_susp_node, which is local within
pvshell.c. (This may not be the best design.) Therefore, to
create the phase vocoder object and save a pointer in the
state, we test for the first call to pv_fetch and do some
initialization there instead of in snd_vocoder where the
suspension is created.
Output is taken from OUTPUT as needed until REMAINING is zero.
Then, pv_get_output2() is called to generate more samples.
pv_get_output2() calls the callback, which does most of the complex work.
(1) The callback must figure out the "time" of the next frame it will
generate. This will be based on out_count provided to the callback.
(2) Map this time via g to an input time for f and convert to samples.
(3) Subtract framesize / 2 to get the first_sample we need from f.
(4) f_count is the total sample count for the end of input so the beginning
of input is at f_count - fftsize. first_sample is the place we want
to start the next frame, so we need to skip over
first_sample - (f_count - fftsize) samples.
(5) fill the rest of input from f.
Logical Stop and Terminate Logic
--------------------------------
The logical stop time should be the logical stop time of the input (f)
mapped to the output. Since g is a map from output time to input time, we want
g(output.lst) = f.lst, or output.lst = g-inverse(f.lst)
In practice, we're not given g-inverse and would like not to compute
it. We iterate through g to find g(t) for each fft frame center time. When
we reach the logical stop time of the input, detected by PVSHELL_TEST_F
returning PVSHELL_FLAG_LOGICAL_STOP, we can set the logical stop time of
the output by linearly interpolation. We save previous time points in g as
t0,g0 and t1,g1, where g0 = g(t0) and g1 = g(t1). We have the logical stop
time of f that we'll call g2 and we want the corresponding t2:
(t1 - t0)/(t2 - t0) = (g1 - g0)/(g2 - g0), so
(t1 - t0) = (t2 - t0) * (g1 - g0)/(g2 - g0), so
t1 = t0 + (t2 - t0) * (g1 - g0)/(g2 - g0), where
t1 is the logical stop time.
The logical stop time can also be the terminate time of g -- if g
terminates, we must terminate the output (otherwise we'll be reading from
time 0 of the input, but we're not allowed to go backward.)
The terminate time is when the remaining output will be zero. Since the
phase vocoder output continues for half a window beyond the last point
mapped from input to output, we really don't want to try to do any mapping.
Instead, we just wait until the input is all zeros and figure out when the
output will be all zeros.
Input becomes all zero when either we get a frame past the terminate time
of the input f, or we reach beyond the terminate time of g. Either way, we
should set a flag saying input has terminated and will be all zero.
Output becomes all zero fftsize / 2 - hopsize beyond the time point of the
first all-zero frame: Let's say we see the flag saying the input is all
zero because we've terminated on the input side. The *previous* frame was
therefore the last non-zero signal, and it extends for fftsize/2, but it was
one hopsize ago, so the non-zero signal extends fftsize/2 - hopsize from the
time of the all-zero frame.
Access to PV state
------------------
Things start with a call to snd_phasevocoder(f, g, fftsize, hopsize). The
info is put into pv_state_node, which is passed to pvshell and copied into
susp->pvshell.state. The fetch function is pvshell_fetch, which calls
pv_fetch through the pointer susp->pvshell.h. h (which is pv_fetch) returns
flags to indicate logical stop and terminate, and it returns n, the number
of samples computed. If the terminate flag is set, the output is assumed to
be zero and the zero block is used.
The susp info and the pv_state_node info can be accessed in pv_fetch, but
the phase vocoder computation is in a callback. However, the parameter to
the callback is the susp pointer, so in the callback we can access the
pvshell_type and the pvstate_type data.
To return the flags, we have to stuff data into the
pvstate_type struct and read it back out in pv_fetch after calling
pv_get_output2(), which is the phase vocoder calculation that calls the
callback.
TODO: if g0 and t0 are not initialized because of early logical stop,
what do we do?
*/
#include "stdio.h"
#ifndef mips
#include "stdlib.h"
#endif
#include "xlisp.h"
#include "sound.h"
#include "falloc.h"
#include "cext.h"
#include "pvshell.h"
#include "phasevocoder.h"
#include "cmupv.h"
typedef struct pvstate_struct {
long f_count; /* how many samples have we taken from f? */
long g_count; /* how many samples have we taken from g? */
double g_prev; /* the previous value of g (at g_count - 2) */
double g_next; /* the current value of g (at g_count - 1) */
long sample_count; /* how many total samples computed, specifically
* the number of samples copied into Nyquist
* sample blocks via *out++ = pvs->output[index++];
*/
Phase_vocoder *pv; /* the phase vocoder object */
sample_type *input; /* a frame of samples to go into fft */
long input_count; /* sample number of first sample in input */
sample_type *output; /* output from phase vocoder */
long output_count; /* since we deliver samples on demand,
output_count keeps track of how much is left in output.
ouput[OUTPUT_SIZE - output_count] is the next sample to deliver */
int fftsize; /* the length of an fft frame */
int hopsize; /* the hopsize -- not used */
int mode; /* the mode -- see cmupv.h */
/* data to compute logical stop time */
long t0; /* output sample count of previous frame */
double g0; /* input time of previous frame center */
/* data to detect termination */
long f_terminated; /* set when f terminates */
long f_terminate_count; /* sample count of f when it terminates */
long g_terminated; /* set when g terminates */
long g_terminate_count; /* sample count of g when it terminates */
/* return values from pv_callback */
long flags; /* logical stop and terminate flags */
long logical_stop_count; /* sample count of output logical stop */
long terminate_count; /* sample count of output terminate time */
} pvstate_node, *pvstate_type;
#define OUTPUT_SIZE 256
int pv_callback(long out_count, float *samples, int len, void *rock)
{
pvshell_type susp = (pvshell_type) rock;
pvstate_type pvs = (pvstate_type) susp->state;
/* (1) figure out the "time" of the start of next frame */
double out_time = out_count / susp->f->sr;
/* (2) Map this time via g to an input time for f. */
/* compute g count that is past the time; at 0th sample,
* pvs->g_count is 1, so we add 1 to g_count to make the loop and
* interpolation math work right */
double g_count = out_time * susp->g->sr + 1.0;
double g; /* the value of g at g_count which is at the time of out_count */
long f_start; /* the start sample of input f for the next frame */
int hop; /* the hopsize from the previous frame to this frame, thus the
offset into input buffer of the data we want to keep */
int got_from_f; /* samples already in input */
int needed_from_f; /* samples to get from f this time */
sample_type *input = pvs->input;
int i;
int f_logically_stopped = FALSE;
long f_logical_stop_count;
pvs->flags = 0;
/* before loop:
* pvs->g_count <= g_count,
* loop invariant:
* pvs->g_prev == g(pvs->g_count - 2),
* pvs->g_prev == g(pvs->g_count - 1)
* after loop:
* pvs->g_count > g_count
* pvs->g_count <= g_count + 1
*/
while (pvs->g_count <= g_count) {
long flags = PVSHELL_TEST_G(susp); /* prepare to get a sample */
if (!pvs->g_terminated && (flags & PVSHELL_FLAG_TERMINATE)) {
pvs->g_terminated = TRUE;
pvs->g_terminate_count = susp->g->current - susp->g_cnt;
}
pvs->g_prev = pvs->g_next;
pvs->g_next = PVSHELL_FETCH_G(susp);
pvs->g_count++;
}
/* fetch frame by mapping with g unless we've gone beyond g's
termination time */
if (!pvs->g_terminated) {
/* now interpolate to get the value of g at g_count */
g = pvs->g_prev + (pvs->g_next - pvs->g_prev) *
(g_count - (pvs->g_count - 1));
/* (3) get the first sample we need from f. */
/* g is now the sample time we want for center of f window */
f_start = ROUNDBIG(g * susp->f->sr) - pvs->fftsize / 2;
/* f_start is now the first sample position of the window */
/* (4) shift INPUT */
hop = f_start - pvs->input_count;
if (hop < 0) {
hop = 0;
}
/* printf("pv_callback f_start %ld hop %d\n", f_start, hop); */
got_from_f = pvs->fftsize - hop;
needed_from_f = pvs->fftsize; /* unless we can resuse samples */
if (hop == 0) {
; /* nothing to do, the samples are already in input */
} else if (hop < pvs->fftsize) {
memmove(input, input + hop,
got_from_f * sizeof(sample_type));
needed_from_f = hop;
} else { /* skip over some samples of f */
int skip = hop - pvs->fftsize;
int i;
got_from_f = 0;
for (i = 0; i < skip; i++) {
long flags = PVSHELL_TEST_F(susp);
if (flags) { /* normal case is all flags zero, so I think it
is faster to test for either and only if we
know one is set do we test individual flags */
if (flags | PVSHELL_FLAG_LOGICAL_STOP) {
f_logically_stopped = TRUE;
f_logical_stop_count = susp->f->current - susp->f_cnt;
}
if (flags | PVSHELL_FLAG_TERMINATE && !pvs->f_terminated) {
pvs->f_terminated = TRUE;
pvs->f_terminate_count = susp->f->current - susp->f_cnt;
}
}
PVSHELL_FETCH_F(susp);
}
}
pvs->input_count = f_start;
/* (5) fill the rest of input from f */
for (i = 0; i < needed_from_f; i++) {
long flags = PVSHELL_TEST_F(susp);
if (!f_logically_stopped && (flags | PVSHELL_FLAG_LOGICAL_STOP)) {
f_logically_stopped = TRUE;
pvs->logical_stop_count = susp->f->current - susp->f_cnt;
}
input[got_from_f++] = PVSHELL_FETCH_F(susp);
}
memmove(samples, input, pvs->fftsize * sizeof(float));
/* did we terminate? If window is all zeros, we can compute
terminate time */
if ((!(pvs->flags & PVSHELL_FLAG_TERMINATE)) && pvs->f_terminated &&
pvs->f_terminate_count <= f_start) {
/* new window is all zero, so output terminates soon ... */
pvs->flags |= PVSHELL_FLAG_TERMINATE;
pvs->terminate_count = out_count - hop + pvs->fftsize / 2;
printf("pv_callback terminated by f at %ld\n", pvs->terminate_count);
}
pvs->t0 = out_count;
pvs->g0 = g;
} else { /* g has terminated, so we just fill input with zeros */
/* hopsize does not matter, so we'll set it to fftsize/8 */
memset(samples, 0, pvs->fftsize * sizeof(*samples));
hop = pvs->fftsize / 8;
/* printf("filled samples with 0, hop %d\n", hop); */
}
/* there are two sources of logical stop: f and g. If f, then
f_logically_stopped is TRUE, and we need to map using g-inverse.
We'll do that first to get a candidate logical stop time. (This
is skipped if g has terminated, because the variable g would not
be defined in that case.)
Then, test if g is terminated. If so, g_terminate_time is the other
candidate logical stop time. If not g_terminated, we do nothing
(letting the mapped f logical stop time stand if applicable).
Otherwise, if g_terminated then {
if f_logically_stopped, take the minimum of the two candidates,
else take the terminate time of g }
(See comments at top of file for more about the computation here.)
*/
if (f_logically_stopped && !pvs->g_terminated) {
pvs->logical_stop_count = pvs->t0 + (out_count - pvs->t0) *
((f_logical_stop_count / susp->f->sr - pvs->g0) / (g - pvs->g0));
}
if (pvs->g_terminated) {
long term_cnt_from_g = ROUNDBIG((pvs->g_terminate_count / susp->g->sr) *
susp->f->sr);
if (f_logically_stopped) { /* take min of g and f log. stop cnt */
pvs->logical_stop_count = MIN(pvs->logical_stop_count,
term_cnt_from_g);
} else {
f_logically_stopped = TRUE;
pvs->logical_stop_count = term_cnt_from_g;
}
/* maybe output has terminated */
if (pvs->g_terminate_count < out_count + pvs->fftsize / 2) {
if (pvs->flags & PVSHELL_FLAG_TERMINATE) {
pvs->terminate_count = MIN(pvs->terminate_count,
term_cnt_from_g);
} else {
pvs->flags |= PVSHELL_FLAG_TERMINATE;
pvs->terminate_count = term_cnt_from_g;
}
/* printf("pv_callback terminated by g at %ld\n", term_cnt_from_g); */
}
}
if (f_logically_stopped) {
pvs->flags |= PVSHELL_FLAG_LOGICAL_STOP;
}
return hop;
}
/* pv_fetch -- f is the signal. g is the map from output to input
*
* g has an arbitrary sample rate with respect to f, and will interpolate.
* out is where to put samples,
* n is how many samples to compute (maximum)
* sample_count is how many output samples we have computed
*/
long pv_fetch(pvshell_type susp,
sample_block_values_type out, long *n,
long sample_count)
{
pvstate_type pvs = (pvstate_type) susp->state;
int i;
int flags = 0;
int count = 0; /* how many samples computed? */
/* initialize phase vocoder if this is the first call */
if (pvs->sample_count == 0) {
Phase_vocoder pv = pv_create2(malloc, free, pv_callback, susp);
pv_set_blocksize(pv, OUTPUT_SIZE);
pv_set_fftsize(pv, pvs->fftsize);
pv_set_syn_hopsize(pv, pvs->hopsize);
pv_set_mode(pv, pvs->mode);
pv_initialize(pv);
pvs->pv = pv;
pvs->input = (float *) malloc(pvs->fftsize * sizeof(float));
pvs->input_count = -pvs->fftsize; /* no valid samples in input yet */
}
while (count < *n) {
int take = *n - count; /* how many to take from (pv) output */
int remaining;
int index;
if (pvs->output_count <= 0) {
pvs->output = pv_get_output2(pvs->pv);
pvs->output_count = OUTPUT_SIZE;
}
remaining = pvs->output_count;
/* printf("pv_fetch take %ld remaining %ld\n", take, remaining); */
if (take > remaining) take = remaining;
if (pvs->flags) {
if (pvs->flags & PVSHELL_FLAG_TERMINATE) {
int to_term = pvs->terminate_count - sample_count;
if (to_term < take) take = to_term;
if (take == 0) {
/* we want to set the terminate flag at the beginning
of the sample block, i.e. only if count == 0; if
there are samples in the block already, we just
return them and we'll set the terminate flag next time
*/
if (count == 0) {
flags |= PVSHELL_FLAG_TERMINATE;
}
}
}
if (pvs->flags & PVSHELL_FLAG_LOGICAL_STOP) {
int to_stop = pvs->logical_stop_count - sample_count;
/* if we're exactly at the logical stop block, then
set the logical stop flag and compute the block as
normal. Otherwise, if we have not reached the logical
stop sample yet (to_stop > 0) and we have room to go
past it (to_stop < take), then take only up to logical
stop sample.
*/
if (to_stop == 0 && count == 0) {
flags |= PVSHELL_FLAG_LOGICAL_STOP;
} else if (to_stop > 0 && to_stop < take) {
take = to_stop;
}
}
}
if (take == 0) break; /* no more samples; we now terminate */
index = OUTPUT_SIZE - pvs->output_count;
for (i = 0; i < take; i++) {
*out++ = pvs->output[index++];
}
count += take;
sample_count += take;
pvs->output_count -= take;
pvs->sample_count += take;
}
*n = count;
/* printf("pv_fetch output_count %ld flags %ld\n",
pvs->sample_count, susp->flags); */
return flags;
}
void pv_free(struct pvshell_struct *susp)
{
pvstate_type pvs = (pvstate_type) susp->state;
if (pvs->pv) pv_end(pvs->pv);
if (pvs->input) free(pvs->input);
}
sound_type snd_phasevocoder(sound_type f, sound_type g, long fftsize, long hopsize, long mode)
{
/* we're using 5 doubles of state. The first is a parameter,
* and the rest are initialized to zero except for state[2],
* aka G_COUNT. This is the number of samples we have read
* from G. Since we're interpolating we need a one-sample
* lookahead, and initializing the count to -1 causes an
* extra fetch and hence 1-sample lookahead. This state is copied
* into the pvshell structure, so we don't need to allocate
* a vector on the heap.
*/
long temp;
if (fftsize == -1)
fftsize = 2048;
if (hopsize == -1)
hopsize = fftsize / 8;
pvstate_node state = {
0 /* f_count */,
0 /* g_count */,
0 /* g_prev */,
0 /* g_next */,
0 /* sample_count */,
NULL, /* pv */
NULL, /* input */
0, /* input_count */
NULL, /* output */
0, /* output_count */
fftsize, /* fftsize */
hopsize, /* hopsize */
mode };
/* If f and g do not start at the same time, we should really
* should do something about it, but we'll just throw an error.
* Be careful to allow small differences (within one sample).
*/
if (fabs(f->t0 - g->t0) * f->sr > 0.5) {
xlfail("phasevocoder inputs must start at the same time");
}
/* fftsize should be a power of 2, hopsize should be a power of
* 2 smaller than fftsize.
*/
if (fftsize <= 0) {
xlfail("phasevocoder fftsize must be > 0");
}
/* Test for power of 2. Subtract 1 and a power of 2 will change
* from 0...010...0 to 0...001...1, and the "and" will be zero.
* But a non-power of 2 will go from 0...01?...? to 0...01?...?"
* and the "and" will be non-zero.
*/
temp = fftsize - 1;
if ((temp & fftsize) != 0) {
xlfail("phasevocoder fftsize must be a power of 2");
}
/* Test that hopsize is a power of 2 smaller than fftsize: */
temp = fftsize / 2;
while (temp && temp != hopsize) temp >>= 1;
if (!temp) {
xlfail("phasevocoder hopsize must be a power of 2 smaller than fftsize");
}
/* output the same sample rate and start time as f */
sound_type pv = snd_make_pvshell("snd_phasevocoder", f->sr, f->t0,
&pv_fetch, &pv_free, f, g,
(void *) &state, sizeof(state));
return pv;
}