Merge branch 'master' into gh-pages

concord-consortium · Jan 8, 2024 · afa434b · afa434b
2 parents 5cee7dc + e1bdefe
commit afa434b
Show file tree

Hide file tree

Showing 128 changed files with 36,100 additions and 187 deletions.
diff --git a/Sonification/MicroRhythm/StableGrains.csd b/Sonification/MicroRhythm/StableGrains.csd
diff --git a/Sonification/CsoundPlayground/app.js → ...icationPrototypes/CsoundPlayground/app.js b/Sonification/CsoundPlayground/app.js → ...icationPrototypes/CsoundPlayground/app.js
diff --git a/Sonification/CsoundPlayground/code/test.js → ...nPrototypes/CsoundPlayground/code/test.js b/Sonification/CsoundPlayground/code/test.js → ...nPrototypes/CsoundPlayground/code/test.js
diff --git a/Sonification/CsoundPlayground/index.html → ...ionPrototypes/CsoundPlayground/index.html b/Sonification/CsoundPlayground/index.html → ...ionPrototypes/CsoundPlayground/index.html
diff --git a/Sonification/CsoundPlayground/info.md → ...cationPrototypes/CsoundPlayground/info.md b/Sonification/CsoundPlayground/info.md → ...cationPrototypes/CsoundPlayground/info.md
diff --git a/...cation/CsoundPlayground/package-lock.json → ...otypes/CsoundPlayground/package-lock.json b/...cation/CsoundPlayground/package-lock.json → ...otypes/CsoundPlayground/package-lock.json
diff --git a/Sonification/CsoundPlayground/package.json → ...nPrototypes/CsoundPlayground/package.json b/Sonification/CsoundPlayground/package.json → ...nPrototypes/CsoundPlayground/package.json
diff --git a/Sonification/DataMovesSequencer/app.js → ...ationPrototypes/DataMovesSequencer/app.js b/Sonification/DataMovesSequencer/app.js → ...ationPrototypes/DataMovesSequencer/app.js
diff --git a/Sonification/DataMovesSequencer/index.html → ...nPrototypes/DataMovesSequencer/index.html b/Sonification/DataMovesSequencer/index.html → ...nPrototypes/DataMovesSequencer/index.html
diff --git a/Sonification/DataMovesSequencer/info.md → ...tionPrototypes/DataMovesSequencer/info.md b/Sonification/DataMovesSequencer/info.md → ...tionPrototypes/DataMovesSequencer/info.md
diff --git a/Sonification/Glissando/app.js → SonificationPrototypes/Glissando/app.js b/Sonification/Glissando/app.js → SonificationPrototypes/Glissando/app.js
diff --git a/Sonification/Glissando/glissando.csd → ...icationPrototypes/Glissando/glissando.csd b/Sonification/Glissando/glissando.csd → ...icationPrototypes/Glissando/glissando.csd
diff --git a/Sonification/Glissando/index.html → SonificationPrototypes/Glissando/index.html b/Sonification/Glissando/index.html → SonificationPrototypes/Glissando/index.html
diff --git a/Sonification/Glissando/info.md → SonificationPrototypes/Glissando/info.md b/Sonification/Glissando/info.md → SonificationPrototypes/Glissando/info.md
diff --git a/Sonification/GroupMFCC/app.js → SonificationPrototypes/GroupMFCC/app.js b/Sonification/GroupMFCC/app.js → SonificationPrototypes/GroupMFCC/app.js
diff --git a/Sonification/GroupMFCC/index.html → SonificationPrototypes/GroupMFCC/index.html b/Sonification/GroupMFCC/index.html → SonificationPrototypes/GroupMFCC/index.html
diff --git a/Sonification/Library/app.js → SonificationPrototypes/Library/app.js b/Sonification/Library/app.js → SonificationPrototypes/Library/app.js
diff --git a/Sonification/Library/index.html → SonificationPrototypes/Library/index.html b/Sonification/Library/index.html → SonificationPrototypes/Library/index.html
diff --git a/Sonification/Library/info.md → SonificationPrototypes/Library/info.md b/Sonification/Library/info.md → SonificationPrototypes/Library/info.md
diff --git a/Sonification/MicroRhythm/ContDrums.csd → ...ationPrototypes/MicroRhythm/ContDrums.csd b/Sonification/MicroRhythm/ContDrums.csd → ...ationPrototypes/MicroRhythm/ContDrums.csd
diff --git a/Sonification/MicroRhythm/FMGranular.csd → ...tionPrototypes/MicroRhythm/FMGranular.csd b/Sonification/MicroRhythm/FMGranular.csd → ...tionPrototypes/MicroRhythm/FMGranular.csd
diff --git a/Sonification/MicroRhythm/PitchedNoise.csd → ...onPrototypes/MicroRhythm/PitchedNoise.csd b/Sonification/MicroRhythm/PitchedNoise.csd → ...onPrototypes/MicroRhythm/PitchedNoise.csd
diff --git a/Sonification/MicroRhythm/SawTooth.csd → ...cationPrototypes/MicroRhythm/SawTooth.csd b/Sonification/MicroRhythm/SawTooth.csd → ...cationPrototypes/MicroRhythm/SawTooth.csd
diff --git a/...fication/MicroRhythm/SinusoidalGrains.csd → ...ototypes/MicroRhythm/SinusoidalGrains.csd b/...fication/MicroRhythm/SinusoidalGrains.csd → ...ototypes/MicroRhythm/SinusoidalGrains.csd
diff --git a/SonificationPrototypes/MicroRhythm/StableGrains.csd b/SonificationPrototypes/MicroRhythm/StableGrains.csd
@@ -0,0 +1,100 @@
+<CsoundSynthesizer>
+<CsOptions>
+-odac -d
+</CsOptions>
+<CsInstruments>
+sr = 44100
+ksmps = 200   ; control rate in samples per second
+nchnls = 2    ; number or channels
+0dbfs = 1.0
+
+zakinit 1, 1
+gimixch = 1
+turnon "MIX"
+
+gkfreq init 1
+gktrig init 0
+
+gisaw ftgen 1, 0, 16384, 7, -1, 16384, 1
+
+; The MASTER Instrument sets up the metronome and phasor
+instr 1, MASTER
+kfreq chnget "playbackSpeed" ; playbackSpeed is set by app and is a number between 0 and 1.
+gkfreq = expcurve(kfreq, 50)
+gkfreq = expcurve(gkfreq, 50)
+gkfreq = scale(gkfreq, 5, 0.05) ; scales gkfreq to be within .05 and 5
+
+kphase phasor gkfreq, p4
+chnset kphase, "phase"
+
+kclick chnget "click" ; The click instrument is enabled by the app and is either 0 or 1.
+iphasesubdiv = 1 ; A playback cycle is equally divided into 3 phase "regions."
+ktrig = trigger((kphase * iphasesubdiv) % 1, 0.5, 1) ; Trigger the click 3 times per cycle.
+knumclicks = floor(kphase * iphasesubdiv) + 1 ; Each time triggered, the click may quickly repeat N times.
+
+if kclick == 1 && (ktrig == 1 || kphase == 0) then
+    kidx = 0
+    loop: ; A for-loop that plays the click 1, 2, or 3 times depending on the current phase region.
+        koffset = kidx * 0.125
+        event "i", "CLICK", koffset, 0.05
+    loop_lt kidx, 1, knumclicks, loop
+endif
+endin
+
+; The SOFT, HARD, etc. instruments actually create sounds
+instr 2, SOFT
+iatk = 0.002
+knotenum = scale(p4, 110, 55)
+ilowboost = (110 - i(knotenum)) / 55 * 0.5
+igain = (p5 + ilowboost) * 0.075
+aenv = madsr:a(iatk, p3-iatk, 0, 0) * igain
+asig oscil aenv, cpsmidinn(knotenum)
+zawm asig, gimixch
+endin
+
+instr 3, HARD
+iatk = 0.002
+knotenum = scale(p4, 110, 55)
+ilowboost = (110 - i(knotenum)) / 55 * 0.5
+igain = (p5 + ilowboost) * 0.025
+aenv = madsr:a(iatk, p3-iatk, 0, 0) * igain
+asig oscil aenv, cpsmidinn(knotenum), 1
+zawm asig, gimixch
+endin
+
+instr 4, CONTINUOUS
+innmin = 55
+innmax = 110
+innrange = innmax - innmin
+
+innstart = p5 * innrange + innmin
+innend = p6 * innrange + innmin
+knotenum line innstart, p7, innend
+igain = 0.1 * p4
+
+asig oscil igain, cpsmidinn(knotenum), -1, -1
+zawm asig, gimixch
+endin
+
+; The CLICK instrument creates a click event every time the metronome triggers
+; a restart
+instr 5, CLICK
+aenv = expseg(0.2, p3, 0.001)
+asig noise aenv, 0
+outs asig, asig
+endin
+
+; The MIX channel aggregates and limits the output volume.
+instr +MIX
+asig zar gimixch
+zacl 0, gimixch
+
+asig limit asig, -1, 1
+outs asig, asig
+endin
+
+</CsInstruments>
+<CsScore>
+f0 36000
+</CsScore>
+</CsoundSynthesizer>