commit 94dbf2d9ff0c7b5480379b6559e3cda42a859925
parent b16cd05a5c1f3fa188c77b0ef419ec356e13bf1c
Author: paulnasca <paulnasca>
Date: Tue, 17 Aug 2004 17:29:29 +0000
*** empty log message ***
Diffstat:
4 files changed, 85 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -690,7 +690,7 @@
- Merge clipboardul la Oscil, Resonance, Filter si partial la ADsynth,SUBSynth si PADsynth
16 Aug 2004 - Corectata inca o eroare la pitch bend (aratata de Krzysztof Korpiela)
- Adaugat refresh si la Filtru si paste la ADnote, SUBnote si PADsynth sunt complete
-17 Aug 2004 - Adaugat clipboard la LFO
+17 Aug 2004 - Adaugat clipboard la LFO si Envelope
\ No newline at end of file
diff --git a/src/Params/EnvelopeParams.C b/src/Params/EnvelopeParams.C
@@ -60,7 +60,7 @@ REALTYPE EnvelopeParams::getdt(char i){
* ADSR/ASR... initialisations
*/
void EnvelopeParams::ADSRinit(char A_dt,char D_dt,char S_val,char R_dt){
- setpresettype("envamplitude");
+ setpresettype("Penvamplitude");
Envmode=1;
PA_dt=A_dt;PD_dt=D_dt;PS_val=S_val;PR_dt=R_dt;
Pfreemode=0;
@@ -70,7 +70,7 @@ void EnvelopeParams::ADSRinit(char A_dt,char D_dt,char S_val,char R_dt){
};
void EnvelopeParams::ADSRinit_dB(char A_dt,char D_dt,char S_val,char R_dt){
- setpresettype("envamplitude");
+ setpresettype("Penvamplitude");
Envmode=2;
PA_dt=A_dt;PD_dt=D_dt;PS_val=S_val;PR_dt=R_dt;
Pfreemode=0;
@@ -80,7 +80,7 @@ void EnvelopeParams::ADSRinit_dB(char A_dt,char D_dt,char S_val,char R_dt){
};
void EnvelopeParams::ASRinit(char A_val,char A_dt,char R_val,char R_dt){
- setpresettype("envfrequency");
+ setpresettype("Penvfrequency");
Envmode=3;
PA_val=A_val;PA_dt=A_dt;PR_val=R_val;PR_dt=R_dt;
Pfreemode=0;
@@ -90,7 +90,7 @@ void EnvelopeParams::ASRinit(char A_val,char A_dt,char R_val,char R_dt){
};
void EnvelopeParams::ADSRinit_filter(char A_val,char A_dt,char D_val,char D_dt,char R_dt,char R_val){
- setpresettype("envfilter");
+ setpresettype("Penvfilter");
Envmode=4;
PA_val=A_val;PA_dt=A_dt;PD_val=D_val;PD_dt=D_dt;PR_dt=R_dt;PR_val=R_val;
Pfreemode=0;
@@ -99,7 +99,7 @@ void EnvelopeParams::ADSRinit_filter(char A_val,char A_dt,char D_val,char D_dt,c
};
void EnvelopeParams::ASRinit_bw(char A_val,char A_dt,char R_val,char R_dt){
- setpresettype("envbandwidth");
+ setpresettype("Penvbandwidth");
Envmode=5;
PA_val=A_val;PA_dt=A_dt;PR_val=R_val;PR_dt=R_dt;
Pfreemode=0;
diff --git a/src/UI/EnvelopeUI.fl b/src/UI/EnvelopeUI.fl
@@ -33,6 +33,9 @@ decl {\#include <FL/fl_draw.H>} {public
decl {\#include <FL/fl_ask.H>} {public
}
+decl {\#include "PresetsUI.h"} {public
+}
+
class EnvelopeFreeEdit {: {public Fl_Box}
} {
Function {EnvelopeFreeEdit(int x,int y, int w, int h, const char *label=0):Fl_Box(x,y,w,h,label)} {} {
@@ -192,7 +195,7 @@ return(1);} {}
}
}
-class EnvelopeUI {open : {public Fl_Group}
+class EnvelopeUI {: {public Fl_Group,PresetsUI_}
} {
Function {EnvelopeUI(int x,int y, int w, int h, const char *label=0):Fl_Group(x,y,w,h,label)} {} {
code {env=NULL;
@@ -213,7 +216,7 @@ delete (freemodeeditwindow);} {}
Function {make_freemode_edit_window()} {} {
Fl_Window freemodeeditwindow {
label Envelope
- xywh {19 242 575 180} type Double hide
+ xywh {60 308 575 180} type Double hide
} {
Fl_Box freeedit {
label Envelope
@@ -320,6 +323,16 @@ envfree->redraw();}
code1 {if (env->Pfreemode==0) o->hide();}
code2 {o->maximum(env->Penvpoints-2);}
}
+ Fl_Button {} {
+ label C
+ callback {presetsui->copy(env);}
+ xywh {465 160 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
+ Fl_Button {} {
+ label P
+ callback {presetsui->paste(env,this);}
+ xywh {482 160 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
}
}
Function {make_ADSR_window()} {} {
@@ -377,9 +390,9 @@ freeedit->redraw();}
class WidgetPDial
}
Fl_Button {} {
- label Edit
+ label E
callback {freemodeeditwindow->show();}
- tooltip {Envelope window} xywh {160 5 40 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ tooltip {Envelope window} xywh {185 5 15 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
}
Fl_Check_Button e1linearenvelope {
label L
@@ -387,6 +400,16 @@ freeedit->redraw();}
tooltip {The evelope is linear} xywh {180 20 15 15} down_box DOWN_BOX labelsize 11 align 4
code0 {o->value(env->Plinearenvelope);}
}
+ Fl_Button {} {
+ label C
+ callback {presetsui->copy(env);}
+ xywh {150 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
+ Fl_Button {} {
+ label P
+ callback {presetsui->paste(env,this);}
+ xywh {167 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
}
}
}
@@ -444,11 +467,21 @@ freeedit->redraw();}
tooltip {Forced release} xywh {180 25 15 25} down_box DOWN_BOX labelsize 11 align 6
code0 {o->value(env->Pforcedrelease);}
}
+ Fl_Button {} {
+ label C
+ callback {presetsui->copy(env);}
+ xywh {155 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
+ Fl_Button {} {
+ label P
+ callback {presetsui->paste(env,this);}
+ xywh {172 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
}
Fl_Button {} {
- label Edit
+ label E
callback {freemodeeditwindow->show();}
- tooltip {Envelope window} xywh {165 5 40 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ tooltip {Envelope window} xywh {190 5 15 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
}
}
}
@@ -523,9 +556,19 @@ freeedit->redraw();}
code0 {o->value(env->Pforcedrelease);}
}
Fl_Button {} {
- label Edit
+ label E
callback {freemodeeditwindow->show();}
- xywh {230 5 40 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ xywh {255 5 15 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ }
+ Fl_Button {} {
+ label C
+ callback {presetsui->copy(env);}
+ xywh {220 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
+ Fl_Button {} {
+ label P
+ callback {presetsui->paste(env,this);}
+ xywh {237 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
}
}
}
@@ -584,15 +627,26 @@ freeedit->redraw();}
tooltip {Forced release} xywh {180 25 15 25} down_box DOWN_BOX labelsize 11 align 6
code0 {o->value(env->Pforcedrelease);}
}
+ Fl_Button {} {
+ label C
+ callback {presetsui->copy(env);}
+ xywh {155 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
+ Fl_Button {} {
+ label P
+ callback {presetsui->paste(env,this);}
+ xywh {172 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
}
Fl_Button {} {
- label Edit
+ label E
callback {freemodeeditwindow->show();}
- xywh {165 5 40 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ xywh {190 5 15 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
}
}
}
- Function {make_free_window()} {} {
+ Function {make_free_window()} {selected
+ } {
Fl_Window envfree {
xywh {373 413 205 70} type Double color 50 labelfont 1 hide resizable
class Fl_Group
@@ -609,9 +663,19 @@ freeedit->redraw();}
class EnvelopeFreeEdit
}
Fl_Button {} {
- label Edit
+ label E
callback {freemodeeditwindow->show();}
- xywh {160 5 40 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ xywh {185 5 15 15} box PLASTIC_UP_BOX labelfont 1 labelsize 10
+ }
+ Fl_Button {} {
+ label C
+ callback {presetsui->copy(env);}
+ xywh {150 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
+ }
+ Fl_Button {} {
+ label P
+ callback {presetsui->paste(env,this);}
+ xywh {167 5 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
}
}
}
@@ -776,8 +840,7 @@ if (env->Pfreemode==0){
envwindow->resize(this->x(),this->y(),this->w(),this->h());
-envwindow->show();} {selected
- }
+envwindow->show();} {}
}
decl {EnvelopeParams *env;} {}
decl {Fl_Group *envwindow;} {}
diff --git a/src/UI/LFOUI.fl b/src/UI/LFOUI.fl
@@ -138,7 +138,7 @@ hide();
}
Fl_Button {} {
label C
- callback {presetsui->copy(pars);}
+ callback {presetsui->copy(pars);} selected
xywh {145 10 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 7
}
Fl_Button {} {
