Skip to content

Commit

Permalink
Merge branch 'master' into 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vlazzarini committed Mar 20, 2024
2 parents a1bf7ca + 388e746 commit dc97117
Show file tree
Hide file tree
Showing 10 changed files with 176 additions and 82 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ $(XSL_HTML) $(XSL_HTMLHELP) $(XSL_PRINT) $(XSL_HTML_ONECHUNK): %: %.in

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

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

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

Expand Down
138 changes: 69 additions & 69 deletions deprecated/top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,52 +13,52 @@
</section>

&opcodesjackoon;
&opcodesabetarand;
&opcodesabexprnd;
&opcodesacauchy;
&opcodesaexprand;
&opcodesagauss;
&opcodesagogobel;
&opcodesalinrand;
&opcodesapcauchy;
&opcodesapoisson;
&opcodesapow;
<!-- &opcodesabetarand; -->
<!-- &opcodesabexprnd; -->
<!-- &opcodesacauchy; -->
<!-- &opcodesaexprand; -->
<!-- &opcodesagauss; -->
<!-- &opcodesagogobel; -->
<!-- &opcodesalinrand; -->
<!-- &opcodesapcauchy; -->
<!-- &opcodesapoisson; -->
<!-- &opcodesapow; -->
&opcodesarray;
&opcodesatrirand;
&opcodesaunirand;
&opcodesaweibull;
<!-- &opcodesatrirand; -->
<!-- &opcodesaunirand; -->
<!-- &opcodesaweibull; -->
&opcodesbformdec;
&opcodesbformenc;
&opcodesclock;
&opcodesfin;
&opcodeshrtfer;
&opcodesibetarand;
&opcodesibexprnd;
&opcodesicauchy;
&opcodesictrl14;
&opcodesictrl21;
&opcodesictrl7;
&opcodesiexprand;
&opcodesigauss;
&opcodesilinrand;
&opcodesimidic14;
&opcodesimidic21;
&opcodesimidic7;
<!-- &opcodesibetarand; -->
<!-- &opcodesibexprnd; -->
<!-- &opcodesicauchy; -->
<!-- &opcodesictrl14; -->
<!-- &opcodesictrl21; -->
<!-- &opcodesictrl7; -->
<!-- &opcodesiexprand; -->
<!-- &opcodesigauss; -->
<!-- &opcodesilinrand; -->
<!-- &opcodesimidic14; -->
<!-- &opcodesimidic21; -->
<!-- &opcodesimidic7; -->
&opcodesinstimek;
&opcodesinstimes;
&opcodesioff;
&opcodesion;
&opcodesiondur2;
&opcodesiondur;
&opcodesioutat;
&opcodesioutc14;
&opcodesioutc;
&opcodesioutpat;
&opcodesioutpb;
&opcodesioutpc;
&opcodesipcauchy;
&opcodesipoisson;
&opcodesipow;
<!-- &opcodesioff; -->
<!-- &opcodesion; -->
<!-- &opcodesiondur2; -->
<!-- &opcodesiondur; -->
<!-- &opcodesioutat; -->
<!-- &opcodesioutc14; -->
<!-- &opcodesioutc; -->
<!-- &opcodesioutpat; -->
<!-- &opcodesioutpb; -->
<!-- &opcodesioutpc; -->
<!-- &opcodesipcauchy; -->
<!-- &opcodesipoisson; -->
<!-- &opcodesipow; -->
&opcodesis16b14;
&opcodesis32b14;
&opcodesislider16;
Expand All @@ -69,38 +69,38 @@
&opcodesitablegpw;
&opcodesitablemix;
&opcodesitablew;
&opcodesitrirand;
&opcodesiunirand;
&opcodesiweibull;
&opcodeskbetarand;
&opcodeskbexprnd;
&opcodeskcauchy;
&opcodeskdump2;
&opcodeskdump3;
&opcodeskdump4;
&opcodeskdump;
&opcodeskexprand;
&opcodeskfilter2;
&opcodeskgauss;
&opcodesklinrand;
&opcodeskon;
&opcodeskoutat;
&opcodeskoutc14;
&opcodeskoutc;
&opcodeskoutpat;
&opcodeskoutpb;
&opcodeskoutpc;
&opcodeskpcauchy;
&opcodeskpoisson;
&opcodeskpow;
&opcodeskread2;
&opcodeskread3;
&opcodeskread4;
&opcodeskread;
<!-- &opcodesitrirand; -->
<!-- &opcodesiunirand; -->
<!-- &opcodesiweibull; -->
<!-- &opcodeskbetarand; -->
<!-- &opcodeskbexprnd; -->
<!-- &opcodeskcauchy; -->
<!-- &opcodeskdump2; -->
<!-- &opcodeskdump3; -->
<!-- &opcodeskdump4; -->
<!-- &opcodeskdump; -->
<!-- &opcodeskexprand; -->
<!-- &opcodeskfilter2; -->
<!-- &opcodeskgauss; -->
<!-- &opcodesklinrand; -->
<!-- &opcodeskon; -->
<!-- &opcodeskoutat; -->
<!-- &opcodeskoutc14; -->
<!-- &opcodeskoutc; -->
<!-- &opcodeskoutpat; -->
<!-- &opcodeskoutpb; -->
<!-- &opcodeskoutpc; -->
<!-- &opcodeskpcauchy; -->
<!-- &opcodeskpoisson; -->
<!-- &opcodeskpow; -->
<!-- &opcodeskread2; -->
<!-- &opcodeskread3; -->
<!-- &opcodeskread4; -->
<!-- &opcodeskread; -->
&opcodesktableseg;
&opcodesktrirand;
&opcodeskunirand;
&opcodeskweibull;
<!-- &opcodesktrirand; -->
<!-- &opcodeskunirand; -->
<!-- &opcodeskweibull; -->
&opcodessc_lag;
&opcodessc_lagud;
&opcodessc_phasor;
Expand Down
6 changes: 3 additions & 3 deletions examples/flanger.csd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ instr 1
kfeedback = p4
asnd vco2 .2, 50
adel linseg 0, p3*.5, 0.02, p3*.5, 0 ;max delay time =20ms
aflg flanger asnd, adel, kfeedback
aflg flanger asnd, adel, kfeedback, 1
asig clip aflg, 1, 1
outs asig+asnd, asig+asnd ;mix flanger with original
endin
</CsInstruments>
<CsScore>
i 1 0 10 .2
i 1 11 10 .8 ;lot of feedback
i 1.1 0 10 .2
i 1.1 10 10 .8 ;lot of feedback
e
</CsScore>
</CsoundSynthesizer>
76 changes: 76 additions & 0 deletions examples/musical/schedkwhen_Daughtrey.csd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<CsoundSynthesizer>
<CsOptions>
-odac
; output for writing audio file with
; Android version of Csound:
;-o/sdcard/TableArps.wav
</CsOptions>
<CsInstruments>
sr = 44100
ksmps = 32
nchnls = 2
0dbfs = 1
; initialize global reverb channels
gaRvbL init 0
gaRvbR init 0
; initialize Count at -1 so Note tables are read starting at index 0
giCount init -1
; arpeggio note tables
giMinAdd2 ftgen 1, 0, 0, 2, 60, 62, 63, 67, 72,
74, 75, 74, 72, 67, 63, 62
giMajAdd2 ftgen 2, 0, 0, 2, 60, 62, 64, 67, 72,
74, 76, 74, 72, 67, 64, 62
instr Trigger
kTrig metro 8
schedkwhen kTrig, 0, 0, "Arps", 0, 1/3, p4, p5, p6 ; trigger a note
endin
instr Arps
giCount = giCount + 1
iNote = table(giCount, p6, 0, 0, 1) ;read incrementally from the table
kEnv = linsegr(0, 0.003, p5, p3, p5, .5, 0) ; amplitude envelope
iRnd = random(0.92, 0.98) ; randomize amp and pluck point
iDtn = random(-0.05, 0.05) ; random detune
iFreq = cpsmidinn(iNote + p4 + iDtn) ; convert note table values to cps
aSig = wgpluck2(iRnd, kEnv/5*iRnd, iFreq, .25, 0.06) ; plucked string opcodr
kEnv2 = linseg(.1, p3/2, 0)
aSig2 = oscil(kEnv2*.1*iRnd, iFreq + 12) ; sine osc one octave higher
aMixL = aSig+aSig2/2
aMixR = aSig+aSig2
gaRvbL += aSig*.22 ; send to global reverb channels
gaRvbR += aSig*.22
outs(aMixL, aMixR)
endin
instr Reverb
aRvbL,aRvbR reverbsc gaRvbL, gaRvbR, 0.91, 11000
outs(aRvbL,aRvbR)
clear(gaRvbL,gaRvbR)
endin
</CsInstruments>
<CsScore>
i"Reverb" 0 34
; for instr Trigger: p4=number of semi-tones
; away from original note table freqs,
; p5=amp, p6=table used
i"Trigger" 0 5 0 .8 1
i . 5 . -4 .8 2
i . 10 . -7 .8 1
i . 15 5.1 -2 .8 2
i . 22 1 -12 .8 1
i . 23 . -9 .8 2
i . 24 . -7 .8 1
i . 25 . -4 .8 2
i . 26 . -2 .8 2
i . 27 2 0 .8 1
i . 29 0.7 3 .8 2
e
</CsScore>
</CsoundSynthesizer>
; example by Scott Daughtrey
; inspired by example 01D13 by Iain McCurdy
; from the FLOSS manual
11 changes: 11 additions & 0 deletions misc/examples.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
<formalpara><title>Signal Generators:Scanned Synthesis</title><simpara />
<para><ulink url="examples/scanhammer.csd"><citetitle>scanhammer.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/scanmap.csd"><citetitle>scanmap.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/scanmap_matrxT.csd"><citetitle>scanmap_matrxT.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/scans.csd"><citetitle>scans.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/scans-2.csd"><citetitle>scans-2.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/scantable.csd"><citetitle>scantable.csd</citetitle></ulink></para><simpara />
Expand Down Expand Up @@ -846,8 +847,18 @@
<para><ulink url="examples/times_complex.csd"><citetitle>times_complex.csd</citetitle></ulink></para><simpara />
</formalpara>
<formalpara><title>Jacko Opcodes</title><simpara />
<para><ulink url="examples/JackoAudioIn.csd"><citetitle>JackoAudioIn.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoAudioIn.csd"><citetitle>JackoAudioIn.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoAudioOut.csd"><citetitle>JackoAudioOut.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoAudioOut.csd"><citetitle>JackoAudioOut.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoFreewheel.csd"><citetitle>JackoFreewheel.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoInfo.csd"><citetitle>JackoInfo.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoInit.csd"><citetitle>JackoInit.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoMidiInConnect.csd"><citetitle>JackoMidiInConnect.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoMidiOut.csd"><citetitle>JackoMidiOut.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoNoteOut.csd"><citetitle>JackoNoteOut.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoNoteOut.csd"><citetitle>JackoNoteOut.csd</citetitle></ulink></para><simpara />
<para><ulink url="examples/JackoTransport.csd"><citetitle>JackoTransport.csd</citetitle></ulink></para><simpara />
</formalpara>
<formalpara><title>Serial I/O</title><simpara />
<para><ulink url="examples/arduinoRead.csd"><citetitle>arduinoRead.csd</citetitle></ulink></para><simpara />
Expand Down
7 changes: 4 additions & 3 deletions misc/quickref.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@
ifn2, ifn3, ifn4, ivibfn]</synopsis><para/>
<synopsis>ares <link linkend="fmwurlie">fmwurlie</link> kamp, kfreq, kc1, kc2, kvdepth, kvrate, ifn1, ifn2, ifn3, \
ifn4, ivfn</synopsis><para/>
<synopsis>ares <link linkend="foscil">foscil</link> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis><para/>
<synopsis>ares <link linkend="foscili">foscili</link> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis><para/>
<synopsis>ares <link linkend="foscil">foscil</link> xamp, kcps, xcar, xmod, kndx [, ifn , iphs]</synopsis><para/>
<synopsis>ares <link linkend="foscili">foscili</link> xamp, kcps, xcar, xmod,
kndx [, ifn, iphs]</synopsis><para/>
</para></formalpara>
<para></para><para></para><formalpara>
<title>Signal Generators:Granular Synthesis</title>
Expand Down Expand Up @@ -1186,7 +1187,7 @@
<synopsis><link linkend="JackoMidiInConnect">JackoMidiInConnect </link>SexternalPortName, ScsoundPortName</synopsis><para/>
<synopsis><link linkend="JackoMidiOut">JackoMidiOut </link> ScsoundPortName, kstatus, kchannel, kdata1[, kdata2]</synopsis><para/>
<synopsis><link linkend="JackoMidiOutConnect">JackoMidiOutConnect </link>ScsoundPortName, SexternalPortName</synopsis><para/>
<synopsis><link linkend="JackoNoteOut">JackoNoteOut </link> ScsoundPortName, kstatus, kchannel, kdata1[, kdata2]</synopsis><para/>
<synopsis><link linkend="JackoNoteOut">JackoNoteOut </link> ScsoundPortName, kchannel, kdata1[, kdata2]</synopsis><para/>
<synopsis><link linkend="JackoOn">JackoOn </link>[iactive] </synopsis><para/>
<synopsis><link linkend="JackoTransport">JackoTransport </link> kcommand, [kposition]</synopsis><para/>
</para></formalpara>
Expand Down
5 changes: 3 additions & 2 deletions opcodes/foscil.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@

<refsect1>
<title>Syntax</title>
<synopsis>ares <command>foscil</command> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis>
<synopsis>ares <command>foscil</command> xamp, kcps, xcar, xmod, kndx [, ifn , iphs]</synopsis>
</refsect1>

<refsect1>
<title>Initialization</title>
<para>
<emphasis>ifn</emphasis> -- function table number. Requires a wrap-around guard point.
<emphasis>ifn</emphasis> (optional) -- function table number. Requires a
wrap-around guard point. Defaults to a sine wave.
</para>

<para>
Expand Down
6 changes: 4 additions & 2 deletions opcodes/foscili.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@

<refsect1>
<title>Syntax</title>
<synopsis>ares <command>foscili</command> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis>
<synopsis>ares <command>foscili</command> xamp, kcps, xcar, xmod,
kndx [, ifn, iphs]</synopsis>
</refsect1>

<refsect1>
<title>Initialization</title>
<para>
<emphasis>ifn</emphasis> -- function table number. Requires a wrap-around guard point.
<emphasis>ifn</emphasis> (optional) -- function table
number. Requires a wrap-around guard point. Defaults to a sine wave/
</para>

<para>
Expand Down
3 changes: 3 additions & 0 deletions opcodes/schedkwhen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
<para>See the sections <link linkend="UsingRealTime"><citetitle>Real-time Audio</citetitle></link> and <link linkend="CommandFlags"><citetitle>Command Line Flags</citetitle></link> for more information on using command line flags.</para>
<xi:include href="examples-xml/schedkwhen.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</example>
<para>
A musical example featuring the schedkwhen opcode: <ulink url="examples/musical/schedkwhen_Daughtrey.csd"><citetitle>schedkwhen_Daughtrey.csd</citetitle></ulink> by Scott Daughtrey.
</para>
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion opcodes/setcol.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<refsect1>
<title>Syntax</title>
<synopsis>i/kout[] <command>setcol</command>i/kin[],i/kcol</synopsis>
<synopsis>i/kout[] <command>setcol</command> i/kin[],i/kcol</synopsis>
</refsect1>

<refsect1>
Expand Down

0 comments on commit dc97117

Please sign in to comment.