commit eae1788e91c24920743fe891b00fc952f016c64e
parent 19e1e85838d535bec82278b4c6d865700a57e0fc
Author: paulnasca <paulnasca>
Date: Mon, 19 Jul 2004 18:16:32 +0000
*** empty log message ***
Diffstat:
4 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -654,4 +654,6 @@
--------------------------------------------------------------------------------------------------
18 Iul 2004 - Corectata o mica eroare la afisare care facea ca la PADnoteUI sa fie trasate liniile in mod gresit
19 Iul 2004 - Corectata doua mici erori (se incarca gresit parametrii filtrului de la OscilGen)
-
+ - Corectata inca o mica eroare care facea ca sa nu se coloreze butonul PAD_Synth Apply in rosu la anumiti parametrii de la oscilgen
+ - Se dezactiveaza butoanele Edit de la PartUI ca sa nu se poata edita module de sinteza inactive
+
diff --git a/src/Params/PADnoteParameters.C b/src/Params/PADnoteParameters.C
@@ -414,7 +414,7 @@ void PADnoteParameters::applyparameters(bool lockmutex){
rms=sqrt(rms);
if (rms<0.000001) rms=1.0;
rms*=sqrt(262144.0/samplesize);
- for (int i=0;i<samplesize;i++) newsample.smp[i]*=1.0/rms*100.0;
+ for (int i=0;i<samplesize;i++) newsample.smp[i]*=1.0/rms*50.0;
//prepare extra samples used by the linear or cubic interpolation
for (int i=0;i<extra_samples;i++) newsample.smp[i+samplesize]=newsample.smp[i];
diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl
@@ -339,8 +339,8 @@ class OscilEditor {} {
Function {make_window()} {} {
Fl_Window osceditUI {
label {ADsynth Oscillator Editor}
- xywh {4 91 745 590} type Double
- code0 {if (oscil->ADvsPAD) o->label("PADsynth Harmonic Content Editor");} visible
+ xywh {4 91 745 590} type Double hide
+ code0 {if (oscil->ADvsPAD) o->label("PADsynth Harmonic Content Editor");}
} {
Fl_Group oscildisplaygroup {
xywh {15 5 360 300} box ENGRAVED_FRAME
@@ -795,7 +795,7 @@ redrawoscil();}
xywh {95 95 100 20} labelfont 1 labelsize 10
}
menuitem {} {
- label S selected
+ label S
xywh {105 105 100 20} labelfont 1 labelsize 10
}
}
@@ -893,8 +893,9 @@ redrawoscil();}
xywh {678 405 60 25} labelsize 10 align 144
}
Fl_Choice adhrtype {
- callback {oscil->Padaptiveharmonics=(int) o->value();} open
- tooltip {The type of the addaptive harmonics} xywh {680 430 55 15} down_box BORDER_BOX labelsize 10 textsize 10
+ callback {oscil->Padaptiveharmonics=(int) o->value();
+redrawoscil();} open
+ tooltip {The type of the addaptive harmonics} xywh {680 430 55 15} down_box BORDER_BOX labelsize 10 when 6 textsize 10
} {
menuitem {} {
label OFF
@@ -907,13 +908,15 @@ redrawoscil();}
}
Fl_Dial adhrpow {
label pow
- callback {oscil->Padaptiveharmonicspower=(int)o->value();}
+ callback {oscil->Padaptiveharmonicspower=(int)o->value();
+redrawoscil();} selected
tooltip {Adaptive harmonics power} xywh {710 450 25 25} labelsize 10 maximum 100 step 1
class WidgetPDial
}
Fl_Dial adhrbf {
label baseF
- callback {oscil->Padaptiveharmonicsbasefreq=(int)o->value();}
+ callback {oscil->Padaptiveharmonicsbasefreq=(int)o->value();
+redrawoscil();}
tooltip {Adaptive harmonics base frequency} xywh {680 450 25 25} labelsize 10 maximum 255 step 1
class WidgetPDial
}
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -274,9 +274,9 @@ delete(partkititem);} {}
decl {PartUI_ *partui;} {}
}
-class PartUI {: {public Fl_Group,PartUI_}
+class PartUI {open : {public Fl_Group,PartUI_}
} {
- Function {make_window()} {private
+ Function {make_window()} {open private
} {
Fl_Window partgroup {
private xywh {107 533 385 180} type Double hide
@@ -613,7 +613,7 @@ int x=part->Pefxroute[ninseff];
if (x==127) x=1;
bypasseff->value(part->Pefxbypass[ninseff]);
-sendtochoice->value(x);} selected
+sendtochoice->value(x);}
xywh {5 110 80 20} type Simple labelfont 1 align 6 minimum 1 maximum 127 step 1 textfont 1
code0 {o->bounds(1,NUM_PART_EFX);}
code1 {o->value(ninseff+1);}
@@ -866,7 +866,7 @@ subsynenabledcheck->value(part->kit[0].Psubenabled);}
}
Fl_Window instrumenteditwindow {
label {Instrument Edit}
- xywh {182 214 395 360} type Double hide
+ xywh {182 214 395 360} type Double visible
} {
Fl_Group {} {
xywh {0 220 395 110} box ENGRAVED_FRAME
@@ -875,14 +875,18 @@ subsynenabledcheck->value(part->kit[0].Psubenabled);}
label PADsynth
xywh {205 245 100 80} box ENGRAVED_FRAME labelfont 1
} {
- Fl_Button {} {
+ Fl_Button padeditbutton {
label Edit
callback {showparameters(0,2);}
xywh {215 280 80 35} box PLASTIC_UP_BOX color 222 selection_color 220 labelfont 1 labelsize 18 align 128
+ code0 {if (part->kit[0].Ppadenabled==0) o->deactivate();}
}
Fl_Check_Button padsynenabledcheck {
label Enabled
- callback {part->kit[0].Ppadenabled=(int) o->value();}
+ callback {int x=(int) o->value();
+part->kit[0].Ppadenabled=x;
+if (x==0) padeditbutton->deactivate();
+ else padeditbutton->activate();} selected
tooltip {enable/disable PADsynth} xywh {215 255 80 20} box PLASTIC_UP_BOX down_box DOWN_BOX color 222 selection_color 218 labelfont 1 labelsize 12
code1 {o->value(part->kit[0].Ppadenabled);}
}
@@ -893,14 +897,18 @@ subsynenabledcheck->value(part->kit[0].Psubenabled);}
} {
Fl_Check_Button adsynenabledcheck {
label Enabled
- callback {part->kit[0].Padenabled=(int) o->value();}
+ callback {int x=(int) o->value();
+part->kit[0].Padenabled=x;
+if (x==0) adeditbutton->deactivate();
+ else adeditbutton->activate();}
tooltip {enable/disable ADsynth} xywh {15 255 80 20} box PLASTIC_UP_BOX down_box DOWN_BOX color 222 selection_color 218 labelfont 1 labelsize 12
code1 {o->value(part->kit[0].Padenabled);}
}
- Fl_Button {} {
+ Fl_Button adeditbutton {
label Edit
callback {showparameters(0,0);}
xywh {15 281 80 34} box PLASTIC_UP_BOX color 222 selection_color 220 labelfont 1 labelsize 18 align 128
+ code0 {if (part->kit[0].Padenabled==0) o->deactivate();}
}
}
Fl_Group {} {
@@ -909,14 +917,18 @@ subsynenabledcheck->value(part->kit[0].Psubenabled);}
} {
Fl_Check_Button subsynenabledcheck {
label Enabled
- callback {part->kit[0].Psubenabled=(int) o->value();}
+ callback {int x=(int) o->value();
+part->kit[0].Psubenabled=x;
+if (x==0) subeditbutton->deactivate();
+ else subeditbutton->activate();}
tooltip {enable/disable SUBsynth} xywh {115 255 80 20} box PLASTIC_UP_BOX down_box DOWN_BOX color 222 selection_color 218 labelfont 1 labelsize 12
code1 {o->value(part->kit[0].Psubenabled);}
}
- Fl_Button {} {
+ Fl_Button subeditbutton {
label Edit
callback {showparameters(0,1);}
xywh {115 280 80 35} box PLASTIC_UP_BOX color 222 selection_color 220 labelfont 1 labelsize 18 align 128
+ code0 {if (part->kit[0].Psubenabled==0) o->deactivate();}
}
}
Fl_Button {} {
