Skip to content

Commit

Permalink
Realigned fildesoi12.lib and fildesoi3.lib to synchronize with versio…
Browse files Browse the repository at this point in the history
…n 1.1.0
  • Loading branch information
alainbonardi committed Aug 16, 2024
1 parent 2b5692f commit 20161a0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions faustCodes/fildesoi12.lib
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import("submodules/faustCodes/library/mm.lib");
//--------------------------------------------------------------------------------------//
//FEEDBACK REINJECTION MATRIX N x N
//--------------------------------------------------------------------------------------//
fd_toggle(c, in) = checkbox("h:Lines/h:Reinjection_Matrix/v:Del%c-->/r%in");
fd_toggle(c, in) = checkbox("h:Lines/h:Reinjection_Matrix/v:Del%2c-->/r%3in");
fd_Mixer(N,out) = par(in, N, *(fd_toggle(in, in+out*N)) ) :> _ ;
fdMatrix(N) = par(in, N, _) <: par(out, N, fd_Mixer(N, out));

//--------------------------------------------------------------------------------------//
//SPATIALIZATION MATRIX N x M
//--------------------------------------------------------------------------------------//
sp_toggle(c, in) = checkbox("h:Lines/h:SpatializationMatrix/v:Sig%c-->/sp%in") : spatSmoothLine;
sp_toggle(c, in) = checkbox("h:Lines/h:SpatializationMatrix/v:Sig%2c-->/sp%3in") : spatSmoothLine;
sp_Mixer(N,out) = par(in, N, *(sp_toggle(in, in+out*N)) ) :> _ ;
spMatrix(N,M) = par(in, N, _) <: par(out, M, sp_Mixer(N, out));

Expand All @@ -48,22 +48,22 @@ smoothDuration = hslider("h:Global_Parameters/smoothDuration", 20, 10, 5000, 1)/

//Delay line parameters//

d(ind) = int(hslider("h:Lines/v:Del_Durations/d%ind", (100*(ind+1)), 0, 21000, 1)*millisec*hslider("h:Global_Parameters/dStretch [7]", 1, 0.01, 10, 0.01));
fdbk(ind) = hslider("h:Lines/v:Del_Feedbacks/fd%ind", 0, 0, 0.99, 0.01):smoothLine;
d(ind) = int(hslider("h:Lines/v:Del_Durations/d%2ind", (100*(ind+1)), 0, 21000, 1)*millisec*hslider("h:Global_Parameters/dStretch [7]", 1, 0.01, 10, 0.01));
fdbk(ind) = hslider("h:Lines/v:Del_Feedbacks/fd%2ind", 0, 0, 0.99, 0.01):smoothLine;

//Dispatching between harmonizer (1) and simple delay (0)//
xvd(ind) = hslider("h:Lines/v:EffeX_vs_Del/xvd%ind", 1, 0, 1, 0.01);
xvd(ind) = hslider("h:Lines/v:EffeX_vs_Del/xvd%2ind", 1, 0, 1, 0.01);

//Transposition in midicents//
tr(ind) = hslider("h:Lines/v:Harmo_Transpositions/tr%ind", 0, -2400, 2400, 1)*hslider("h:Global_Parameters/hStretch [7]", 1, -10, 10, 0.01);
tr(ind) = hslider("h:Lines/v:Harmo_Transpositions/tr%2ind", 0, -2400, 2400, 1)*hslider("h:Global_Parameters/hStretch [7]", 1, -10, 10, 0.01);

//Input gains//
//from 0 to 1//
inp(ind) = hslider("h:Lines/v:Line_input/inp%ind [5]", 1, 0, 1, 0.01):smoothLine;
inp(ind) = hslider("h:Lines/v:Line_input/inp%2ind [5]", 1, 0, 1, 0.01):smoothLine;

//OUTPUT GAINS//
//from 0 to 4 since harmonizers can fade the output signal//
out(ind) = hslider("h:Lines/v:Line_output/out%ind [6]", 1, 0, 1, 0.01):smoothLine;
out(ind) = hslider("h:Lines/v:Line_output/out%2ind [6]", 1, 0, 1, 0.01):smoothLine;


//--------------------------------------------------------------------------------------//
Expand All @@ -88,7 +88,7 @@ offset = hslider("h:decoder/v:general/[1]angularoffset[unit:deg]", 0, -180, 180,
gain = hslider("h:decoder/v:general/[3]gain[unit:dB]", 0, -127, 18, 0.01) : db2gain;
stereo = nentry("h:decoder/v:general/[4]stereo", 0, 0, 1, 1) : si.smoo;
//the angle of the the ith loudspeaker among nls loudspeakers, expressed in degrees for the end-user
a(i, nls) = nentry("h:decoder/v:angles/a%i [unit:deg]", i * 360 / nls, -360, 360, 1);
a(i, nls) = nentry("h:decoder/v:angles/a%2i [unit:deg]", i * 360 / nls, -360, 360, 1);
//la = list of angles//
la(p) = par(i, p, a(i, p));

Expand Down
2 changes: 1 addition & 1 deletion faustCodes/fildesoi3.lib
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ offset = hslider("h:decoder/v:general/[1]angularoffset[unit:deg]", 0, -180, 180,
gain = hslider("h:decoder/v:general/[3]gain[unit:dB]", 0, -127, 18, 0.01) : db2gain;
stereo = nentry("h:decoder/v:general/[4]stereo", 0, 0, 1, 1) : si.smoo;
//the angle of the the ith loudspeaker among nls loudspeakers, expressed in degrees for the end-user
a(i, nls) = nentry("h:decoder/v:angles/a%i [unit:deg]", i * 360 / nls, -360, 360, 1);
a(i, nls) = nentry("h:decoder/v:angles/a%2i [unit:deg]", i * 360 / nls, -360, 360, 1);
//la = list of angles//
la(p) = par(i, p, a(i, p));

Expand Down

0 comments on commit 20161a0

Please sign in to comment.