Skip to content

Commit 814d747

Browse files
committed
Encore une modif de la table de lecture de K-ru5h
Enième tentative de correction du bug d'ouverture de fichier Signed-off-by: Edge <mayatito51@hotmail.com>
1 parent 0137d5e commit 814d747

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/K_Rush.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ struct Diode{
4040
for(int j=0; j<64; j++){
4141
string file_name = plug_directory+wavefiles[j];
4242
const char *c = file_name.c_str();
43+
wave_f = NULL;
4344
wave_f = fopen(c,"r");
4445
if(wave_f!=NULL){
4546
fseek(wave_f,44,SEEK_SET);
@@ -51,7 +52,7 @@ struct Diode{
5152
}
5253
else{
5354
j=0;
54-
fclose(wave_f);
55+
5556
}
5657
}
5758
tab_loaded = true;
@@ -176,7 +177,7 @@ struct Diode{
176177
177178
*/
178179

179-
index = abs_in*64;
180+
index = abs_in*16;
180181

181182
while(index>=255){
182183
index-= 255;
@@ -190,14 +191,15 @@ struct Diode{
190191

191192
//Ov_Buffer[i] = Ov_Buffer[i]-((gain-1)*interpolateLinear(wave[type],index));
192193
//if (abs_in>1.0f)
193-
abs_in -= (clamp((gain-1),0.0f,7.0f)/4)* ((interpolateLinear(wave[type],index)+0.5f));
194+
if(abs_in!=0.0f)
195+
abs_in -= clamp((gain-1.0f),0.0f,8.0f)*clamp(abs_in* ((interpolateLinear(wave[type],index))),0.0f,4.0f);
194196

195197
if(phase_in>0.0f)
196198
Ov_Buffer[i] = phase_in*abs_in;
197199
else
198200
Ov_Buffer[i] = phase_in*(abs_in);
199201

200-
filter1.process(Ov_Buffer[i]*gain);
202+
filter1.process(Ov_Buffer[i]);
201203
Ov_Buffer[i]=filter1.lowpass();
202204

203205
}
@@ -401,7 +403,7 @@ struct K_RushWidget : ModuleWidget {
401403

402404
addParam(ParamWidget::create<RoundLargeBlackKnob>(Vec(56.4, 83.2), module, K_Rush::BLEND_PARAM, 0.0f, 1.0f, 0.0f));
403405
addParam(ParamWidget::create<RoundLargeBlackKnob>(Vec(12.2, 158.7), module, K_Rush::GAIN_PARAM, 0.0f, 8.0f, 1.0f));
404-
addParam(ParamWidget::create<RoundLargeBlackKnob>(Vec(100, 256.7), module, K_Rush::FEEDBACK_PARAM, 0.0f, 1.0f, 0.0f));
406+
addParam(ParamWidget::create<RoundLargeBlackKnob>(Vec(100, 256.7), module, K_Rush::FEEDBACK_PARAM, 0.0f, 0.25f, 0.0f));
405407

406408
addParam(ParamWidget::create<RoundSmallBlackKnob>(Vec(106.9, 165.8), module, K_Rush::CV_GAIN_PARAM, -1.0f, 1.0f, 0.0f));
407409
addParam(ParamWidget::create<RoundSmallBlackKnob>(Vec(19.3, 263.8), module, K_Rush::CV_FEEDBACK_PARAM, 0.0f, 0.3f, 0.0f));

src/WCO_Osc.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ struct VoltageControlledOscillator {
6262
for(int j=0; j<64; j++){
6363
string file_name = plug_directory+wavefiles[j];
6464
const char *c = file_name.c_str();
65+
wave_f = NULL;
6566
wave_f = fopen(c,"r");
6667
if(wave_f!=NULL){
6768
fseek(wave_f,44,SEEK_SET);
@@ -72,7 +73,8 @@ struct VoltageControlledOscillator {
7273
fclose(wave_f);
7374
}
7475
else{
75-
j--;
76+
j=0;
77+
7678
}
7779
}
7880
tab_loaded = true;

0 commit comments

Comments
 (0)