Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-02 14:50:17 +01:00
Code Issues Releases Wiki Activity

Update nyquist to SVN r288 (r3.15+)

Browse Source 
------------------------------------------------------------------------
    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
This commit is contained in:
Leland Lucius
2019-12-15 19:34:50 -06:00
parent ea72627a7b
commit 68eec279fb
214 changed files with 3661 additions and 7105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib-src/libnyquist/nyquist/cmt/cext.h
View File

@@ -19,7 +19,8 @@ Pointer -- pointer to char, a generic pointer
ABS() -- absolute value of any type of number
MAX() -- maximum of two numbers
MIN() -- minimum of two numbers
ROUND() -- round a double to long
ROUND32() -- round a double to int
ROUNDBIG() -- round a double to intptr_t
NULL -- pointer to nothing, a constant
EOS -- end of string, a constant '\0'
@@ -45,6 +46,8 @@ EXIT(n) -- calls exit(n) after shutting down/deallocating resources
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <stdint.h>
#include <inttypes.h>
#if HAS_STDLIB_H
#include <stdlib.h>
@@ -178,11 +181,21 @@ public void EXIT(int);
MALLOC is not defined!
#endif
#define ROUND(x) ((long) ((x) + 0.5))
#define ROUND32(x) ((int) ((x) + 0.5))
// on 32-bit machines, ROUNDBIG rounds to int32_t
// on 64-bit architectures, ROUNDBIG rounds to int64_t
#define ROUNDBIG(x) ((intptr_t) ((x) + 0.5))
/* obsolete: ROUND is needed for both ints, e.g. sample rates,
and big ints, e.g. sample counts, so we have two ROUND
functions. We use intptr_t for ROUNDBIG because long on
Windows is only 32 bits, while intptr_t is 64 bits.
With the addition of these 2 functions, we never
"NEED_ROUND" and trying to use round will cause an error.
*/
/* for compatibility */
#ifdef NEED_ROUND
#define round ROUND
// #define round ROUND
#define round you should not use round
#endif
#ifndef min

8
lib-src/libnyquist/nyquist/cmt/cmtcmd.c
View File

@@ -14,7 +14,7 @@
#define HASHELEM(p) ((p).symbol_name)
#define HASHVAL 50
#define HASHENTRIES 50
#define HASHENTER hash_lookup
#define HASHENTER lookup
#define HASHNOCOPY
#include "hashrout.h"
@@ -23,7 +23,7 @@ void defvar(name, addr)
char *name;
int *addr;
{
int i = hash_lookup(name);
int i = lookup(name);
HASHENTRY(i).symb_type = var_symb_type;
HASHENTRY(i).ptr.intptr = addr;
}
@@ -33,7 +33,7 @@ void defun(name, addr)
char *name;
int (*addr)();
{
int i = hash_lookup(name);
int i = lookup(name);
HASHENTRY(i).symb_type = fn_symb_type;
HASHENTRY(i).ptr.routine = addr;
}
@@ -44,7 +44,7 @@ void defvec(name, addr, size)
int *addr;
int size;
{
int i = hash_lookup(name);
int i = lookup(name);
HASHENTRY(i).symb_type = vec_symb_type;
HASHENTRY(i).size = size;
HASHENTRY(i).ptr.intptr = addr;

2
lib-src/libnyquist/nyquist/cmt/cmtcmd.h
View File

@@ -25,7 +25,7 @@ typedef struct symb_descr {
} ptr;
} symb_descr_node;
int hash_lookup(char *s);
int lookup(char *s);
void defvar(char *name, int *addr);
void defvec(char *name, int *addr, int size);
typedef int (*defun_type)();

16
lib-src/libnyquist/nyquist/cmt/midifns.c
View File

@@ -110,7 +110,7 @@
#define BREAKTEST
#endif
#ifdef __APPLE__
#ifdef UNIX_MACH
#include <sys/types.h>
#include <sys/time.h>
#include <errno.h>
@@ -131,7 +131,7 @@
#endif /* UNIX_IRIX_MIDIFNS */
#endif /* UNIX_IRIX */
#endif /* UNIX */
#endif /* __APPLE__ */
#endif /* UNIX_MACH */
#ifdef ITC
static int ignore_realtime = 0;
@@ -395,7 +395,7 @@ void eventwait(timeout)
}
#else /* !UNIX_ITC */
#ifdef UNIX
/* see machmidi.c for UNIX_MACH implementation */
/* see machmidi.c for UNIX_MACH (OS X) implementation */
#ifndef UNIX_MACH
#ifdef UNIX_IRIX_MIDIFNS
void eventwait(timeout)
@@ -1614,6 +1614,8 @@ private void musicterm()
* random number (lo <= result <= hi)
****************************************************************************/
/* to avoid confusion and dead code, take this out */
#ifdef ALL_CMT
long randseed = 1534781L;
short cmtrand(short lo, short hi)
@@ -1659,6 +1661,8 @@ void settime(newtime)
#endif
#endif
}
#endif //ALL_CMT
/****************************************************************************
* timereset
@@ -1745,7 +1749,7 @@ void tracemidi(boolean flag)
***********************************************************************/
#ifdef DOS
#include <ctype.h>
/* binary value of hex char */
private int xval(int c)
@@ -1754,7 +1758,7 @@ private int xval(int c)
static char t[]="0123456789abcdef";
for (i=0; i<16; i++)
if(tolower(c)==t[i]) return(i);
if (tolower(c)==t[i]) return(i);
return (-1);
}
@@ -1814,7 +1818,7 @@ private void midi_init()
gprintf(TRANS,"MPUBASE %s\n",t);
base=atox(t);
}
if(err = mOpen(base, irq)) {
if (err = mOpen(base, irq)) {
mClose(err);
EXIT(1);
}

62
lib-src/libnyquist/nyquist/cmt/moxc.c
View File

@@ -18,6 +18,16 @@
* 4-Mar-91 | GWL : DOS allows odd inst addrs
* 10-Oct-94 | nix : posicionador tridimensionale interface
* 28-Apr-03 | DM : true->TRUE, false->FALSE
* 18-May-15 | RBD : The varargs hack to allow arbitrary parameters (only
* | limited by total size) passed to cause() breaks down on ia64
* | where args are not passed uniformly on the stack. To fix this
* | the beautiful cause() that survived 30 years of ports, will
* | finally have to go. The new cause() will take only one
* | parameter to pass along to callees. It will be of type
* | call_args_node (the same type used by the scheduler to store
* | the args.) It will now be up to the caller to pack the real
* | args into call_args_node, and up to the callee to unpack.
* | (packing/unpacking were previously hidden in moxc.c)
*****************************************************************************/
#include "switches.h"
@@ -72,7 +82,7 @@ extern char *app_syntax;
*
* EXPORTS:
*
* cause(delay, routine, p1, p2, ..., p8)
* cause(delay, routine, packed_args)
* moxcdone -- set to TRUE to quit
* eventtime -- ideallized current time
*
@@ -151,7 +161,7 @@ void catchup()
eventtime = (my_base->next_time) >> 8;
call = remove_call(my_base);
virttime = call->u.e.time;
(*(call->u.e.routine))(CALLARGS(call));
(*(call->u.e.routine))(&(call->u.e.p));
call_free(call);
}
/* now that we've possibly pulled events out of the timebase, adjust
@@ -174,6 +184,7 @@ void catchup()
****************************************************************************/
#ifndef DOTS_FOR_ARGS
THIS CODE IS OBSOLETE
void cause(delay, routine, p)
delay_type delay;
int (*routine)();
@@ -181,16 +192,10 @@ void cause(delay, routine, p)
#else
#include <stdarg.h>
void cause(delay_type delay, ...)
/* note: the routine parameter is not checked because any routine type can
be passed as a parameter, but in the call struct it's an int (*)()
*/
void cause(delay_type delay, void (*routine)(call_args_type args), call_args_type p)
#endif
{
register call_type call = call_alloc();
#ifdef DOTS_FOR_ARGS
va_list xp;
#endif
if (!call) {
gprintf(ERROR, "cause: out of memory\n");
@@ -200,11 +205,10 @@ void cause(delay_type delay, ...)
#ifdef DOTS_FOR_ARGS
call->u.e.time = virttime + delay;
call->u.e.priority = 128; /* default priority */
va_start(xp, delay);
call->u.e.routine = (int (*)()) va_arg(xp, long *);
call->u.e.p = va_arg(xp, call_args_node);
va_end(xp);
call->u.e.routine = routine;
call->u.e.p = *p;
#else
THIS CODE IS OBSOLETE
call->u.e.time = virttime + delay;
call->u.e.priority = 128; /* default priority */
call->u.e.routine = routine;
@@ -214,17 +218,14 @@ void cause(delay_type delay, ...)
if (call->u.e.routine == 0) {
gprintf(ERROR,"cause called with NULL routine\n");
EXIT(1);
#ifndef DOS /* IBM allows odd addresses */
#if (__APPLE__ != 1 || __i386__ != 1) /* Intel Mac allows odd addresses */
/* Intel (x86 or x86_64) allows odd routine addresses;
* RISC architectures do not.
*/
#if (!defined(DOS) && __i386__ != 1 && __x86_64__ != 1)
} else if (((long) call->u.e.routine) & 1) {
gprintf(ERROR, "cause called with bad routine address: 0x%lx\n",
call->u.e.routine);
#ifndef GCC_MODEL_CPU
#define GCC_MODEL_CPU "GCC_MODEL_CPU is undefined for this compilation"
#endif
gprintf(ERROR, GCC_MODEL_CPU);
EXIT(1);
#endif
#endif
}
#endif
@@ -248,6 +249,7 @@ void cause(delay_type delay, ...)
****************************************************************************/
#ifndef DOTS_FOR_ARGS
THIS CODE IS OBSOLETE
void causepri(delay, pri, routine, p)
delay_type delay;
int pri;
@@ -256,13 +258,10 @@ void causepri(delay, pri, routine, p)
#else
/* already included stdarg.h */
void causepri(delay_type delay, int pri, ...)
void causepri(delay_type delay, int pri, void (*routine)(call_args_type args), call_args_type args)
#endif
{
register call_type call = call_alloc();
#ifdef DOTS_FOR_ARGS
va_list xp;
#endif
if (!call) {
gprintf(ERROR, "cause: out of memory\n");
@@ -272,10 +271,8 @@ void causepri(delay_type delay, int pri, ...)
#ifdef DOTS_FOR_ARGS
call->u.e.time = virttime + delay;
call->u.e.priority = pri; /* default priority */
va_start(xp, pri);
call->u.e.routine = (int (*)()) va_arg(xp, long *);
call->u.e.p = va_arg(xp, call_args_node);
va_end(xp);
call->u.e.routine = routine;
call->u.e.p = *args;
#else
call->u.e.time = virttime + delay;
call->u.e.priority = pri; /* default priority */
@@ -286,13 +283,14 @@ void causepri(delay_type delay, int pri, ...)
if (call->u.e.routine == 0) {
gprintf(ERROR,"cause called with NULL routine\n");
EXIT(1);
#ifndef DOS /* IBM allows odd addresses */
#if (__APPLE__ != 1 || __i386__ != 1) /* Intel Mac allows odd addresses */
/* Intel (x86 or x86_64) allows odd routine addresses;
* RISC architectures do not.
*/
#if (!defined(DOS) && __i386__ != 1 && __x86_64__ != 1)
} else if (((long) call->u.e.routine) & 1) {
gprintf(ERROR, "causepri called with bad routine address: 0x%lx\n",
call->u.e.routine);
EXIT(1);
#endif
#endif
}
#endif
@@ -332,7 +330,7 @@ private void callrun()
insert_base(timebase);
virttime = call->u.e.time; /* virtual time of the call */
if (moxcdebug) callshow(call);
(*(call->u.e.routine))(CALLARGS(call));
(*(call->u.e.routine))(&(call->u.e.p));
call_free(call);
}

5
lib-src/libnyquist/nyquist/cmt/moxc.h
View File

@@ -12,9 +12,10 @@ extern int moxcdone;
void catchup(void);
void callallcancel(void);
#ifdef DOTS_FOR_ARGS
void cause(delay_type delay, ...);
void causepri(delay_type delay, int pri, ...);
void cause(delay_type delay, void (*fn)(call_args_type), call_args_type p);
void causepri(delay_type delay, int pri, void (*fn)(call_args_type), call_args_type p);
#else
THIS CODE IS OBSOLETE
void cause();
void causepri();
#endif

105
lib-src/libnyquist/nyquist/cmt/seq.c
View File

@@ -36,12 +36,11 @@ boolean external_midi_clock = FALSE;
boolean suppress_midi_clock = FALSE;
private void insert_event(seq_type, register event_type);
private void process_event(seq_type);
private void process_event(call_args_type args);
private char *chunk_alloc(seq_type seq, int size);
private void clock_tick(seq_type seq, time_type fraction);
private void ramp_event(seq_type seq, event_type event, unsigned int value,
unsigned int to_value, int increment, time_type step, int n);
private void clock_tick(call_args_type args);
private void ramp_event(call_args_type args);
/*private*/ void send_macro(register unsigned char *ptr, int voice,
short parameter[], int parm_num, int value, int nline);
@@ -104,15 +103,19 @@ chunk_type chunk_create(boolean first_flag)
/* clock_tick -- advance the clock and send a tick */
/**/
private void clock_tick(seq_type seq, time_type fraction)
private void clock_tick(call_args_type args)
{
seq_type seq = (seq_type) args->arg[0];
time_type fraction = (time_type) args->arg[1];
int delay;
fraction += clock_ticksize;
delay = fraction >> 16;
fraction &= 0xFFFF;
if (seq->runflag && clock_ticksize && seq->note_enable) {
midi_clock();
cause((delay_type)delay, clock_tick, seq, fraction);
args->arg[0] = seq;
args->arg[1] = (void *)(size_t)fraction;
cause((delay_type)delay, clock_tick, args);
} else {
clock_running = FALSE;
midi_stop();
@@ -120,8 +123,9 @@ private void clock_tick(seq_type seq, time_type fraction)
}
}
private void cycle(seq_type seq)
private void cycle(call_args_type args)
{
seq_type seq = (seq_type) args->arg[0];
seq_reset(seq);
seq_play(seq);
}
@@ -555,9 +559,9 @@ event_type insert_seti(seq, stime, sline, voice, addr, value)
void noop(seq_type seq) {}
private void process_event(seq)
seq_type seq;
private void process_event(call_args_type args)
{
seq_type seq = (seq_type) args->arg[0];
register event_type event;
if (!seq->runflag) return;
while ((event = seq->current) && (event->ntime <= virttime)) {
@@ -621,9 +625,12 @@ private void process_event(seq)
clock_ticksize = event->u.clock.ticksize;
if (!clock_running && !suppress_midi_clock &&
!external_midi_clock) {
call_args_node args;
clock_running = TRUE;
midi_start();
clock_tick(seq, 0L);
args.arg[0] = seq;
args.arg[1] = (void *)(size_t)0;
clock_tick(&args);
}
break;
case MACCTRL_VALUE:
@@ -641,6 +648,7 @@ private void process_event(seq)
case CTRLRAMP_VALUE:
case DEFRAMP_VALUE: {
int from, to;
call_args_node re_args;
if (!enabled) break;
step = event->u.ramp.step;
@@ -658,8 +666,14 @@ private void process_event(seq)
/* Note: Step is always non-zero */
n = event->u.ramp.dur / step;
increment = (increment << 8) / n;
ramp_event(seq, event, from << 8, to << 8,
(int) increment, step, n);
re_args.arg[0] = seq;
re_args.arg[1] = event;
re_args.arg[2] = (void *)(size_t)(from << 8);
re_args.arg[3] = (void *)(size_t)(to << 8);
re_args.arg[4] = (void *)(size_t)increment;
re_args.arg[5] = (void *)(size_t)step;
re_args.arg[6] = (void *)(size_t)n;
ramp_event(&re_args);
seq->noteoff_count++;
break;
}
@@ -679,7 +693,7 @@ private void process_event(seq)
seq->current = event->next;
}
if (seq->current) {
cause((delay_type)(event->ntime - virttime), process_event, seq);
cause((delay_type)(event->ntime - virttime), process_event, args);
} else if (seq->noteoff_count == 0 && seq->note_enable) {
/* if we're just advancing to a start point, note_enable will be
* FALSE and this won't get called:
@@ -693,23 +707,30 @@ private void process_event(seq)
/* ramp_event -- generate a ramp */
/**/
private void ramp_event(seq, event, value, to_value, increment, step, n)
seq_type seq;
register event_type event;
unsigned int value;
unsigned int to_value;
int increment;
time_type step;
int n;
private void ramp_event(call_args_type args)
{
seq_type seq = (seq_type) args->arg[0];
event_type event = (event_type) args->arg[1];
/* these 2 casts are ok because value (the starting point of the ramp)
* and to_value (the ending point) are unsigned int's representing a
* fractional MIDI data value with an 8-bit fractional part. */
unsigned int value = (unsigned int) ((size_t) args->arg[2]);
unsigned int to_value = (unsigned int) ((size_t) args->arg[3]);
/* increment is also a fixed-point fraction, so int is fine */
int increment = (int) ((size_t) args->arg[4]);
time_type step = (time_type) args->arg[5];;
/* n is the number of steps remaining. int is big enough. */
int n = (int) ((size_t) args->arg[6]);
if (seq->runflag) {
int voice = vc_voice(event->nvoice);
/* printf("ramp_event: value %d to_value %d increment %d step %d n %d time %d\n",
value, to_value, increment, step, n, virttime); */
if (n == 0) value = to_value;
else {
causepri((delay_type)step, 5, ramp_event, seq, event, value + increment,
to_value, increment, step, n - 1);
else {/* update value */
args->arg[2] = (void *)(size_t)(value + increment);
args->arg[6] = (void *)(size_t)(n - 1); /* update n */
causepri((delay_type)step, 5, ramp_event, args);
}
if (event->value == CTRLRAMP_VALUE) {
int ctrl = event->u.ramp.ctrl;
@@ -723,7 +744,8 @@ private void ramp_event(seq, event, value, to_value, increment, step, n)
event->u.ramp.u.def.parm_num, value >> 8,
event->nline);
}
if (n == 0) seq_end_event(seq);
/* really passing seq, but it's already in args: */
if (n == 0) seq_end_event(args);
}
}
@@ -829,12 +851,15 @@ void seq_at_end(seq, fn)
void seq_cause_noteoff_meth(seq_type seq, time_type delay, int voice, int pitch)
{
if (seq->note_enable) {
call_args_node args;
pitch += seq->transpose;
while (pitch < 0) pitch += 12;
while (pitch > 127) pitch -= 12;
seq->noteoff_count++;
causepri((delay_type) delay, 10, seq->noteoff_fn,
seq, voice, pitch);
args.arg[0] = seq;
args.arg[1] = (void *)(size_t)voice;
args.arg[2] = (void *)(size_t)pitch;
causepri((delay_type) delay, 10, seq->noteoff_fn, &args);
}
}
@@ -878,16 +903,16 @@ void seq_cycle(seq_type seq, boolean flag, time_type dur)
/*
* Assumes that noteoff_count was incremented when event started.
*/
void seq_end_event(seq)
seq_type seq;
void seq_end_event(call_args_type args)
{
seq_type seq = (seq_type) args->arg[0];
/*gprintf(TRANS, "nd");*/
seq->noteoff_count--;
if (seq->current == NULL /* finished seq */ &&
seq->noteoff_count == 0 /* finished noteoff's */ &&
seq->runflag /* we've not been stopped */) {
if (seq->cycleflag) {
cause((delay_type) (seq->cycledur - virttime), cycle, seq);
cause((delay_type) (seq->cycledur - virttime), cycle, args);
} else if (seq->stopfunc) {
(*(seq->stopfunc))(seq);
}
@@ -903,8 +928,7 @@ void seq_end_event(seq)
* frees storage occupied by a seq
****************************************************************************/
private void seq_free_meth(seq)
seq_type seq;
private void seq_free_meth(seq_type seq)
{
seq_free_chunks(seq);
if (seq->timebase) timebase_free(seq->timebase);
@@ -1015,11 +1039,16 @@ void seq_midi_touch_meth(seq_type seq, int voice, int value)
/* seq_noteoff_meth -- turn a seq note off */
/**/
void seq_noteoff_meth(seq_type seq, int voice, int pitch)
void seq_noteoff_meth(call_args_type args)
{
/* seq_type seq = args->arg[0]; -- unused */
/* these are 8 bit values stored in pointers; coerce
* in 2 steps to avoid compiler warnings */
int voice = (int) ((size_t) args->arg[1]);
int pitch = (int) ((size_t) args->arg[2]);
midi_note(voice, pitch, 0);
/*gprintf(TRANS, "_e");*/
seq_end_event(seq);
seq_end_event(args);
}
@@ -1116,8 +1145,12 @@ void seq_reset_meth(seq_type seq)
seq->noteoff_count = 0L;
seq->runflag = TRUE;
seq->paused = TRUE;
if (seq->current)
cause((delay_type)(seq->current->ntime - virttime), process_event, seq);
if (seq->current) {
call_args_node args;
args.arg[0] = seq;
cause((delay_type)(seq->current->ntime - virttime),
process_event, &args);
}
timebase_use(old_timebase);
}

10
lib-src/libnyquist/nyquist/cmt/seq.h
View File

@@ -173,7 +173,7 @@ typedef struct seq_struct {
void (*midi_ctrl_fn)(struct seq_struct * seq, int voice, int ctrl, int value);
void (*midi_program_fn)(struct seq_struct * seq, int voice, int prog);
void (*midi_touch_fn)(struct seq_struct * seq, int voice, int value);
void (*noteoff_fn)(struct seq_struct * seq, int voice, int pitch);
void (*noteoff_fn)(call_args_type args);
void (*noteon_fn)(struct seq_struct * seq, int chan, int pitch, int vel);
void (*free_fn)(struct seq_struct * seq);
void (*reset_fn)(struct seq_struct * seq);
@@ -215,8 +215,8 @@ chunk_type chunk_create(boolean first_flag);
(*(((seq_type) seq)->midi_program_fn))(seq, voice, prog)
#define seq_midi_touch(seq, voice, value) \
(*(((seq_type) seq)->midi_touch_fn))(seq, voice, value)
#define seq_noteoff(seq, voice, pitch) \
(*(((seq_type) seq)->noteoff_fn))(seq, voice, pitch)
#define seq_noteoff(seq, args) \
(*(((seq_type) seq)->noteoff_fn))(args)
#define seq_noteon(seq, voice, pitch, vel) \
(*(((seq_type) seq)->noteon_fn))(seq, voice, pitch, vel)
#define seq_free(seq) (*(((seq_type) seq)->free_fn))(seq)
@@ -262,7 +262,7 @@ seq_type seq_copy(seq_type from_seq); /* LISP: (SEQ-COPY SEQ) */
seq_type seq_create(void); /* LISP: (SEQ-CREATE) */
void seq_cycle(seq_type seq, boolean flag, time_type dur);
#define seq_duration(seq) (((seq_type) seq)->chunklist->u.info.duration)
void seq_end_event(seq_type seq);
void seq_end_event(call_args_type args);
#define seq_events(seq) (((seq_type) seq)->chunklist ? \
(((seq_type) seq)->chunklist->u.info.eventlist) : NULL)
#define seq_dictionary(seq) (seq)->chunklist->u.info.dictionary
@@ -278,7 +278,7 @@ void seq_midi_ctrl_meth(seq_type seq, int voice, int ctrl, int value);
void seq_midi_program_meth(seq_type seq, int voice, int prog);
void seq_midi_touch_meth(seq_type seq, int voice, int value);
void seq_noteon_meth(seq_type seq, int voice, int pitch, int vel);
void seq_noteoff_meth(seq_type seq, int chan, int pitch);
void seq_noteoff_meth(call_args_type args);
time_type seq_pause(seq_type seq, boolean flag);
void seq_play(seq_type seq);
#define seq_rate(seq) ((seq_type) seq)->rate

120
lib-src/libnyquist/nyquist/cmt/seqmread.c
View File

@@ -54,43 +54,41 @@ long prev_ticksize; /* remember the previous ticksize */
int sysex_id = 0;
void smf_noteoff();
void smf_error();
void smf_header();
void smf_trackstart();
void smf_trackend();
void smf_noteon();
void smf_pressure();
void smf_parameter();
void smf_pitchbend();
void smf_program();
void smf_chanpressure();
void smf_sysex();
void smf_metamisc();
void smf_metaseq();
void smf_metaeot();
void smf_timesig();
void smf_smpte();
void smf_tempo();
void smf_keysig();
void smf_metaspecial();
void smf_metatext();
void smf_arbitrary();
void smf_noteoff(int, int, int);
void smf_error(char *);
void smf_header(int, int, int);
void smf_trackstart(void);
void smf_trackend(void);
void smf_noteon(int, int, int);
void smf_pressure(int, int, int);
void smf_parameter(int, int, int);
void smf_pitchbend(int, int, int);
void smf_program(int, int);
void smf_chanpressure(int, int);
void smf_sysex(int, char *);
void smf_metamisc(int, int, char *);
void smf_metaseq(int);
void smf_metaeot(void);
void smf_timesig(int, int, int, int);
void smf_smpte(int, int, int, int, int);
void smf_tempo(int);
void smf_keysig(int, int);
void smf_metaspecial(int, int, char *);
void smf_metatext(int, int, char *);
void smf_arbitrary(int, char *);
private seq_type the_score;
static FILE *F;
int filegetc()
int filegetc(void)
{
/* int temp = getc(F);
printf(" %x ", temp);*/
return(int)(getc(F));
}
void seq_read_smf(seq, fp)
seq_type seq;
FILE *fp;
void seq_read_smf(seq_type seq, FILE *fp)
{
F = fp;
initfuncs();
@@ -140,13 +138,13 @@ void seq_read_smf(seq, fp)
*/
unsigned long divisions = 24L;
time_type gio_time()
time_type gio_time(void)
{
return (tempomap_lookup(the_tempomap, Mf_currtime) + 125L) / 250L;
}
void smf_header(format,ntrks,division)
void smf_header(int format, int ntrks, int division)
{
/* gprintf(TRANS, "Header format=%d ntrks=%d division=%d\n",
format,ntrks,division); */
@@ -159,17 +157,17 @@ void smf_header(format,ntrks,division)
}
void smf_trackstart()
void smf_trackstart(void)
{
/* gprintf(TRANS, "Track start\n"); */
}
void smf_trackend()
void smf_trackend(void)
{
/* gprintf(TRANS, "Track end\n"); */
}
void smf_noteon(chan,pitch,vol)
void smf_noteon(int chan, int pitch, int vol)
{
snding_type snding;
if (vol == 0) { /* convert to a noteoff */
@@ -190,7 +188,7 @@ void smf_noteon(chan,pitch,vol)
snding->channel = chan;
}
void smf_noteoff(chan,pitch,vol)
void smf_noteoff(int chan, int pitch, int vol)
{
snding_type *snding_ptr;
register snding_type snding;
@@ -214,14 +212,14 @@ void smf_noteoff(chan,pitch,vol)
}
void smf_pressure(chan,pitch,press)
void smf_pressure(int chan, int pitch, int press)
{
prtime();
gprintf(TRANS, "Pressure, chan=%d pitch=%d press=%d (IGNORED)\n",
chan + 1, pitch, press);
}
void smf_parameter(chan,control,value)
void smf_parameter(int chan, int control, int value)
{
int ctrl = 0;
/* prtime();
@@ -245,7 +243,7 @@ void smf_parameter(chan,control,value)
* NOTE: the midifile code from Tim Thompson has the msb and lsb bytes swapped.
* Thus the parameter msb is really the low order byte and lsb is high order.
*/
void smf_pitchbend(chan,msb,lsb)
void smf_pitchbend(int chan, int msb, int lsb)
{
/* prtime();
gprintf(TRANS, "Pitchbend, chan=%d msb=%d lsb=%d\n",chan+1,msb,lsb); */
@@ -253,14 +251,14 @@ void smf_pitchbend(chan,msb,lsb)
((lsb << 7) + msb) >> 6);
}
void smf_program(chan,program)
void smf_program(int chan, int program)
{
/* prtime();
gprintf(TRANS, "Program, chan=%d program=%d\n",chan+1,program); */
insert_ctrl(the_score, gio_time(), 0, PROGRAM_CTRL, chan + 1, program);
}
void smf_chanpressure(chan,press)
void smf_chanpressure(int chan, int press)
{
/* prtime();
gprintf(TRANS, "Channel pressure, chan=%d pressure=%d\n",chan+1,press);
@@ -268,9 +266,7 @@ void smf_chanpressure(chan,press)
insert_ctrl(the_score, gio_time(), 0, TOUCH_CTRL, chan + 1, press);
}
void smf_sysex(leng,mess)
int leng;
char *mess;
void smf_sysex(int leng, char* mess)
{
char symb[10];
def_type defn;
@@ -295,8 +291,7 @@ char *mess;
gprintf(TRANS, "Sysex, leng=%d (IGNORED)\n",leng); */
}
void smf_metamisc(type,leng,mess)
char *mess;
void smf_metamisc(int type, int leng, char *mess)
{
prtime();
gprintf(TRANS,
@@ -304,8 +299,7 @@ char *mess;
type, leng);
}
void smf_metaspecial(type,leng,mess)
char *mess;
void smf_metaspecial(int type, int leng, char *mess)
{
prtime();
gprintf(TRANS,
@@ -313,8 +307,7 @@ char *mess;
type, leng);
}
void smf_metatext(type,leng,mess)
char *mess;
void smf_metatext(int type, int leng, char *mess)
{
static char *ttype[] = {
NULL,
@@ -333,22 +326,28 @@ char *mess;
type = unrecognized;
}
void smf_metaseq(num)
void smf_metaseq(int num)
{
prtime();
gprintf(TRANS, "Meta event, sequence number = %d (IGNORED)\n",num);
gprintf(TRANS, "Meta event, sequence number = %d (IGNORED)\n", num);
}
void smf_metaeot()
void smf_metaeot(void)
{
/* prtime();
gprintf(TRANS, "Meta event, end of track\n"); */
}
void smf_keysig(sf,mi)
void smf_keysig(int sf, int mi)
{
/* prtime();
gprintf(TRANS, "Key signature, sharp/flats=%d minor=%d\n",sf,mi); */
gprintf(TRANS, "Key signature, sharp/flats=%d minor=%d\n", sf, mi); */
}
void smf_sqspecific(int id, char *msg)
{
prtime();
gprintf(TRANS, "Sequencer-specific event ID = %d (IGNORED)\n", id);
}
/* smf_tempo -- handle a midifile tempo change */
@@ -359,8 +358,7 @@ void smf_keysig(sf,mi)
* to get units of millisec and 24ths of quarter notes. insert_clock
* expects this to have a 16 bit fractional part.
*/
void smf_tempo(tempo)
long tempo;
void smf_tempo(int tempo)
{
time_type ctime = gio_time();
long ticksize = scale(tempo, 1024L, 375L);
@@ -383,7 +381,7 @@ long tempo;
}
}
void smf_timesig(nn,dd,cc,bb)
void smf_timesig(int nn, int dd, int cc, int bb)
{
/* int denom = 1;
while ( dd-- > 0 )
@@ -394,7 +392,7 @@ void smf_timesig(nn,dd,cc,bb)
nn,denom,cc,bb); */
}
void smf_smpte(hr,mn,se,fr,ff)
void smf_smpte(int hr, int mn, int se, int fr, int ff)
{
prtime();
gprintf(TRANS,
@@ -402,26 +400,24 @@ void smf_smpte(hr,mn,se,fr,ff)
hr, mn, se, fr, ff);
}
void smf_arbitrary(leng,mess)
char *mess;
void smf_arbitrary(int leng, char *mess)
{
prtime();
gprintf(TRANS, "Arbitrary bytes, leng=%d (IGNORED)\n",leng);
}
void smf_error(msg)
char *msg;
void smf_error(char *msg)
{
gprintf(ERROR, msg);
}
void prtime()
void prtime(void)
{
gprintf(TRANS, "Time=%ld/%ld ",Mf_currtime, gio_time());
}
void initfuncs()
void initfuncs(void)
{
Mf_error = smf_error;
Mf_header = smf_header;
@@ -442,7 +438,7 @@ void initfuncs()
Mf_smpte = smf_smpte;
Mf_tempo = smf_tempo;
Mf_keysig = smf_keysig;
Mf_sqspecific = smf_metaspecial;
Mf_sqspecific = smf_sqspecific;
Mf_text = smf_metatext;
Mf_arbitrary = smf_arbitrary;
}

502
lib-src/libnyquist/nyquist/cmt/seqmwrite.c
View File

@@ -27,7 +27,7 @@ long chunk_size_marker;
int seti_counter;
extern time_type a_start_time;
long last_event; /*time from last_clock_event to the last event*/
long last_event; /* time from last_clock_event to the last event */
time_type last_clock_event;
time_type last_tick_size; /* millisec per tick shifted 16 bits */
@@ -44,17 +44,16 @@ extern boolean clock_running; /* TRUE if clock is running */
extern boolean use_midi_clock;
private void smfw_bend();
private void smfw_cause_noteoff();
private void smfw_cause_noteoff(seq_type seq, time_type delay, int voice,
int pitch);
private void smfw_ctrl();
private void smfw_deltatime();
private void smfw_dotrack();
private void smfw_exclusive();
private void smfw_noteoff();
private void smfw_noteoff(call_args_type args);
private void smfw_noteon();
private void smfw_process_event();
private void smfw_ramp_event(seq_type seq, event_type event,
unsigned int value, unsigned int to_value, int increment,
time_type step, int n);
private void smfw_process_event(call_args_type args);
private void smfw_ramp_event(call_args_type args);
private void smfw_send_macro();
private void smfw_touch(seq_type seq, int voice, int value);
private void writevarlen();
@@ -64,7 +63,7 @@ private void writevarlen();
/**/
private void smfw_bend(seq_type seq, int voice, int value)
{
if(debug) gprintf(TRANS, "smfw_bend %d\n", value);
if (debug) gprintf(TRANS, "smfw_bend %d\n", value);
smfw_deltatime();
putc(MIDI_BEND | (voice - 1), smfw_seq.outfile);
putc(0xFF & ((value & 0x1) << 6) , smfw_seq.outfile);
@@ -81,33 +80,34 @@ private void smfw_bend(seq_type seq, int voice, int value)
* so no real timing delays occur. The effect is to sort events by their
* specified time.
*/
private void smfw_cause_noteoff(seq, delay, voice, pitch)
seq_type seq;
time_type delay;
int voice;
int pitch;
private void smfw_cause_noteoff(seq_type seq, time_type delay, int voice,
int pitch)
{
if(debug) gprintf(TRANS, "cause noteoff at %ld...", virttime + delay);
call_args_node args;
if (debug) gprintf(TRANS, "cause noteoff at %ld...", virttime + delay);
pitch += seq->transpose;
while (pitch <= 0) pitch += 12;
while (pitch >= 127) pitch -= 12;
seq->noteoff_count++;
causepri((delay_type) delay, 10, seq->noteoff_fn,
seq, voice, pitch);
args.arg[0] = seq;
args.arg[1] = (void *)(size_t)voice;
args.arg[2] = (void *)(size_t)pitch;
causepri((delay_type) delay, 10, seq->noteoff_fn, &args);
}
private void smfw_clock_event(old_ticksize, new_ticksize)
time_type old_ticksize, new_ticksize;
private void smfw_clock_event(call_args_type args)
{
time_type old_ticksize = (time_type)(args->arg[0]);
time_type new_ticksize = (time_type)(args->arg[1]);
time_type temp_ticksize = new_ticksize;
new_ticksize = scale(new_ticksize, 375L, 1024L);
/* (new_ticksize >> 16) * 24000 ms/clock becomes us/midiquarter */
if(debug) gprintf(TRANS, "smfw_clock: write %ld (time:%ld) ->->->tempo %ld\n",
if (debug) gprintf(TRANS,
"smfw_clock: write %ld (time:%ld) ->->->tempo %ld\n",
new_ticksize, virttime, 2500L / (new_ticksize / 24000));
/*use old ticksize to write the delta for the clock event*/
/* use old ticksize to write the delta for the clock event */
last_tick_size = old_ticksize;
smfw_deltatime();
last_tick_size = temp_ticksize;/* reset to = new_tick_size */
@@ -120,8 +120,10 @@ private void smfw_clock_event(old_ticksize, new_ticksize)
last_clock_event = virttime;
last_event = 0L;
/*no time expired between last clockevent and last event(they are the same).*/
/*next clock event will be exactly the next this_event from last_clock_event*/
/* no time expired between last clockevent and last event
* (they are the same). Next clock event will be exactly the
* next this_event from last_clock_event
*/
}
@@ -129,7 +131,7 @@ private void smfw_clock_event(old_ticksize, new_ticksize)
/**/
private void smfw_ctrl(seq_type seq, int voice, int ctrl_name, int value)
{
if(debug) gprintf(TRANS, "smfw_ctrl %d: %d\n", ctrl_name, value);
if (debug) gprintf(TRANS, "smfw_ctrl %d: %d\n", ctrl_name, value);
smfw_deltatime();
putc(MIDI_CTRL | (voice - 1), smfw_seq.outfile);
putc(ctrl_name, smfw_seq.outfile);
@@ -145,13 +147,16 @@ private void smfw_deltatime()
time_type use_ticksize = (clock_ticksize != last_tick_size) ?
last_tick_size : clock_ticksize;
time_type this_event = virttime - last_clock_event;
if(debug) gprintf(TRANS, "delta! ticksize: %lu Lastev: %ld ThisevScaled: %lu Thisev: %lu ",
clock_ticksize, last_event, (this_event * ((2500L << 16) / use_ticksize)) / 100,
this_event);
if (debug) gprintf(TRANS,
"delta! ticksize: %lu Lastev: %ld ThisevScaled: %lu Thisev: %lu ",
clock_ticksize, last_event,
(this_event * ((2500L << 16) / use_ticksize)) / 100,
this_event);
this_event = ((virttime - last_clock_event) * ((2500L << 16) / use_ticksize)) / 100;
this_event = ((virttime - last_clock_event) *
((2500L << 16) / use_ticksize)) / 100;
if(debug) gprintf(TRANS, "--- deltatime: %lu\n", this_event - last_event);
if (debug) gprintf(TRANS, "--- deltatime: %lu\n", this_event - last_event);
writevarlen((long) (this_event - last_event));
last_event = this_event;
@@ -159,8 +164,7 @@ private void smfw_deltatime()
/* smfw_dotrack -- write the remainder of a track */
private void smfw_dotrack(seq)
seq_type seq;
private void smfw_dotrack(seq_type seq)
{
long end_marker;
timebase_type old_timebase = timebase;
@@ -178,40 +182,45 @@ private void smfw_dotrack(seq)
seq->paused = TRUE;
last_clock_event = 0L;
last_event = 0L;
if(debug) gprintf(TRANS, "dotrack (reset) %d %ld (%lu) \n",
if (debug) gprintf(TRANS, "dotrack (reset) %d %ld (%lu) \n",
smfw_seq.track, last_event, virttime);
if (seq->current)
cause((delay_type)(seq->current->ntime - virttime), smfw_process_event,
seq);
if (seq->current) {
call_args_node args;
args.arg[0] = seq;
cause((delay_type)(seq->current->ntime - virttime), smfw_process_event,
&args);
}
set_virttime(timebase, MAXTIME);
catchup();
putc(0x00, smfw_seq.outfile);
putc(0xFF, smfw_seq.outfile);/*end of track chunk*/
putc(0xFF, smfw_seq.outfile); /* end of track chunk */
putc(0x2F, smfw_seq.outfile);
putc(0x00, smfw_seq.outfile);
end_marker = ftell(smfw_seq.outfile);
fseek(smfw_seq.outfile, chunk_size_marker, 0);/*go back to enter chunksize*/
chunk_size = (end_marker - chunk_size_marker) - 4;/* - 4 for 4 size bytes*/
if(debug) gprintf(TRANS, "bytes written in previous track: %ld \n\n", chunk_size);
/* go back to enter chunksize: */
fseek(smfw_seq.outfile, chunk_size_marker, 0);
/* - 4 for 4 size bytes: */
chunk_size = (end_marker - chunk_size_marker) - 4;
if (debug) gprintf(TRANS, "bytes written in previous track: %ld \n\n",
chunk_size);
putc((int) ((0xFF & (chunk_size >> 24))), smfw_seq.outfile);
putc((int) ((0xFF & (chunk_size >> 16))), smfw_seq.outfile);
putc((int) ((0xFF & (chunk_size >> 8))), smfw_seq.outfile);
putc((int) ((0xFF & chunk_size)), smfw_seq.outfile);
fseek(smfw_seq.outfile, end_marker, 0);/*return file pointer to end of track*/
/* return file pointer to end of track */
fseek(smfw_seq.outfile, end_marker, 0);
timebase_use(old_timebase);
}
/* smfw_exclusive -- write a system excl. msg to midi file */
private void smfw_exclusive(length, msg)
int length;
unsigned char *msg;
private void smfw_exclusive(int length, unsigned char *msg)
{
int length_count = 0;
if(debug) gprintf(TRANS, "SYSEX (time:%ld)\n", virttime);
if (debug) gprintf(TRANS, "SYSEX (time:%ld)\n", virttime);
smfw_deltatime();
@@ -219,14 +228,14 @@ unsigned char *msg;
putc(*msg++, smfw_seq.outfile);
length_count++;
}
if(*(--msg) != MIDI_EOX) gprintf(TRANS, "ERROR: no end of sysex\n");
if (*(--msg) != MIDI_EOX) gprintf(TRANS, "ERROR: no end of sysex\n");
}
private void smfw_msg_write(n,c1,c2,c3)
int n;
unsigned char c1,c2,c3;
{
if(debug) gprintf(TRANS, "MSGWRITE %d bytes (time:%ld)\n", n, virttime);
if (debug) gprintf(TRANS, "MSGWRITE %d bytes (time:%ld)\n", n, virttime);
smfw_deltatime();
switch(n) {
case 1: putc(c1, smfw_seq.outfile);
@@ -244,9 +253,13 @@ private void smfw_msg_write(n,c1,c2,c3)
/* smfw_noteoff -- write noteoff to midi file */
/**/
private void smfw_noteoff(seq_type seq, int voice, int pitch)
private void smfw_noteoff(call_args_type args)
{
if(debug) gprintf(TRANS, "smfw_noteoff %d: %d (time:%ld)\n", voice, pitch, virttime);
/* seq_type seq = args->arg[0]; -- unused */
int voice = (int)(size_t)args->arg[1];
int pitch = (int)(size_t)args->arg[2];
if (debug) gprintf(TRANS,
"smfw_noteoff %d: %d (time:%ld)\n", voice, pitch, virttime);
smfw_deltatime();
putc(NOTEOFF | (voice - 1), smfw_seq.outfile);
putc(pitch, smfw_seq.outfile);
@@ -259,11 +272,10 @@ private void smfw_noteoff(seq_type seq, int voice, int pitch)
* NOTE: the seq parameter is not used here, but is passed in by the
* seq_noteon macro, so we have to have a placeholder for it.
*/
private void smfw_noteon(seq, voice, pitch, vel)
seq_type seq;
int voice, pitch, vel;
private void smfw_noteon(seq_type seq, int voice, int pitch, int vel)
{
if(debug) gprintf(TRANS, "smfw_noteon %d: %d %d(time:%ld)\n", voice, pitch, vel, virttime);
if (debug) gprintf(TRANS,
"smfw_noteon %d: %d %d(time:%ld)\n", voice, pitch, vel, virttime);
smfw_deltatime();
putc(NOTEON | (voice - 1), smfw_seq.outfile);
putc(pitch, smfw_seq.outfile);
@@ -273,183 +285,221 @@ private void smfw_noteon(seq, voice, pitch, vel)
/* smfw_process_event -- write a seq event to a midi file */
/**/
private void smfw_process_event(seq)
seq_type seq;
private void smfw_process_event(call_args_type args)
{
seq_type seq = args->arg[0];
register event_type event;
if (!seq->runflag) return;
while ((event = seq->current) && (event->ntime <= virttime)) {
unsigned int voice;
if ((vc_voice(event->nvoice) == smfw_seq.track) || /*if on current track*/
(((vc_voice(event->nvoice) - 16) == smfw_seq.track)
&& (smfw_seq.track > 0)) ||
/* acknowledge clock change on all tracks*/
(event->value == CLOCK_VALUE && vc_ctrl(event->nvoice) == ESC_CTRL)) {
unsigned int voice;
if ((vc_voice(event->nvoice) == smfw_seq.track) ||
/* if on current track */
(((vc_voice(event->nvoice) - 16) == smfw_seq.track)
&& (smfw_seq.track > 0)) ||
/* acknowledge clock change on all tracks*/
(event->value == CLOCK_VALUE &&
vc_ctrl(event->nvoice) == ESC_CTRL)) {
/* process all current (and earlier) events */
if (is_note(event)) { /*** play a note or rest ***/
/* if this note is not a rest, play it and schedule an off event */
if (event->value != NO_PITCH &&
(seq_channel_mask(seq) &
(1 << ((voice = vc_voice(event->nvoice)) - 1)))) {
seq_noteon(seq, voice, (0xFF & event->value),
(int) (event->u.note.ndur & 0xFF));
/* process all current (and earlier) events */
if (is_note(event)) { /*** play a note or rest ***/
/* if this note is not a rest, play it and schedule an
* off event */
if (event->value != NO_PITCH &&
(seq_channel_mask(seq) &
(1 << ((voice = vc_voice(event->nvoice)) - 1)))) {
seq_noteon(seq, voice, (0xFF & event->value),
(int) (event->u.note.ndur & 0xFF));
seq_cause_noteoff(seq, (event->u.note.ndur) >> 8,
voice, (0xFF & event->value));
}
} else { /*** send a control command ***/
int n;
time_type step;
int delta;
int increment;
int voice = vc_voice(event->nvoice);
ulong enabled = seq_channel_mask(seq) & (1 << (voice - 1));
switch (vc_ctrl(event->nvoice)) {
case PSWITCH_CTRL:
if (!enabled) break;
if(debug) gprintf(TRANS, "porta %d (time:%ld)... ", event->value, virttime);
seq_midi_ctrl(seq, voice, PORTASWITCH, 0xFF & event->value);
break;
case MODWHEEL_CTRL:
if (!enabled) break;
if(debug) gprintf(TRANS, "modw %d (time:%ld)...", event->value, virttime);
seq_midi_ctrl(seq, voice, MODWHEEL, 0xFF & event->value);
break;
case TOUCH_CTRL:
if (!enabled) break;
if(debug) gprintf(TRANS, "touch %d (time:%ld)... ", event->value, virttime);
seq_midi_touch(seq, voice, 0xFF & event->value);
break;
case VOLUME_CTRL:
if (!enabled) break;
if(debug) gprintf(TRANS, "ftvol %d (time:%ld)...", event->value, virttime);
seq_midi_ctrl(seq, voice, VOLUME, 0xFF & event->value);
break;
case BEND_CTRL:
if (!enabled) break;
if(debug) gprintf(TRANS, "bend %d (time:%ld)... ", event->value, virttime);
seq_midi_bend(seq, voice, event->value);
break;
case PROGRAM_CTRL:
if (!enabled) break;
if(debug) gprintf(TRANS, "prog %d (time:%ld)\n", event->value, virttime);
smfw_deltatime();
putc(MIDI_CH_PROGRAM | (voice - 1), smfw_seq.outfile);
putc(0xFF & event->value, smfw_seq.outfile);
break;
case ESC_CTRL:
switch (event->value) {
time_type this_event;
case CALL_VALUE: /*called routine will write to midifile in execution */
sequence = seq;
(*(event->u.call.routine))(event->u.call.args);
break;
case CLOCK_VALUE:
clock_ticksize = event->u.clock.ticksize;
if(debug) gprintf(TRANS, "clockevent! ticksize: %lu (time:%ld)\n",
clock_ticksize, virttime);
if (virttime > 0) { /* any clock before this is already recorded in the header */
if (smfw_seq.track == 0) { /* record clock event on tempo track = 0 */
/* cause clock write in half a newtick, because it was written .5 tick early*/
cause((delay_type) (clock_ticksize >> 17), smfw_clock_event,
last_tick_size, clock_ticksize);
last_tick_size = clock_ticksize; /*set new ticksize*/
} else { /*not on tempo track*/
this_event = ((virttime - last_clock_event) *
((2500L << 16) / last_tick_size)) / 100;
if(debug) gprintf(TRANS, "track != 0: Lastev: %ld Thisev: %ld NewLast: %ld\n",
last_event, this_event, this_event - last_event);
last_event = 0L - (this_event - last_event);
last_clock_event = virttime;
/*last_event is negative, so will be ADDED to next this_event*/
last_tick_size = clock_ticksize;
}
} else if (debug) gprintf(TRANS, "IGNORED\n");/* if virttime <= 0 */
break;
case MACCTRL_VALUE:
if (!enabled) break;
if (debug) gprintf(TRANS, "MACCTRL %d: %d (time:%ld)\n",
event->u.macctrl.ctrl_number, event->u.macctrl.value, virttime);
smfw_deltatime();
putc(MIDI_CTRL | (voice - 1), smfw_seq.outfile);
putc(0xFF & event->u.macctrl.ctrl_number, smfw_seq.outfile);
putc(0xFF & event->u.macctrl.value, smfw_seq.outfile);
break;
case MACRO_VALUE:
if (!enabled) break;
if (debug) gprintf(TRANS, "MACRO sent to...\n");
smfw_send_macro(event->u.macro.definition,
voice, event->u.macro.parameter, -1, 0);
break;
case CTRLRAMP_VALUE:
case DEFRAMP_VALUE: {
int from, to;
if (!enabled) break;
step = event->u.ramp.step;
if (event->value == CTRLRAMP_VALUE) {
if(debug) gprintf(TRANS, "CTRLRAMP (time:%ld)...", virttime);
from = event->u.ramp.u.ctrl.from_value;
to = event->u.ramp.u.ctrl.to_value;
} else {
if (debug) gprintf(TRANS, "DEFRAMP (time:%ld)...", virttime);
from = event->u.ramp.u.def.parameter[
event->u.ramp.u.def.parm_num];
to = event->u.ramp.u.def.to_value;
seq_cause_noteoff(seq, (event->u.note.ndur) >> 8,
voice, (0xFF & event->value));
}
} else { /*** send a control command ***/
int n;
time_type step;
int delta;
int increment;
int voice = vc_voice(event->nvoice);
ulong enabled = seq_channel_mask(seq) & (1 << (voice - 1));
switch (vc_ctrl(event->nvoice)) {
case PSWITCH_CTRL:
if (!enabled) break;
if (debug) gprintf(TRANS,
"porta %d (time:%ld)... ", event->value, virttime);
seq_midi_ctrl(seq, voice, PORTASWITCH, 0xFF & event->value);
break;
case MODWHEEL_CTRL:
if (!enabled) break;
if (debug) gprintf(TRANS,
"modw %d (time:%ld)...", event->value, virttime);
seq_midi_ctrl(seq, voice, MODWHEEL, 0xFF & event->value);
break;
case TOUCH_CTRL:
if (!enabled) break;
if (debug) gprintf(TRANS,
"touch %d (time:%ld)... ", event->value, virttime);
seq_midi_touch(seq, voice, 0xFF & event->value);
break;
case VOLUME_CTRL:
if (!enabled) break;
if (debug) gprintf(TRANS,
"ftvol %d (time:%ld)...", event->value, virttime);
seq_midi_ctrl(seq, voice, VOLUME, 0xFF & event->value);
break;
case BEND_CTRL:
if (!enabled) break;
if (debug) gprintf(TRANS,
"bend %d (time:%ld)... ", event->value, virttime);
seq_midi_bend(seq, voice, event->value);
break;
case PROGRAM_CTRL:
if (!enabled) break;
if (debug) gprintf(TRANS,
"prog %d (time:%ld)\n", event->value, virttime);
smfw_deltatime();
putc(MIDI_CH_PROGRAM | (voice - 1), smfw_seq.outfile);
putc(0xFF & event->value, smfw_seq.outfile);
break;
case ESC_CTRL:
switch (event->value) {
time_type this_event;
/* called routine will write to midifile in execution: */
case CALL_VALUE:
sequence = seq;
(*(event->u.call.routine))(event->u.call.args);
break;
case CLOCK_VALUE:
clock_ticksize = event->u.clock.ticksize;
if (debug) gprintf(TRANS,
"clockevent! ticksize: %lu (time:%ld)\n",
clock_ticksize, virttime);
if (virttime > 0) { /* any clock before this is
* already recorded in the header */
if (smfw_seq.track == 0) {
/* record clock event on tempo track = 0 */
/* cause clock write in half a newtick,
* because it was written .5 tick early */
call_args_node args;
args.arg[0] = (void *)(size_t)last_tick_size;
args.arg[1] = (void *)(size_t)clock_ticksize;
cause((delay_type) (clock_ticksize >> 17),
smfw_clock_event, &args);
/* set new ticksize: */
last_tick_size = clock_ticksize;
} else { /*not on tempo track*/
this_event = ((virttime - last_clock_event) *
((2500L << 16) / last_tick_size)) / 100;
if (debug) gprintf(TRANS,
"track != 0: Lastev: %ld Thisev: %ld NewLast: %ld\n",
last_event, this_event,
this_event - last_event);
last_event = 0L - (this_event - last_event);
last_clock_event = virttime;
/* last_event is negative, so will be ADDED
* to next this_event */
last_tick_size = clock_ticksize;
}
} else /* if virttime <= 0 */
if (debug) gprintf(TRANS, "IGNORED\n");
break;
case MACCTRL_VALUE:
if (!enabled) break;
if (debug) gprintf(TRANS,
"MACCTRL %d: %d (time:%ld)\n",
event->u.macctrl.ctrl_number,
event->u.macctrl.value, virttime);
smfw_deltatime();
putc(MIDI_CTRL | (voice - 1), smfw_seq.outfile);
putc(0xFF & event->u.macctrl.ctrl_number,
smfw_seq.outfile);
putc(0xFF & event->u.macctrl.value, smfw_seq.outfile);
break;
case MACRO_VALUE:
if (!enabled) break;
if (debug) gprintf(TRANS, "MACRO sent to...\n");
smfw_send_macro(event->u.macro.definition,
voice, event->u.macro.parameter, -1, 0);
break;
case CTRLRAMP_VALUE:
case DEFRAMP_VALUE: {
int from, to;
call_args_node re_args;
if (!enabled) break;
step = event->u.ramp.step;
if (event->value == CTRLRAMP_VALUE) {
if (debug) gprintf(TRANS,
"CTRLRAMP (time:%ld)...", virttime);
from = event->u.ramp.u.ctrl.from_value;
to = event->u.ramp.u.ctrl.to_value;
} else {
if (debug) gprintf(TRANS,
"DEFRAMP (time:%ld)...", virttime);
from = event->u.ramp.u.def.parameter[
event->u.ramp.u.def.parm_num];
to = event->u.ramp.u.def.to_value;
}
delta = to - from;
increment = delta;
if (delta < 0) delta = -delta;
/* RBD - Note: Step is always non-zero */
n = event->u.ramp.dur / step;
increment = (increment << 8) / n;
re_args.arg[0] = seq;
re_args.arg[1] = event;
re_args.arg[2] = (void *)(size_t)(from << 8);
re_args.arg[3] = (void *)(size_t)(to << 8);
re_args.arg[4] = (void *)(size_t)increment;
re_args.arg[5] = (void *)(size_t)step;
re_args.arg[6] = (void *)(size_t)n;
smfw_ramp_event(&re_args);
seq->noteoff_count++;
break;
}
case SETI_VALUE:
/* will be printed after writing is completed: */
seti_counter++;
*(event->u.seti.int_to_set) = event->u.seti.value;
break;
default:
gprintf(TRANS, "unexpected ESC_CTRL value\n");
break;
}
break;
default:
gprintf(TRANS, "unexpected seq data\n");
break;
}
delta = to - from;
increment = delta;
if (delta < 0) delta = -delta;
/* RBD - Note: Step is always non-zero */
n = event->u.ramp.dur / step;
increment = (increment << 8) / n;
smfw_ramp_event(seq, event, from << 8, to << 8,
increment, step, n);
seq->noteoff_count++;
break;
}
case SETI_VALUE:
seti_counter++; /*will be printed after writing is completed*/
*(event->u.seti.int_to_set) = event->u.seti.value;
break;
default:
gprintf(TRANS, "unexpected ESC_CTRL value\n");
break;
}
break;
default:
gprintf(TRANS, "unexpected seq data\n");
break;
}
}
seq->current = event->next;
}
seq->current = event->next;
}
if (seq->current) { /* if there is an event: delay, and then process again */
cause((delay_type)(event->ntime - virttime), smfw_process_event, seq);
if (seq->current) { /* if there is an event: delay, then process again */
cause((delay_type)(event->ntime - virttime), smfw_process_event, args);
}
}
/* smfw_ramp_event -- generate a ramp to write*/
private void smfw_ramp_event(seq, event, value, to_value, increment, step, n)
seq_type seq;
register event_type event;
unsigned int value;
unsigned int to_value;
int increment;
time_type step;
int n;
/* smfw_ramp_event -- generate a ramp to write */
private void smfw_ramp_event(call_args_type args)
{
if(debug) gprintf(TRANS, "ramp of %d: %d to %d\n", event->u.ramp.ctrl, value >> 8,
to_value >> 8);
seq_type seq = (seq_type) args->arg[0];
event_type event = (event_type) args->arg[1];
unsigned int value = (unsigned int)(size_t)args->arg[2];
unsigned int to_value = (unsigned int)(size_t)args->arg[3];
int increment = (int)(size_t)args->arg[4];
time_type step = (time_type)(size_t)args->arg[5];
int n = (int)(size_t)args->arg[6];
if (debug) gprintf(TRANS, "ramp of %d: %d to %d\n", event->u.ramp.ctrl,
value >> 8, to_value >> 8);
if (seq->runflag) {
int voice = vc_voice(event->nvoice);
if (n == 0) value = to_value;
else cause((delay_type)step, smfw_ramp_event, seq, event, value + increment,
to_value, increment, step, n - 1);
else {
args->arg[2] = (void *)(size_t)(value + increment); /* update value */
args->arg[6] = (void *)(size_t)(n - 1); /* update n */
cause((delay_type)step, smfw_ramp_event, args);
}
if (event->value == CTRLRAMP_VALUE) {
int ctrl = event->u.ramp.ctrl;
if (ctrl == -TOUCH_CTRL) smfw_touch(seq, voice, value >> 8);
@@ -461,7 +511,8 @@ private void smfw_ramp_event(seq, event, value, to_value, increment, step, n)
event->u.ramp.u.def.parameter,
event->u.ramp.u.def.parm_num, value >> 8);
}
if (n == 0) seq_end_event(seq);
/* really passing seq, but it's already in args: */
if (n == 0) seq_end_event(args);
}
}
@@ -502,7 +553,7 @@ private void smfw_send_macro(ptr, voice, parameter, parm_num, value)
/**/
private void smfw_touch(seq_type seq, int voice, int value)
{
if(debug) gprintf(TRANS, "smfw_touch %d\n", value);
if (debug) gprintf(TRANS, "smfw_touch %d\n", value);
smfw_deltatime();
putc(MIDI_TOUCH | (voice - 1), smfw_seq.outfile);
putc(value, smfw_seq.outfile);
@@ -541,12 +592,13 @@ void seq_write_smf(seq, outfile)
/* search for clock events up till start of score */
/* careful: there may be no events at all */
while(event && event->ntime <= 0){
if(debug) gprintf(TRANS, "event (time:%ld)\n", event->ntime);
if(vc_ctrl(event->nvoice) == ESC_CTRL && event->value == CLOCK_VALUE) {
if(debug) gprintf(TRANS, "clock %lu at 0\n", event->u.clock.ticksize);
if (debug) gprintf(TRANS, "event (time:%ld)\n", event->ntime);
if (vc_ctrl(event->nvoice) == ESC_CTRL && event->value == CLOCK_VALUE) {
if (debug) gprintf(TRANS,
"clock %lu at 0\n", event->u.clock.ticksize);
starting_ticksize = event->u.clock.ticksize;
break;
}
}
event = event->next;
}
@@ -562,10 +614,10 @@ void seq_write_smf(seq, outfile)
putc(0x01, smfw_seq.outfile); /*format 1 */
putc(0x00, smfw_seq.outfile);
track_count_marker = ftell(smfw_seq.outfile); /*number of tracks will be written later*/
putc(0x00, smfw_seq.outfile); /*will be filled by track_count_marker*/
putc(0x02, smfw_seq.outfile);/*division resolution of 600*/
/* number of tracks will be written later: */
track_count_marker = ftell(smfw_seq.outfile);
putc(0x00, smfw_seq.outfile); /* will be filled by track_count_marker */
putc(0x02, smfw_seq.outfile); /* division resolution of 600 */
putc(0x58, smfw_seq.outfile);
for (i = 0; i < 17; i++) { /* for each track... */
@@ -635,7 +687,7 @@ private void writevarlen(value)
{
register ulong buffer;
if(debug) gprintf(TRANS, "variable length quantity...");
if (debug) gprintf(TRANS, "variable length quantity...");
buffer = value & 0x7f;
@@ -646,10 +698,10 @@ private void writevarlen(value)
}
for(;;) {
if(debug) gprintf(TRANS, " byte ");
if (debug) gprintf(TRANS, " byte ");
putc((int) (buffer & 0xFF), smfw_seq.outfile);
if (buffer & 0x80) buffer >>= 8;
else break;
}
if(debug) gprintf(TRANS, "written!\n");
if (debug) gprintf(TRANS, "written!\n");
}

3
lib-src/libnyquist/nyquist/cmt/seqmwrite.h
View File

@@ -1,4 +1,3 @@
/* seqmwrite.h -- midi file writer */
void seq_write_smf(seq_type seq, FILE *outfile); /* LISP: (SEQ-WRITE-SMF SEQ FILE) */
void seq_write_smf(seq_type seq, FILE *outfile);

4
lib-src/libnyquist/nyquist/cmt/seqread.c
View File

@@ -471,7 +471,7 @@ private void docall()
if (fieldx == 1) fferror("Routine name expected");
else if (token[fieldx] != '(') fferror("Open paren expected");
else {
desc = &HASHENTRY(hash_lookup(symbol));
desc = &HASHENTRY(lookup(symbol));
if (!desc->symb_type) {
fieldx = 0;
fferror("Function not defined");
@@ -1038,7 +1038,7 @@ private void doset(vec_flag)
linex += scan();
if (!token[0]) fferror("Variable name expected");
else {
struct symb_descr *desc = &HASHENTRY(hash_lookup(token));
struct symb_descr *desc = &HASHENTRY(lookup(token));
if (!desc->symb_type) fferror("Called function not defined");
else if (vec_flag && (desc->symb_type != vec_symb_type)) {
fferror("This is not an array");

2
lib-src/libnyquist/nyquist/cmt/timebase.c
View File

@@ -129,7 +129,7 @@ void callshow(call)
gprintf(TRANS,"routine: %lx\n", (ulong)call->u.e.routine);
gprintf(TRANS,"parameters:");
for (i = 0; i < MAX_CALL_ARGS; i++) {
gprintf(TRANS, " %d", call->u.e.p.arg[i]);
gprintf(TRANS, " %p", call->u.e.p.arg[i]);
}
gprintf(TRANS, "\n");
}

24
lib-src/libnyquist/nyquist/cmt/timebase.h
View File

@@ -6,41 +6,23 @@
* call structure
****************************************************************************/
/* ---NOTE!!! if you change MAX_CALL_ARGS, change CALLARGS macro below--- */
#define MAX_CALL_ARGS 8
typedef struct call_args_struct {
long arg[MAX_CALL_ARGS];
} call_args_node;
void *arg[MAX_CALL_ARGS];
} call_args_node, *call_args_type;
typedef struct call {
union {
struct {
time_type time; /* virtual time of this call */
int priority; /* an 8-bit the priority, low priority first */
int (*routine)(); /* who to call */
void (*routine)(); /* who to call */
call_args_node p; /* what to pass */
} e;
struct call *p; /* used to link free calls */
} u;
} *call_type, call_node;
/* CALLARGS - given a call_type, this macro generates an argument list */
/*
* NOTE: originally, I thought call->u.e.p (a structure), would do it, but
* Lattice C for the Amiga has a compiler bug, and even in places where the
* bug doesn't show up, the code generated for the structure passing is
* a sequence of two loops: one to copy data to a local area on the stack,
* and one to push this data (a byte at a time!) to the top of the stack.
* With Lattice (and perhaps others, I haven't checked), it's better to
* push the data in-line.
*/
#ifdef LATTICE
#define CARG(n) call->u.e.p.arg[n]
#define CALLARGS(call) CARG(0), CARG(1), CARG(2), CARG(3), \
CARG(4), CARG(5), CARG(6), CARG(7)
#else
#define CALLARGS(call) call->u.e.p
#endif
/***************************************************************************
* timebase structure

6
lib-src/libnyquist/nyquist/cmt/userio.c
View File

@@ -1131,7 +1131,7 @@ char *c;
if ((*c) == '\r')
(*c) = '\n';
return(ret);
#else /* UNIX_MACH */
#else /* __APPLE__ */
#ifndef BUFFERED_SYNCHRONOUS_INPUT
int input = IOgetchar();
if (input != IOnochar) {
@@ -1141,7 +1141,7 @@ char *c;
}
#endif /* BUFFERED_SYNCHRONOUS_INPUT */
return FALSE;
#endif /* UNIX_MACH */
#endif /* __APPLE__ */
}
#endif
@@ -1246,7 +1246,7 @@ public int wait_ascii()
gflush();
getrlimit(RLIMIT_NOFILE, &file_limit);
select(file_limit.rlim_max+1, &readfds, 0, 0, NULL);
#endif /* !UNIX_MACH */
#endif /* !__APPLE__ */
#endif /* ifdef UNIX */
}
return (int) c;