1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
From: Joenio Marques da Costa <joenio.marquesdacosta@u-pem.fr>
Date: Thu, 10 Jul 2025 14:43:56 +0200
Subject: fix supercollider syntax for wrong merged files
Forwarded: https://github.com/e-lie/renardo/pull/47
this commit fix the syntax for some supercollider files that apparently was
commited without resolving conflicts on git merge
---
renardo_lib/osc/scsyndef/brass.scd | 18 ----------------
renardo_lib/osc/scsyndef/organ.scd | 42 --------------------------------------
renardo_lib/osc/scsyndef/tb303.scd | 14 -------------
3 files changed, 74 deletions(-)
diff --git a/renardo_lib/osc/scsyndef/brass.scd b/renardo_lib/osc/scsyndef/brass.scd
index 307d65c..8727f94 100644
--- a/renardo_lib/osc/scsyndef/brass.scd
+++ b/renardo_lib/osc/scsyndef/brass.scd
@@ -1,20 +1,3 @@
-<<<<<<< HEAD:renardo_lib/renardo_lib/osc/scsyndef/brass.scd
-SynthDef.new(\brass,
-{|vib=0, rate=0.3, sus=1, fmod=0, bus=0, amp=1, freq=0, pan=0|
-var osc, env;
-freq = In.kr(bus, 1);
-freq = freq + fmod;
-rate=Lag.ar(freq, rate);
-osc=(Saw.ar(rate, 0.4) + Saw.ar((rate + LFNoise2.ar(1).range(0.5, 1.1)), 0.4));
-osc=(osc + Resonz.ar(osc, (freq * XLine.ar(1, 5, 0.13)), 1));
-osc=BPF.ar(osc, (freq * 2.5), 0.3);
-osc=RLPF.ar(osc, 1300, 0.78);
-env=EnvGen.ar(Env.perc(level: amp,curve: 0,attackTime: 0.01,releaseTime: sus), doneAction: 0);
-osc=(osc * env);
-osc = Mix(osc) * 0.5;
-osc = Pan2.ar(osc, pan);
- ReplaceOut.ar(bus, osc)}).add;
-=======
SynthDef.new(\brass, {
|vib=0, rate=0.3, sus=1, fmod=0, bus=0, atk = 0.01, amp=1, freq=0, pan=0|
var osc, env, lagrate;
@@ -39,4 +22,3 @@ metadata: (
tags: [\tag]
)
).add;
->>>>>>> 03b34654 (Fixed bugs in synths, Added most CrashServer synths):FoxDot/osc/scsyndef/brass.scd
diff --git a/renardo_lib/osc/scsyndef/organ.scd b/renardo_lib/osc/scsyndef/organ.scd
index 2dea1d6..101129b 100644
--- a/renardo_lib/osc/scsyndef/organ.scd
+++ b/renardo_lib/osc/scsyndef/organ.scd
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:renardo_lib/renardo_lib/osc/scsyndef/organ.scd
(
SynthDef(\organ,
{|f=440, width = 0.5, pan = 0.0, bus = 0, amp = 1, sus=1, freq=440, fmod=0,rate = 0.5|
@@ -37,35 +36,6 @@ SynthDef(\organ,
output = 0.01*LeakDC.ar(output, 0.9995);
output = MoogFF.ar(output.tanh*20.0, (f*12)+LFNoise2.ar(1, 400, 1), LFNoise2.ar(0,3.5, 0));
-=======
-SynthDef.new(\organ, {
- |f=440, width = 0.5, pan = 0.0, bus = 0, amp = 1, sus=1, freq=440, fmod=0, rate = 0.5|
- var signal, tapPhase, tap, tapPhaseL, tapPhaseR, tapL, tapR, comp1, comp2, comp3, comp4, comp5, comp6, output;
- var timeMod, eqMod, bufferL, bufferR, osc, env, input, theSine, oscs, scaler, lfo1, lfo2, lfo3, lfo4, lfo5, lfo6;
- env = EnvGen.ar(Env(times: [(sus * 0.25), (sus * 1)],levels: [0, amp, 0],curve: 'lin'), doneAction: 0);
- input = Vibrato.ar(VarSaw.ar(freq, 0, LFNoise2.kr(1)), 5, 0.1, 0, 0.2, 0.1, 0.7);
- theSine = SinOsc.ar(freq);
- oscs = 6;
- scaler = 1/oscs;
- lfo1 = LFTri.ar(fmod*1.51);
- lfo2 = LFTri.ar(fmod*1.11);
- lfo3 = LFTri.ar(fmod*1.31);
- lfo4 = LFTri.ar(fmod*0.71);
- lfo5 = LFTri.ar(fmod*0.61);
- lfo6 = LFTri.ar(fmod*0.51);
- comp1 = input > lfo1;
- comp2 = input > lfo2;
- comp3 = input > lfo3;
- comp4 = input > lfo4;
- comp5 = input > lfo5;
- comp6 = input > lfo6;
- output = scaler*(comp1+comp2+comp3+comp4+comp5+comp6);
- output = output+0.001*theSine;
- freq = In.kr(bus, 1);
- freq = [freq, freq+fmod];
- output = 0.01 * LeakDC.ar(output, 0.9995);
- output = MoogFF.ar(output.tanh*20.0, (f*12 ) + LFNoise2.ar(1, 400, 1), LFNoise2.ar(0,3.5, 0));
->>>>>>> badc8940 (Add meta-data block and filled in known information, add new synths, rename and fix old synths):FoxDot/osc/scsyndef/organ.scd
output = MoogFF.ar(output*4, f*LFNoise2.kr(0.2, 6, 4), 0.5);
timeMod = LFDNoise3.ar(rate, 0.0005);
@@ -76,18 +46,6 @@ SynthDef.new(\organ, {
osc = HPF.ar(osc, 40);
osc = LPF.ar(osc, 14000);
osc = Splay.ar(osc * amp, pan);
-<<<<<<< HEAD:renardo_lib/renardo_lib/osc/scsyndef/organ.scd
ReplaceOut.ar(bus, osc)}).add;
)
-=======
- ReplaceOut.ar(bus, osc)
-},
-metadata: (
- credit: "Credit",
- modified_by: "Jens Meisner",
- decription: "Description",
- category: \organ,
- tags: [\keys, \tag]
-)).add;
->>>>>>> badc8940 (Add meta-data block and filled in known information, add new synths, rename and fix old synths):FoxDot/osc/scsyndef/organ.scd
diff --git a/renardo_lib/osc/scsyndef/tb303.scd b/renardo_lib/osc/scsyndef/tb303.scd
index d876139..215a4fc 100644
--- a/renardo_lib/osc/scsyndef/tb303.scd
+++ b/renardo_lib/osc/scsyndef/tb303.scd
@@ -1,16 +1,8 @@
-<<<<<<< HEAD:renardo_lib/renardo_lib/osc/scsyndef/tb303.scd
-(
-SynthDef (\tb303,
- {| bus=0, freq=440, atk=0.1, wave=0, ctf=100, res=0.2, pan=0, sus=1, dec=1.0, top=1000, gate=0, amp=1|
- var filEnv, volEnv, waves, osc;
-
-=======
SynthDef.new(\tb303, {
|bus=0, freq=440, atk=0.1,fmod=0, pan=0, sus=1, dec=1.0, gate=0, amp=1, wave=0, ctf=100, res=0.2, top=1000|
var filEnv, volEnv, waves, osc;
freq = In.kr(bus, 1);
freq = [freq, freq+fmod];
->>>>>>> badc8940 (Add meta-data block and filled in known information, add new synths, rename and fix old synths):FoxDot/osc/scsyndef/tb303.scd
volEnv = EnvGen .ar( Env .new([10e-10, 1, 1, 10e-10], [0.01, sus, dec], 'exp' ));
filEnv = EnvGen .ar( Env .new([10e-10, 1, 10e-10], [0.01, dec], 'exp' ));
@@ -21,11 +13,6 @@ SynthDef.new(\tb303, {
osc = HPF.ar(osc, 20);
osc = LPF.ar(osc, 14000);
osc = Splay.ar(osc * amp, pan);
-<<<<<<< HEAD:renardo_lib/renardo_lib/osc/scsyndef/tb303.scd
- ReplaceOut.ar(bus, osc)}).add;
-
-)
-=======
ReplaceOut.ar(bus, osc)
},
metadata: (
@@ -35,4 +22,3 @@ metadata: (
category: \category,
tags: [\tag, \tag]
)).add;
->>>>>>> badc8940 (Add meta-data block and filled in known information, add new synths, rename and fix old synths):FoxDot/osc/scsyndef/tb303.scd
|
