commit b9c193c8001e86a964b437f317691858a8fd9ea0
parent 7759917b79f4ff5d6c8342cbe266a689fb4661f7
Author: paulnasca <paulnasca>
Date: Sat, 12 Feb 2005 13:09:08 +0000
*** empty log message ***
Diffstat:
8 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -758,4 +758,10 @@
06 Feb 2005 - Facuta o mica modificare care interzice punera notelor "0" in dump si alta modificare care mareste nr. de octave calculate la PADsynth
- Renuntat sa fac modificarea la Microtonal inceputa din 03 Feb, pentru ca nu am gasit cum pot schimba culoarea butonului automat cand modific un text
07 Feb 2005 - Corectata o eroare care facea ca la microtonal mapping sa nu se calculeze corect (adica sa se stocheze valoarea corecta)
+12 Feb 2005 - Controllerul prestabilit la Virtual Keyboard este Filter Cutoff in loc de BandWidth
+ - Modificate cateva preseturi la DynamicFilter
+
+
+
+
\ No newline at end of file
diff --git a/src/Effects/DynamicFilter.C b/src/Effects/DynamicFilter.C
@@ -148,13 +148,13 @@ void DynamicFilter::setpreset(unsigned char npreset){
const int NUM_PRESETS=5;
unsigned char presets[NUM_PRESETS][PRESET_SIZE]={
//WahWah
- {127,64,80,0,0,64,0,90,0,60},
+ {110,64,80,0,0,64,0,90,0,60},
//AutoWah
- {127,64,70,0,0,80,70,0,0,60},
+ {110,64,70,0,0,80,70,0,0,60},
//Sweep
{100,64,30,0,0,50,80,0,0,60},
//VocalMorph1
- {127,64,80,0,0,64,0,64,0,60},
+ {110,64,80,0,0,64,0,64,0,60},
//VocalMorph1
{127,64,50,0,0,96,64,0,0,60}};
diff --git a/src/Params/ADnoteParameters.C b/src/Params/ADnoteParameters.C
@@ -58,6 +58,7 @@ void ADnoteParameters::defaults(){
GlobalPar.PDetuneType=1;
GlobalPar.FreqEnvelope->defaults();
GlobalPar.FreqLfo->defaults();
+ GlobalPar.PBandwidth=64;
/* Amplitude Global Parameters */
GlobalPar.PVolume=90;
@@ -175,6 +176,18 @@ void ADnoteParameters::EnableVoice(int nvoice){
VoicePar[nvoice].FMAmpEnvelope->ADSRinit(80,90,127,100);
};
+/*
+ * Get the Multiplier of the fine detunes of the voices
+ */
+REALTYPE ADnoteParameters::getBandwidthDetuneMultiplier(){
+ REALTYPE bw=(GlobalPar.PBandwidth-64.0)/64.0;
+ bw=pow(2.0,bw*pow(fabs(bw),0.2)*5.0);
+// bw*=35;
+// printf("%g\n",bw);
+
+ return(bw);
+};
+
/*
* Kill the voice
diff --git a/src/Params/ADnoteParameters.h b/src/Params/ADnoteParameters.h
@@ -56,6 +56,8 @@
unsigned short int PDetune;//fine detune
unsigned short int PCoarseDetune;//coarse detune+octave
unsigned char PDetuneType;//detune type
+
+ unsigned char PBandwidth;//how much the relative fine detunes of the voices are changed
EnvelopeParams *FreqEnvelope; //Frequency Envelope
@@ -265,6 +267,7 @@ class ADnoteParameters:public Presets{
void add2XML(XMLwrapper *xml);
void getfromXML(XMLwrapper *xml);
+ REALTYPE getBandwidthDetuneMultiplier();
private:
void defaults(int n);//n is the nvoice
diff --git a/src/Synth/ADnote.C b/src/Synth/ADnote.C
@@ -173,6 +173,8 @@ ADnote::ADnote(ADnoteParameters *pars,Controller *ctl_,REALTYPE freq,REALTYPE ve
NoteVoicePar[nvoice].DelayTicks=(int)((exp(pars->VoicePar[nvoice].PDelay/127.0*log(50.0))-1.0)/SOUND_BUFFER_SIZE/10.0*SAMPLE_RATE);
};
+ bandwidthDetuneMultiplier=pars->getBandwidthDetuneMultiplier();
+
initparameters();
ready=1;
};
@@ -408,7 +410,7 @@ void ADnote::setfreqFM(int nvoice,REALTYPE freq){
*/
REALTYPE ADnote::getvoicebasefreq(int nvoice){
REALTYPE detune=NoteVoicePar[nvoice].Detune/100.0+
- NoteVoicePar[nvoice].FineDetune/100.0*ctl->bandwidth.relbw+
+ NoteVoicePar[nvoice].FineDetune/100.0*ctl->bandwidth.relbw*bandwidthDetuneMultiplier+
NoteGlobalPar.Detune/100.0;
if (NoteVoicePar[nvoice].fixedfreq==0) return(this->basefreq*pow(2,detune/12.0));
else {//the fixed freq is enabled
diff --git a/src/Synth/ADnote.h b/src/Synth/ADnote.h
@@ -246,6 +246,9 @@ class ADnote{ //ADDitive note
//1 if the note has portamento
int portamento;
+
+ //how the fine detunes are made bigger or smaller
+ REALTYPE bandwidthDetuneMultiplier;
};
#endif
diff --git a/src/UI/ADnoteUI.fl b/src/UI/ADnoteUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0104
+version 1.0106
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
@@ -55,7 +55,7 @@ class ADvoicelistitem {: {public Fl_Group}
Function {make_window()} {private
} {
Fl_Window ADnoteVoiceListItem {
- private xywh {335 489 615 30} type Double hide
+ private xywh {247 599 615 30} type Double hide
class Fl_Group
} {
Fl_Group voicelistitemgroup {
@@ -90,7 +90,7 @@ class ADvoicelistitem {: {public Fl_Group}
code2 {if (pars->VoicePar[nvoice].Pextoscil != -1) {osc->init(pars->VoicePar[pars->VoicePar[nvoice].Pextoscil].OscilSmp,master);}}
} {}
Fl_Value_Output detunevalueoutput {
- callback {o->value(getdetune((pars->VoicePar[nvoice].PDetuneType==0)?(pars->GlobalPar.PDetuneType) : (pars->VoicePar[nvoice].PDetuneType),0,pars->VoicePar[nvoice].PDetune));}
+ callback {o->value(getdetune((pars->VoicePar[nvoice].PDetuneType==0)?(pars->GlobalPar.PDetuneType) : (pars->VoicePar[nvoice].PDetuneType),0,pars->VoicePar[nvoice].PDetune)*pars->getBandwidthDetuneMultiplier());} selected
xywh {265 5 45 20} labelsize 10 align 5 minimum -5000 maximum 5000 step 0.01 textfont 1 textsize 10
code0 {o->value(getdetune(pars->VoicePar[nvoice].PDetuneType,0,pars->VoicePar[nvoice].PDetune));}
}
@@ -126,7 +126,7 @@ detunevalueoutput->do_callback();}
callback {pars->VoicePar[nvoice].Enabled=(int)o->value();
if (o->value()==0) voicelistitemgroup->deactivate();
else voicelistitemgroup->activate();
-o->redraw();} selected
+o->redraw();}
private xywh {30 5 20 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 4
code0 {char tmp[10];snprintf(tmp,10,"%d",nvoice+1);o->label(strdup(tmp));}
code1 {o->value(pars->VoicePar[nvoice].Enabled);}
@@ -752,7 +752,7 @@ if (oscedit!=NULL) {
class ADnoteUI {: {public PresetsUI_}
} {
- Function {make_window()} {private
+ Function {make_window()} {open private
} {
Fl_Window ADnoteGlobalParameters {
label {ADsynth Global Parameters of the Instrument}
@@ -774,7 +774,7 @@ class ADnoteUI {: {public PresetsUI_}
if (k<0) k+=16;
pars->GlobalPar.PCoarseDetune = k*1024+
pars->GlobalPar.PCoarseDetune%1024;}
- tooltip Octave xywh {470 275 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 12
+ tooltip Octave xywh {450 275 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 12
code0 {int k=pars->GlobalPar.PCoarseDetune/1024;if (k>=8) k-=16;}
code2 {o->value(k);}
}
@@ -798,7 +798,7 @@ pars->GlobalPar.PCoarseDetune = k+
Fl_Slider freq {
callback {pars->GlobalPar.PDetune=(int)o->value()+8192;
detunevalueoutput->do_callback();}
- tooltip {Fine Detune (cents)} xywh {60 275 390 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
+ tooltip {Fine Detune (cents)} xywh {60 275 385 15} type {Horz Knob} box FLAT_BOX minimum -8192 maximum 8191 step 1
code0 {o->value(pars->GlobalPar.PDetune-8192);}
}
Fl_Value_Output detunevalueoutput {
@@ -815,6 +815,19 @@ detunevalueoutput->do_callback();} open
code0 {o->add("L35cents");o->add("L10cents");o->add("E100cents");o->add("E1200cents");}
code1 {o->value(pars->GlobalPar.PDetuneType-1);}
} {}
+ Fl_Dial {} {
+ label relBW
+ callback {pars->GlobalPar.PBandwidth=(int) o->value();
+
+pars->getBandwidthDetuneMultiplier();
+
+for (int i=0;i<NUM_VOICES;i++){
+ voicelistitem[i]->refreshlist();
+};}
+ tooltip {Bandwidth - how the relative fine detune of the voice are changed} xywh {500 270 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ code0 {o->value(pars->GlobalPar.PBandwidth);}
+ class WidgetPDial
+ }
}
Fl_Group {} {
label AMPLITUDE
diff --git a/src/UI/VirKeyboard.fl b/src/UI/VirKeyboard.fl
@@ -37,7 +37,7 @@ decl {const int keysoct1dw[]={'\\'','2',',','3','.','p','5','y','6','f','7','g',
decl {const int keysoct2dw[]={';','o','q','e','j','k','i','x','d','b','h','m','w','n','v','s','z',0};} {}
-class VirKeys {open : {public Fl_Box}
+class VirKeys {: {public Fl_Box}
} {
decl {static const int N_OCT=6;} {}
decl {static const int SIZE_WHITE=14;} {}
@@ -96,7 +96,7 @@ for (i=0;i<N_OCT*12;i++){
};
};} {}
}
- Function {handle(int event)} {open return_type int
+ Function {handle(int event)} {return_type int
} {
code {int i;
int ly=h();
@@ -164,8 +164,7 @@ if ((event==FL_KEYDOWN)||(event==FL_KEYUP)){
else relasekey(kpos,2);
};
-return(1);} {selected
- }
+return(1);} {}
}
Function {presskey(int nk,int exclusive,int type)} {} {
code {if (nk>=N_OCT*12) return;
@@ -217,7 +216,8 @@ pthread_mutex_unlock(&master->mutex);} {}
}
}
-class VirKeyboard {} {
+class VirKeyboard {selected
+} {
Function {make_window()} {} {
Fl_Window virkeyboardwindow {
label {Virtual Keyboard - ZynAddSubFX}
@@ -301,7 +301,7 @@ virkeys->take_focus();}
virkeys->take_focus();}
xywh {435 105 100 15} down_box BORDER_BOX labelsize 10 align 5 when 6 textfont 1 textsize 10
- code0 {midictl=C_bandwidth;o->value(8);}
+ code0 {midictl=C_filtercutoff;o->value(7);}
} {
menuitem {} {
label {01: Mod.Wheel}
