Skip to content

Commit

Permalink
Merge branch '7.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@fggp
fggp authored Dec 15, 2024
2 parents 924a97d + 3587f7e commit e36d89b
Show file tree
Hide file tree
Showing 1,426 changed files with 13,855 additions and 20,616 deletions.
29 changes: 29 additions & 0 deletions Faustopcodes/top.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

<chapter id="FaustTop">
<title>Faust Opcodes</title>

<para>The Faust opcodes allows access from within Csound to the Faust language. Faust (Functional Audio Stream) is a functional programming language for sound synthesis and audio processing: <ulink url="https://faust.grame.fr/">https://faust.grame.fr/</ulink>. </para>
<para>The following opcodes are available:</para>

<itemizedlist>
<listitem>
<para><link linkend="faustaudio"><citetitle>faustaudio</citetitle></link> - Instantiates and runs a compiled Faust program.</para>
</listitem>
<listitem>
<para><link linkend="faustcompile"><citetitle>faustcompile</citetitle></link> - Produce a instantiable DSP process from a Faust program.</para>
</listitem>
<listitem>
<para><link linkend="faustdsp"><citetitle>faustdsp</citetitle></link> - Instantiates a Faust program.</para>
</listitem>
<listitem>
<para><link linkend="faustctl"><citetitle>faustctl</citetitle></link> - Adjusts a given control in a Faust DSP instance.</para>
</listitem>
<listitem>
<para><link linkend="faustgen"><citetitle>faustgen</citetitle></link> - Compiles, Instantiates and runs a compiled Faust program.</para>
</listitem>
<listitem>
<para><link linkend="faustplay"><citetitle>faustplay</citetitle></link> - Runs an instantiated Faust program.</para>
</listitem>
</itemizedlist>

</chapter>
14 changes: 4 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,7 @@ MISC = misc/amp.xml misc/csound64.xml misc/formants.xml misc/glossary.xml \
OPCODES = opcodes/0dbfs.xml opcodes/ATSadd.xml opcodes/ATSaddnz.xml \
opcodes/ATSbufread.xml opcodes/ATScross.xml opcodes/ATSinfo.xml \
opcodes/ATSinterpread.xml opcodes/ATSpartialtap.xml opcodes/ATSread.xml \
opcodes/ATSreadnz.xml opcodes/ATSsinnoi.xml opcodes/JackoAudioIn.xml \
opcodes/JackoAudioInConnect.xml opcodes/JackoAudioOut.xml \
opcodes/JackoAudioOutConnect.xml opcodes/JackoFreewheel.xml \
opcodes/JackoInfo.xml opcodes/JackoInit.xml \
opcodes/JackoMidiInConnect.xml opcodes/JackoMidiOut.xml \
opcodes/JackoMidiOutConnect.xml opcodes/JackoNoteOut.xml \
opcodes/JackoOn.xml opcodes/JackoTransport.xml \
opcodes/ATSreadnz.xml opcodes/ATSsinnoi.xml \
opcodes/OSCinit.xml opcodes/OSClisten.xml opcodes/OSCsend.xml \
opcodes/STKBandedWG.xml \
opcodes/STKBeeThree.xml opcodes/STKBlowBotl.xml opcodes/STKBlowHole.xml \
Expand Down Expand Up @@ -254,7 +248,7 @@ OPCODES = opcodes/0dbfs.xml opcodes/ATSadd.xml opcodes/ATSaddnz.xml \
opcodes/islider32.xml opcodes/islider64.xml opcodes/islider8.xml \
opcodes/itablecopy.xml opcodes/itablegpw.xml opcodes/itablemix.xml \
opcodes/itablew.xml opcodes/itrirand.xml opcodes/iunirand.xml \
opcodes/iweibull.xml opcodes/jacktransport.xml opcodes/jitter.xml \
opcodes/iweibull.xml opcodes/jitter.xml \
opcodes/jitter2.xml opcodes/joystick.xml opcodes/jspline.xml \
opcodes/kbetarand.xml opcodes/kbexprnd.xml opcodes/kcauchy.xml \
opcodes/k35_hpf.xml opcodes/k35_lpf.xml \
Expand Down Expand Up @@ -696,7 +690,7 @@ $(XSL_HTML) $(XSL_HTMLHELP) $(XSL_PRINT) $(XSL_HTML_ONECHUNK): %: %.in

examples-xml/stamp: examples $(wildcard examples/*)
mkdir -p examples-xml
python3 csd2docbook.py
python csd2docbook.py
touch examples-xml/stamp

html: $(XSL_HTML) manual.xml $(SRCS) Makefile
Expand All @@ -715,7 +709,7 @@ html: $(XSL_HTML) manual.xml $(SRCS) Makefile
@ echo "Remember to use the html-dist target for distribution!"

html-dist:
python3 quickref.py
python quickref.py
$(MAKE) html
#python makeframes.py

Expand Down
5 changes: 4 additions & 1 deletion STKopcodes/top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@
C++ (STK) web site at <ulink
url="https://ccrma.stanford.edu/software/stk">https://ccrma.stanford.edu/software/stk</ulink>.
</para>

<para>
Also, see the <link linkend="SiggenModels"><citetitle>Models and Emulations</citetitle> section </link>.
</para>

<bridgehead>Credits</bridgehead>
<para>
This implementation of the STK unit generators was written by Perry R. Cook
Expand Down
4 changes: 3 additions & 1 deletion command/flags.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,9 @@
Start and stop instances of instruments at the nearest
sample to the requested time. This is in contrast to
traditional Csound which rounds the times to the nearest
k-cycle. Note that this does not work with tied notes.
k-cycle. Note that this does not work with tied notes,
nor does it change the Midi timing (as this is only
affected by ksmps size (control rate).
</para>
</listitem>
</varlistentry>
Expand Down
4 changes: 3 additions & 1 deletion command/flagscategory.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,9 @@ csound5:output2 (playback right)</screen>
Start and stop instances of instruments at the nearest
sample to the requested time. This is in contrast to
traditional Csound which rounds the times to the nearest
k-cycle. Note that this does not work with tied notes.
k-cycle. Note that this does not work with tied notes,
nor does it change the Midi timing (as this is only
affected by ksmps size (control rate).
</para>
</listitem>
</varlistentry>
Expand Down
1 change: 1 addition & 0 deletions control/durctl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<listitem><para><link linkend="ihold"><citetitle>ihold</citetitle></link></para></listitem>
<listitem><para><link linkend="turnoff"><citetitle>turnoff</citetitle></link></para></listitem>
<listitem><para><link linkend="turnoff2"><citetitle>turnoff2</citetitle></link></para></listitem>
<listitem><para><link linkend="turnoff3"><citetitle>turnoff3</citetitle></link></para></listitem>
<listitem><para><link linkend="turnon"><citetitle>turnon</citetitle></link></para></listitem>
</itemizedlist>
</para>
Expand Down
16 changes: 15 additions & 1 deletion control/invocat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,33 @@
<itemizedlist>
<listitem><para><link linkend="event"><citetitle>event</citetitle></link></para></listitem>
<listitem><para><link linkend="event_i"><citetitle>event_i</citetitle></link></para></listitem>
<listitem><para><link linkend="scoreline_i"><citetitle>scoreline_i</citetitle></link></para></listitem>
<listitem><para><link linkend="nstance"><citetitle>nstance</citetitle></link></para></listitem>
<listitem><para><link linkend="readscore"><citetitle>readscore</citetitle></link></para></listitem>
<listitem><para><link linkend="scoreline_i"><citetitle>scoreline_i</citetitle></link></para></listitem>
<listitem><para><link linkend="scoreline"><citetitle>scoreline</citetitle></link></para></listitem>
<listitem><para><link linkend="schedule"><citetitle>schedule</citetitle></link></para></listitem>
<listitem><para><link linkend="schedulek"><citetitle>schedulek</citetitle></link></para></listitem>
<listitem><para><link linkend="schedwhen"><citetitle>schedwhen</citetitle></link></para></listitem>
<listitem><para><link linkend="schedkwhen"><citetitle>schedkwhen</citetitle></link></para></listitem>
<listitem><para><link linkend="schedkwhennamed"><citetitle>schedkwhennamed</citetitle></link></para></listitem>
</itemizedlist>
</para>

<para>
The <link linkend="mute"><citetitle>mute</citetitle></link> opcode can be used to mute/unmute instruments during a performance.
</para>

<para>
Instruments definitions can be removed using the <link linkend="remove"><citetitle>remove</citetitle></link> opcode.
</para>

<para>
These opcodes will compile one or more instruments at init time:
<itemizedlist>
<listitem><para><link linkend="compilecsd"><citetitle>compilecsd</citetitle></link></para></listitem>
<listitem><para><link linkend="compileorc"><citetitle>compileorc</citetitle></link></para></listitem>
<listitem><para><link linkend="compilestr"><citetitle>compilestr</citetitle></link></para></listitem>
</itemizedlist>
</para>

</section>
15 changes: 14 additions & 1 deletion control/pgmctl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,18 @@
<warning>
<simpara>Some of these opcodes work at i-rate even if they contain k- or a- rate comparisons. See the <link linkend="ControlReinitn"><citetitle>Reinitialization</citetitle></link> section.</simpara>
</warning>

<para>
These opcodes are part of a counter system:
</para>
<itemizedlist>
<listitem><para><link linkend="count"><citetitle>count</citetitle></link></para></listitem>
<listitem><para><link linkend="count_i"><citetitle>count_i</citetitle></link></para></listitem>
<listitem><para><link linkend="cntCycles"><citetitle>cntCycles</citetitle></link></para></listitem>
<listitem><para><link linkend="cntRead"><citetitle>cntRead</citetitle></link></para></listitem>
<listitem><para><link linkend="cntReset"><citetitle>cntReset</citetitle></link></para></listitem>
<listitem><para><link linkend="cntState"><citetitle>cntState</citetitle></link></para></listitem>
<listitem><para><link linkend="cntCreate"><citetitle>cntCreate</citetitle></link></para></listitem>
<listitem><para><link linkend="cntDelete"><citetitle>cntDelete</citetitle></link></para></listitem>
<listitem><para><link linkend="cntDelete_i"><citetitle>cntDelete_i</citetitle></link></para></listitem>
</itemizedlist>
</section>
3 changes: 2 additions & 1 deletion control/realtime.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
<itemizedlist>
<listitem><para><link linkend="active"><citetitle>active</citetitle></link></para></listitem>
<listitem><para><link linkend="cpuprc"><citetitle>cpuprc</citetitle></link></para></listitem>
<listitem><para><link linkend="cpumeter"><citetitle>cpumeter</citetitle></link></para></listitem>
<listitem><para><link linkend="exitnow"><citetitle>exitnow</citetitle></link></para></listitem>
<listitem><para><link linkend="maxalloc"><citetitle>maxalloc</citetitle></link></para></listitem>
<listitem><para><link linkend="prealloc"><citetitle>prealloc</citetitle></link></para></listitem>
<listitem><para><link linkend="jacktransport"><citetitle>jacktransport</citetitle></link></para></listitem>
</itemizedlist>
</para>
<para>The running csound process can be terminated using <link linkend="exitnow"><citetitle>exitnow</citetitle></link>.
Expand Down
24 changes: 20 additions & 4 deletions control/sensing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<listitem><para><link linkend="button"><citetitle>button</citetitle></link></para></listitem>
<listitem><para><link linkend="checkbox"><citetitle>checkbox</citetitle></link></para></listitem>
<listitem><para><link linkend="control"><citetitle>control</citetitle></link></para></listitem>
<listitem><para><link linkend="flashtxt"><citetitle>flashtxt</citetitle></link></para></listitem>
<listitem><para><link linkend="setctrl"><citetitle>setctrl</citetitle></link></para></listitem>
</itemizedlist>
</para>
Expand All @@ -16,6 +17,7 @@
<title>Keyboard and mouse sensing</title>
<para>
<itemizedlist>
<listitem><para><link linkend="joystick"><citetitle>joystick</citetitle></link></para></listitem>
<listitem><para><link linkend="sensekey"><citetitle>sensekey</citetitle></link> (also called <link linkend="sense"><citetitle>sense</citetitle></link>)</para></listitem>
<listitem><para><link linkend="xyin"><citetitle>xyin</citetitle></link></para></listitem>
</itemizedlist>
Expand All @@ -27,32 +29,44 @@
<itemizedlist>
<listitem><para><link linkend="follow"><citetitle>follow</citetitle></link></para></listitem>
<listitem><para><link linkend="follow2"><citetitle>follow2</citetitle></link></para></listitem>
<listitem><para><link linkend="lufs"><citetitle>lufs</citetitle></link></para></listitem>
<listitem><para><link linkend="peak"><citetitle>peak</citetitle></link></para></listitem>
<listitem><para><link linkend="rms"><citetitle>rms</citetitle></link></para></listitem>
<listitem><para><link linkend="vactrol"><citetitle>vactrol</citetitle></link></para></listitem>
</itemizedlist>
</para>
</simplesect>
<simplesect>
<title>Tempo and Pitch estimation</title>
<para><itemizedlist>
<listitem><para><link linkend="ptrack"><citetitle>ptrack</citetitle></link></para></listitem>
<listitem><para><link linkend="centroid"><citetitle>centroid</citetitle></link></para></listitem>
<listitem><para><link linkend="pitch"><citetitle>pitch</citetitle></link></para></listitem>
<listitem><para><link linkend="pitchamdf"><citetitle>pitchamdf</citetitle></link></para></listitem>
<listitem><para><link linkend="plltrack"><citetitle>plltrack</citetitle></link></para></listitem>
<listitem><para><link linkend="ptrack"><citetitle>ptrack</citetitle></link></para></listitem>
<listitem><para><link linkend="pvspitch"><citetitle>pvspitch</citetitle></link></para></listitem>
<listitem><para><link linkend="tempest"><citetitle>tempest</citetitle></link></para></listitem>
</itemizedlist></para>
</simplesect>
<simplesect>
<title>Tempo and Sequencing</title>
<para><itemizedlist>
<listitem><para><link linkend="tempo"><citetitle>tempo</citetitle></link></para></listitem>
<listitem><para><link linkend="changed"><citetitle>changed</citetitle></link></para></listitem>
<listitem><para><link linkend="changed2"><citetitle>changed2</citetitle></link></para></listitem>
<listitem><para><link linkend="metro"><citetitle>metro</citetitle></link></para></listitem>
<listitem><para><link linkend="metro2"><citetitle>metro2</citetitle></link></para></listitem>
<listitem><para><link linkend="metrobpm"><citetitle>metrobpm</citetitle></link></para></listitem>
<listitem><para><link linkend="miditempo"><citetitle>miditempo</citetitle></link></para></listitem>
<listitem><para><link linkend="tempoval"><citetitle>tempoval</citetitle></link></para></listitem>
<listitem><para><link linkend="seqtime"><citetitle>seqtime</citetitle></link></para></listitem>
<listitem><para><link linkend="seqtime2"><citetitle>seqtime2</citetitle></link></para></listitem>
<listitem><para><link linkend="sequ"><citetitle>sequ</citetitle></link></para></listitem>
<listitem><para><link linkend="splitrig"><citetitle>splitrig</citetitle></link></para></listitem>
<listitem><para><link linkend="tempo"><citetitle>tempo</citetitle></link></para></listitem>
<listitem><para><link linkend="tempoval"><citetitle>tempoval</citetitle></link></para></listitem>
<listitem><para><link linkend="trigger"><citetitle>trigger</citetitle></link></para></listitem>
<listitem><para><link linkend="trighold"><citetitle>trighold</citetitle></link></para></listitem>
<listitem><para><link linkend="trigseq"><citetitle>trigseq</citetitle></link></para></listitem>
<listitem><para><link linkend="timedseq"><citetitle>timedseq</citetitle></link></para></listitem>
<listitem><para><link linkend="changed"><citetitle>changed</citetitle></link></para></listitem>
</itemizedlist></para>
</simplesect>
<simplesect>
Expand All @@ -64,6 +78,8 @@
<simplesect>
<title>Score control</title>
<para><itemizedlist>
<listitem><para><link linkend="pcount"><citetitle>pcount</citetitle></link></para></listitem>
<listitem><para><link linkend="pindex"><citetitle>pindex</citetitle></link></para></listitem>
<listitem><para><link linkend="rewindscore"><citetitle>rewindscore</citetitle></link></para></listitem>
<listitem><para><link linkend="setscorepos"><citetitle>setscorepos</citetitle></link></para></listitem>
</itemizedlist></para>
Expand Down
1 change: 1 addition & 0 deletions control/stacks.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

<section id="ControlStacks">
<title>Stacks</title>
<para>These opcodes are deprecated. </para>
<para>
Csound implements a global stack that can be accessed with the following opcodes:
<itemizedlist>
Expand Down
4 changes: 4 additions & 0 deletions control/timeread.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<para>
Opcodes one can use to read time values are:
<itemizedlist>
<listitem><para><link linkend="elapsedcycles"><citetitle>elapsedcycles</citetitle></link></para></listitem>
<listitem><para><link linkend="elapsedtime"><citetitle>elapsedtime</citetitle></link></para></listitem>
<listitem><para><link linkend="eventcycles"><citetitle>eventcycles</citetitle></link></para></listitem>
<listitem><para><link linkend="eventtime"><citetitle>eventtime</citetitle></link></para></listitem>
<listitem><para><link linkend="readclock"><citetitle>readclock</citetitle></link></para></listitem>
<listitem><para><link linkend="rtclock"><citetitle>rtclock</citetitle></link></para></listitem>
<listitem><para><link linkend="timeinstk"><citetitle>timeinstk</citetitle></link></para></listitem>
Expand Down
1 change: 0 additions & 1 deletion control/top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
&controlclockctl;
&controlconditional;
&controldurctl;
&controlfltkintro;
&controlinvocat;
&controlpgmctl;
&controlrealtime;
Expand Down
2 changes: 1 addition & 1 deletion csound5/opcodes/py.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<title>Python Opcodes</title>
<section id="PythonOpcodes">
<title>Introduction</title>
<para>Using the Python opcode family, you can interact with a Python interpreter embedded in Csound in five ways:</para>
<para>Using the Python opcode family, you can interact with a Python3 interpreter embedded in Csound in five ways:</para>
<orderedlist>
<listitem><simpara>Initialize the Python interpreter (the <link
linkend="pyinit"><citetitle>pyinit</citetitle></link> opcodes),</simpara></listitem>
Expand Down
1 change: 0 additions & 1 deletion deprecated/top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</para>
</section>

&opcodesjackoon;
<!-- &opcodesabetarand; -->
<!-- &opcodesabexprnd; -->
<!-- &opcodesacauchy; -->
Expand Down
48 changes: 48 additions & 0 deletions examples/OSClistenex2.csd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<CsoundSynthesizer>
<CsOptions>
-odac --port=7000
</CsOptions>
<CsInstruments>
0dbfs = 1
instr 1
freq:k chnget "freq"
amp:k chnget "amp"
out oscili(0dbfs*amp, p4*freq)
status:k, f:k, mess:S, n:k OSClisten "/in", "fsi"
puts mess, status
printk2 n
printk2 f
status, nums:k[] OSClisten "/ina", "fi"
printk2 nums[0]
printk2 nums[1]
endin
instr 2
OSCsend 0, "localhost", 7000, "/csound/event/instr", "ffff", 1, 0, 1, 300
OSCsend 1, "localhost", 7000, "/csound/channel/freq/amp", "ff", p4, p5
OSCsend 2, "localhost", 7000, "/in", "fsi", p5, "hello", p4
OSCsend 3, "localhost", 7000, "/ina", "fi", p5, p4
OSCsend 4, "localhost", 7000, "/csound/event", "s", "i3 4 1"
OSCsend 5, "localhost", 7000, "/csound/compile", "s", "schedule 1,2,2,500"
endin
instr 3
OSCsend 0, "localhost", 7000, "/csound/stop"
endin
</CsInstruments>
<CsScore>
i2 0 2 1 0.2
</CsScore>
</CsoundSynthesizer>









16 changes: 8 additions & 8 deletions examples/allpole-2.csd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<CsInstruments>
sr = 44100
ksmps = 64
nchnls = 1
0dbfs = 1
ksmps = 32
nchnls = 2
0dbfs = 1
gifn ftgen 0,0,0,1,"fox.wav",0,0,1
gifn ftgen 0,0,0,1,"Mathews.wav",0,0,1
gifw ftgen 0,0,1024,20,2,1
instr 1
k1 init 0
kts = p4
kcfs[],krms,kerr,kcps lpcanal k1,1,gifn,1024,ksmps,gifw
if kcps > 180 then
kcps = 180
if kcps > 120 then
kcps = 120
endif
a1 buzz 0dbfs, kcps, sr/(kcps*2), -1
a3 allpole a1*krms*kerr,kcfs
Expand All @@ -26,13 +26,13 @@ if k1 > ftlen(gifn) then
k1 = 0
endif
a3 dcblock a3
out a3
outs a3*10, a3*10
endin
</CsInstruments>
<CsScore>
i1 0 10 1
i1 10 10 .75
i1 10 10 .2
i1 20 10 1.5
</CsScore>
</CsoundSynthesizer>
Loading

0 comments on commit e36d89b

Please sign in to comment.