Skip to content

Commit dc97117

Browse files
author
vlazzarini
committed
Merge branch 'master' into 7.0
2 parents a1bf7ca + 388e746 commit dc97117

File tree

10 files changed

+176
-82
lines changed

10 files changed

+176
-82
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ $(XSL_HTML) $(XSL_HTMLHELP) $(XSL_PRINT) $(XSL_HTML_ONECHUNK): %: %.in
696696

697697
examples-xml/stamp: examples $(wildcard examples/*)
698698
mkdir -p examples-xml
699-
python csd2docbook.py
699+
python3 csd2docbook.py
700700
touch examples-xml/stamp
701701

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

717717
html-dist:
718-
python quickref.py
718+
python3 quickref.py
719719
$(MAKE) html
720720
#python makeframes.py
721721

‎deprecated/top.xml

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -13,52 +13,52 @@
1313
</section>
1414

1515
&opcodesjackoon;
16-
&opcodesabetarand;
17-
&opcodesabexprnd;
18-
&opcodesacauchy;
19-
&opcodesaexprand;
20-
&opcodesagauss;
21-
&opcodesagogobel;
22-
&opcodesalinrand;
23-
&opcodesapcauchy;
24-
&opcodesapoisson;
25-
&opcodesapow;
16+
<!-- &opcodesabetarand; -->
17+
<!-- &opcodesabexprnd; -->
18+
<!-- &opcodesacauchy; -->
19+
<!-- &opcodesaexprand; -->
20+
<!-- &opcodesagauss; -->
21+
<!-- &opcodesagogobel; -->
22+
<!-- &opcodesalinrand; -->
23+
<!-- &opcodesapcauchy; -->
24+
<!-- &opcodesapoisson; -->
25+
<!-- &opcodesapow; -->
2626
&opcodesarray;
27-
&opcodesatrirand;
28-
&opcodesaunirand;
29-
&opcodesaweibull;
27+
<!-- &opcodesatrirand; -->
28+
<!-- &opcodesaunirand; -->
29+
<!-- &opcodesaweibull; -->
3030
&opcodesbformdec;
3131
&opcodesbformenc;
3232
&opcodesclock;
3333
&opcodesfin;
3434
&opcodeshrtfer;
35-
&opcodesibetarand;
36-
&opcodesibexprnd;
37-
&opcodesicauchy;
38-
&opcodesictrl14;
39-
&opcodesictrl21;
40-
&opcodesictrl7;
41-
&opcodesiexprand;
42-
&opcodesigauss;
43-
&opcodesilinrand;
44-
&opcodesimidic14;
45-
&opcodesimidic21;
46-
&opcodesimidic7;
35+
<!-- &opcodesibetarand; -->
36+
<!-- &opcodesibexprnd; -->
37+
<!-- &opcodesicauchy; -->
38+
<!-- &opcodesictrl14; -->
39+
<!-- &opcodesictrl21; -->
40+
<!-- &opcodesictrl7; -->
41+
<!-- &opcodesiexprand; -->
42+
<!-- &opcodesigauss; -->
43+
<!-- &opcodesilinrand; -->
44+
<!-- &opcodesimidic14; -->
45+
<!-- &opcodesimidic21; -->
46+
<!-- &opcodesimidic7; -->
4747
&opcodesinstimek;
4848
&opcodesinstimes;
49-
&opcodesioff;
50-
&opcodesion;
51-
&opcodesiondur2;
52-
&opcodesiondur;
53-
&opcodesioutat;
54-
&opcodesioutc14;
55-
&opcodesioutc;
56-
&opcodesioutpat;
57-
&opcodesioutpb;
58-
&opcodesioutpc;
59-
&opcodesipcauchy;
60-
&opcodesipoisson;
61-
&opcodesipow;
49+
<!-- &opcodesioff; -->
50+
<!-- &opcodesion; -->
51+
<!-- &opcodesiondur2; -->
52+
<!-- &opcodesiondur; -->
53+
<!-- &opcodesioutat; -->
54+
<!-- &opcodesioutc14; -->
55+
<!-- &opcodesioutc; -->
56+
<!-- &opcodesioutpat; -->
57+
<!-- &opcodesioutpb; -->
58+
<!-- &opcodesioutpc; -->
59+
<!-- &opcodesipcauchy; -->
60+
<!-- &opcodesipoisson; -->
61+
<!-- &opcodesipow; -->
6262
&opcodesis16b14;
6363
&opcodesis32b14;
6464
&opcodesislider16;
@@ -69,38 +69,38 @@
6969
&opcodesitablegpw;
7070
&opcodesitablemix;
7171
&opcodesitablew;
72-
&opcodesitrirand;
73-
&opcodesiunirand;
74-
&opcodesiweibull;
75-
&opcodeskbetarand;
76-
&opcodeskbexprnd;
77-
&opcodeskcauchy;
78-
&opcodeskdump2;
79-
&opcodeskdump3;
80-
&opcodeskdump4;
81-
&opcodeskdump;
82-
&opcodeskexprand;
83-
&opcodeskfilter2;
84-
&opcodeskgauss;
85-
&opcodesklinrand;
86-
&opcodeskon;
87-
&opcodeskoutat;
88-
&opcodeskoutc14;
89-
&opcodeskoutc;
90-
&opcodeskoutpat;
91-
&opcodeskoutpb;
92-
&opcodeskoutpc;
93-
&opcodeskpcauchy;
94-
&opcodeskpoisson;
95-
&opcodeskpow;
96-
&opcodeskread2;
97-
&opcodeskread3;
98-
&opcodeskread4;
99-
&opcodeskread;
72+
<!-- &opcodesitrirand; -->
73+
<!-- &opcodesiunirand; -->
74+
<!-- &opcodesiweibull; -->
75+
<!-- &opcodeskbetarand; -->
76+
<!-- &opcodeskbexprnd; -->
77+
<!-- &opcodeskcauchy; -->
78+
<!-- &opcodeskdump2; -->
79+
<!-- &opcodeskdump3; -->
80+
<!-- &opcodeskdump4; -->
81+
<!-- &opcodeskdump; -->
82+
<!-- &opcodeskexprand; -->
83+
<!-- &opcodeskfilter2; -->
84+
<!-- &opcodeskgauss; -->
85+
<!-- &opcodesklinrand; -->
86+
<!-- &opcodeskon; -->
87+
<!-- &opcodeskoutat; -->
88+
<!-- &opcodeskoutc14; -->
89+
<!-- &opcodeskoutc; -->
90+
<!-- &opcodeskoutpat; -->
91+
<!-- &opcodeskoutpb; -->
92+
<!-- &opcodeskoutpc; -->
93+
<!-- &opcodeskpcauchy; -->
94+
<!-- &opcodeskpoisson; -->
95+
<!-- &opcodeskpow; -->
96+
<!-- &opcodeskread2; -->
97+
<!-- &opcodeskread3; -->
98+
<!-- &opcodeskread4; -->
99+
<!-- &opcodeskread; -->
100100
&opcodesktableseg;
101-
&opcodesktrirand;
102-
&opcodeskunirand;
103-
&opcodeskweibull;
101+
<!-- &opcodesktrirand; -->
102+
<!-- &opcodeskunirand; -->
103+
<!-- &opcodeskweibull; -->
104104
&opcodessc_lag;
105105
&opcodessc_lagud;
106106
&opcodessc_phasor;

‎examples/flanger.csd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ instr 1
1818
kfeedback = p4
1919
asnd vco2 .2, 50
2020
adel linseg 0, p3*.5, 0.02, p3*.5, 0 ;max delay time =20ms
21-
aflg flanger asnd, adel, kfeedback
21+
aflg flanger asnd, adel, kfeedback, 1
2222
asig clip aflg, 1, 1
2323
outs asig+asnd, asig+asnd ;mix flanger with original
2424
2525
endin
2626
</CsInstruments>
2727
<CsScore>
2828
29-
i 1 0 10 .2
30-
i 1 11 10 .8 ;lot of feedback
29+
i 1.1 0 10 .2
30+
i 1.1 10 10 .8 ;lot of feedback
3131
e
3232
</CsScore>
3333
</CsoundSynthesizer>

‎examples/musical/schedkwhen_Daughtrey.csd

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<CsoundSynthesizer>
2+
<CsOptions>
3+
-odac
4+
; output for writing audio file with
5+
; Android version of Csound:
6+
;-o/sdcard/TableArps.wav
7+
</CsOptions>
8+
<CsInstruments>
9+
sr = 44100
10+
ksmps = 32
11+
nchnls = 2
12+
0dbfs = 1
13+
14+
; initialize global reverb channels
15+
gaRvbL init 0
16+
gaRvbR init 0
17+
; initialize Count at -1 so Note tables are read starting at index 0
18+
giCount init -1
19+
; arpeggio note tables
20+
giMinAdd2 ftgen 1, 0, 0, 2, 60, 62, 63, 67, 72,
21+
74, 75, 74, 72, 67, 63, 62
22+
giMajAdd2 ftgen 2, 0, 0, 2, 60, 62, 64, 67, 72,
23+
74, 76, 74, 72, 67, 64, 62
24+
25+
instr Trigger
26+
kTrig metro 8
27+
schedkwhen kTrig, 0, 0, "Arps", 0, 1/3, p4, p5, p6 ; trigger a note
28+
endin
29+
30+
instr Arps
31+
giCount = giCount + 1
32+
iNote = table(giCount, p6, 0, 0, 1) ;read incrementally from the table
33+
kEnv = linsegr(0, 0.003, p5, p3, p5, .5, 0) ; amplitude envelope
34+
iRnd = random(0.92, 0.98) ; randomize amp and pluck point
35+
iDtn = random(-0.05, 0.05) ; random detune
36+
iFreq = cpsmidinn(iNote + p4 + iDtn) ; convert note table values to cps
37+
aSig = wgpluck2(iRnd, kEnv/5*iRnd, iFreq, .25, 0.06) ; plucked string opcodr
38+
kEnv2 = linseg(.1, p3/2, 0)
39+
aSig2 = oscil(kEnv2*.1*iRnd, iFreq + 12) ; sine osc one octave higher
40+
aMixL = aSig+aSig2/2
41+
aMixR = aSig+aSig2
42+
gaRvbL += aSig*.22 ; send to global reverb channels
43+
gaRvbR += aSig*.22
44+
outs(aMixL, aMixR)
45+
endin
46+
47+
instr Reverb
48+
aRvbL,aRvbR reverbsc gaRvbL, gaRvbR, 0.91, 11000
49+
outs(aRvbL,aRvbR)
50+
clear(gaRvbL,gaRvbR)
51+
endin
52+
53+
</CsInstruments>
54+
<CsScore>
55+
i"Reverb" 0 34
56+
; for instr Trigger: p4=number of semi-tones
57+
; away from original note table freqs,
58+
; p5=amp, p6=table used
59+
i"Trigger" 0 5 0 .8 1
60+
i . 5 . -4 .8 2
61+
i . 10 . -7 .8 1
62+
i . 15 5.1 -2 .8 2
63+
64+
i . 22 1 -12 .8 1
65+
i . 23 . -9 .8 2
66+
i . 24 . -7 .8 1
67+
i . 25 . -4 .8 2
68+
i . 26 . -2 .8 2
69+
i . 27 2 0 .8 1
70+
i . 29 0.7 3 .8 2
71+
e
72+
</CsScore>
73+
</CsoundSynthesizer>
74+
; example by Scott Daughtrey
75+
; inspired by example 01D13 by Iain McCurdy
76+
; from the FLOSS manual

‎misc/examples.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@
284284
<formalpara><title>Signal Generators:Scanned Synthesis</title><simpara />
285285
<para><ulink url="examples/scanhammer.csd"><citetitle>scanhammer.csd</citetitle></ulink></para><simpara />
286286
<para><ulink url="examples/scanmap.csd"><citetitle>scanmap.csd</citetitle></ulink></para><simpara />
287+
<para><ulink url="examples/scanmap_matrxT.csd"><citetitle>scanmap_matrxT.csd</citetitle></ulink></para><simpara />
287288
<para><ulink url="examples/scans.csd"><citetitle>scans.csd</citetitle></ulink></para><simpara />
288289
<para><ulink url="examples/scans-2.csd"><citetitle>scans-2.csd</citetitle></ulink></para><simpara />
289290
<para><ulink url="examples/scantable.csd"><citetitle>scantable.csd</citetitle></ulink></para><simpara />
@@ -846,8 +847,18 @@
846847
<para><ulink url="examples/times_complex.csd"><citetitle>times_complex.csd</citetitle></ulink></para><simpara />
847848
</formalpara>
848849
<formalpara><title>Jacko Opcodes</title><simpara />
850+
<para><ulink url="examples/JackoAudioIn.csd"><citetitle>JackoAudioIn.csd</citetitle></ulink></para><simpara />
851+
<para><ulink url="examples/JackoAudioIn.csd"><citetitle>JackoAudioIn.csd</citetitle></ulink></para><simpara />
852+
<para><ulink url="examples/JackoAudioOut.csd"><citetitle>JackoAudioOut.csd</citetitle></ulink></para><simpara />
853+
<para><ulink url="examples/JackoAudioOut.csd"><citetitle>JackoAudioOut.csd</citetitle></ulink></para><simpara />
854+
<para><ulink url="examples/JackoFreewheel.csd"><citetitle>JackoFreewheel.csd</citetitle></ulink></para><simpara />
849855
<para><ulink url="examples/JackoInfo.csd"><citetitle>JackoInfo.csd</citetitle></ulink></para><simpara />
850856
<para><ulink url="examples/JackoInit.csd"><citetitle>JackoInit.csd</citetitle></ulink></para><simpara />
857+
<para><ulink url="examples/JackoMidiInConnect.csd"><citetitle>JackoMidiInConnect.csd</citetitle></ulink></para><simpara />
858+
<para><ulink url="examples/JackoMidiOut.csd"><citetitle>JackoMidiOut.csd</citetitle></ulink></para><simpara />
859+
<para><ulink url="examples/JackoNoteOut.csd"><citetitle>JackoNoteOut.csd</citetitle></ulink></para><simpara />
860+
<para><ulink url="examples/JackoNoteOut.csd"><citetitle>JackoNoteOut.csd</citetitle></ulink></para><simpara />
861+
<para><ulink url="examples/JackoTransport.csd"><citetitle>JackoTransport.csd</citetitle></ulink></para><simpara />
851862
</formalpara>
852863
<formalpara><title>Serial I/O</title><simpara />
853864
<para><ulink url="examples/arduinoRead.csd"><citetitle>arduinoRead.csd</citetitle></ulink></para><simpara />

‎misc/quickref.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@
108108
ifn2, ifn3, ifn4, ivibfn]</synopsis><para/>
109109
<synopsis>ares <link linkend="fmwurlie">fmwurlie</link> kamp, kfreq, kc1, kc2, kvdepth, kvrate, ifn1, ifn2, ifn3, \
110110
ifn4, ivfn</synopsis><para/>
111-
<synopsis>ares <link linkend="foscil">foscil</link> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis><para/>
112-
<synopsis>ares <link linkend="foscili">foscili</link> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis><para/>
111+
<synopsis>ares <link linkend="foscil">foscil</link> xamp, kcps, xcar, xmod, kndx [, ifn , iphs]</synopsis><para/>
112+
<synopsis>ares <link linkend="foscili">foscili</link> xamp, kcps, xcar, xmod,
113+
kndx [, ifn, iphs]</synopsis><para/>
113114
</para></formalpara>
114115
<para></para><para></para><formalpara>
115116
<title>Signal Generators:Granular Synthesis</title>
@@ -1186,7 +1187,7 @@
11861187
<synopsis><link linkend="JackoMidiInConnect">JackoMidiInConnect </link>SexternalPortName, ScsoundPortName</synopsis><para/>
11871188
<synopsis><link linkend="JackoMidiOut">JackoMidiOut </link> ScsoundPortName, kstatus, kchannel, kdata1[, kdata2]</synopsis><para/>
11881189
<synopsis><link linkend="JackoMidiOutConnect">JackoMidiOutConnect </link>ScsoundPortName, SexternalPortName</synopsis><para/>
1189-
<synopsis><link linkend="JackoNoteOut">JackoNoteOut </link> ScsoundPortName, kstatus, kchannel, kdata1[, kdata2]</synopsis><para/>
1190+
<synopsis><link linkend="JackoNoteOut">JackoNoteOut </link> ScsoundPortName, kchannel, kdata1[, kdata2]</synopsis><para/>
11901191
<synopsis><link linkend="JackoOn">JackoOn </link>[iactive] </synopsis><para/>
11911192
<synopsis><link linkend="JackoTransport">JackoTransport </link> kcommand, [kposition]</synopsis><para/>
11921193
</para></formalpara>

‎opcodes/foscil.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@
2424

2525
<refsect1>
2626
<title>Syntax</title>
27-
<synopsis>ares <command>foscil</command> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis>
27+
<synopsis>ares <command>foscil</command> xamp, kcps, xcar, xmod, kndx [, ifn , iphs]</synopsis>
2828
</refsect1>
2929

3030
<refsect1>
3131
<title>Initialization</title>
3232
<para>
33-
<emphasis>ifn</emphasis> -- function table number. Requires a wrap-around guard point.
33+
<emphasis>ifn</emphasis> (optional) -- function table number. Requires a
34+
wrap-around guard point. Defaults to a sine wave.
3435
</para>
3536

3637
<para>

‎opcodes/foscili.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424

2525
<refsect1>
2626
<title>Syntax</title>
27-
<synopsis>ares <command>foscili</command> xamp, kcps, xcar, xmod, kndx, ifn [, iphs]</synopsis>
27+
<synopsis>ares <command>foscili</command> xamp, kcps, xcar, xmod,
28+
kndx [, ifn, iphs]</synopsis>
2829
</refsect1>
2930

3031
<refsect1>
3132
<title>Initialization</title>
3233
<para>
33-
<emphasis>ifn</emphasis> -- function table number. Requires a wrap-around guard point.
34+
<emphasis>ifn</emphasis> (optional) -- function table
35+
number. Requires a wrap-around guard point. Defaults to a sine wave/
3436
</para>
3537

3638
<para>

‎opcodes/schedkwhen.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
<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>
8686
<xi:include href="examples-xml/schedkwhen.csd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
8787
</example>
88+
<para>
89+
A musical example featuring the schedkwhen opcode: <ulink url="examples/musical/schedkwhen_Daughtrey.csd"><citetitle>schedkwhen_Daughtrey.csd</citetitle></ulink> by Scott Daughtrey.
90+
</para>
8891
</para>
8992
</refsect1>
9093

‎opcodes/setcol.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<refsect1>
2323
<title>Syntax</title>
24-
<synopsis>i/kout[] <command>setcol</command>i/kin[],i/kcol</synopsis>
24+
<synopsis>i/kout[] <command>setcol</command> i/kin[],i/kcol</synopsis>
2525
</refsect1>
2626

2727
<refsect1>

0 commit comments

Comments
 (0)