commit d89e2774304916e22e07b64b210a630ed5d63a0f
parent faefa531edaef091eaf3fcaa2c851799a81caf86
Author: paulnasca <paulnasca>
Date: Fri, 30 Jul 2004 14:31:53 +0000
*** empty log message ***
Diffstat:
11 files changed, 60 insertions(+), 49 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -666,8 +666,9 @@
- Nu se mai arata butonul de apply parameters la PADsynth cand nu este necesar
- Eliminate blocarile de cateva secunde din threadul de sunet in momentul cand se incarca un nou instrument care contine parametrii PADsynth
- Adaugata schimbarea titlului ferestrei principale la load XML
-28 Iul 2004 - Modificat modul cum este stocat lista de banci root dir
+29 Iul 2004 - Modificat modul cum este stocat lista de banci root dir
- Gasita o eroare care facea ca sa se stearga denormalkillbuffer inaintea lui master
-
+30 Iul 2004 - Gasite si corectate o gramada de erori (eu stergeam elemente din ferestre si fltk le stergea din nou)
+
diff --git a/src/Makefile b/src/Makefile
@@ -1,7 +1,7 @@
include Makefile.inc
ifneq ($(MAKECMDGOALS),debug)
- CXXFLAGS= -O6
+ CXXFLAGS= -O6 -Wall
else
CXXFLAGS= -O0 -ggdb -Wall -Wpointer-arith -Wstrict-prototypes
endif
diff --git a/src/Misc/Config.C b/src/Misc/Config.C
@@ -103,12 +103,18 @@ Config::Config(){
cfg.bankRootDirList[4]=new char[MAX_STRING_SIZE];
sprintf(cfg.bankRootDirList[4],"../banks");
+
+ cfg.bankRootDirList[5]=new char[MAX_STRING_SIZE];
+ sprintf(cfg.bankRootDirList[5],"banks");
#else
cfg.bankRootDirList[0]=new char[MAX_STRING_SIZE];
sprintf(cfg.bankRootDirList[0],"./");
cfg.bankRootDirList[1]=new char[MAX_STRING_SIZE];
sprintf(cfg.bankRootDirList[1],"../banks");
+
+ cfg.bankRootDirList[2]=new char[MAX_STRING_SIZE];
+ sprintf(cfg.bankRootDirList[2],"banks");
#endif
};
};
@@ -128,7 +134,7 @@ Config::~Config(){
void Config::clearbankrootdirlist(){
for (int i=0;i<MAX_BANK_ROOT_DIRS;i++) {
- if (cfg.bankRootDirList[i]=NULL) delete(cfg.bankRootDirList[i]);
+ if (cfg.bankRootDirList[i]==NULL) delete(cfg.bankRootDirList[i]);
cfg.bankRootDirList[i]=NULL;
};
};
diff --git a/src/UI/ADnoteUI.fl b/src/UI/ADnoteUI.fl
@@ -161,7 +161,7 @@ ADnoteVoiceListItem->redraw();} {}
}
Function {~ADvoicelistitem()} {} {
code {ADnoteVoiceListItem->hide();
-delete(ADnoteVoiceListItem);} {}
+//delete(ADnoteVoiceListItem);} {}
}
decl {ADnoteParameters *pars;} {}
decl {int nvoice;} {}
@@ -312,7 +312,7 @@ o->redraw();}
int nv=nvoice;
if (pars->VoicePar[nvoice].PextFMoscil>=0) nv=pars->VoicePar[nvoice].PextFMoscil;
-oscedit=new OscilEditor(pars->VoicePar[nv].FMSmp,fmoscil,NULL,master);} selected
+oscedit=new OscilEditor(pars->VoicePar[nv].FMSmp,fmoscil,NULL,master);}
xywh {700 370 55 15} box THIN_UP_BOX labelfont 1 labelsize 12
code0 {if (pars->VoicePar[nvoice].PextFMoscil>=0) o->labelcolor(FL_BLUE);}
}
@@ -737,7 +737,8 @@ hide();
if (oscedit!=NULL) {
delete(oscedit);
};
-delete (ADnoteVoiceParameters);} {}
+//delete (ADnoteVoiceParameters);} {selected
+ }
}
decl {int nvoice;} {}
decl {ADnoteParameters *pars;} {}
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -159,15 +159,15 @@ class EffUI {: {public Fl_Group}
filterwindow=NULL;} {}
}
Function {~EffUI()} {} {
- code {effnullwindow->hide();delete (effnullwindow);
-effreverbwindow->hide();delete (effreverbwindow);
-effechowindow->hide();delete (effechowindow);
-effchoruswindow->hide();delete (effchoruswindow);
-effphaserwindow->hide();delete (effphaserwindow);
-effalienwahwindow->hide();delete (effalienwahwindow);
-effdistorsionwindow->hide();delete (effdistorsionwindow);
-effeqwindow->hide();delete (effeqwindow);
-effdynamicfilterwindow->hide();delete (effdynamicfilterwindow);
+ code {effnullwindow->hide();//delete (effnullwindow);
+effreverbwindow->hide();//delete (effreverbwindow);
+effechowindow->hide();//delete (effechowindow);
+effchoruswindow->hide();//delete (effchoruswindow);
+effphaserwindow->hide();//delete (effphaserwindow);
+effalienwahwindow->hide();//delete (effalienwahwindow);
+effdistorsionwindow->hide();//delete (effdistorsionwindow);
+effeqwindow->hide();//delete (effeqwindow);
+effdynamicfilterwindow->hide();//delete (effdynamicfilterwindow);
if (filterwindow!=NULL){
filterwindow->hide();
diff --git a/src/UI/EnvelopeUI.fl b/src/UI/EnvelopeUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0104
+version 1.0105
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2004 Nasca Octavian Paul} {}
@@ -70,8 +70,7 @@ return((int) ((1.0-env->Penvval[n]/127.0)*ly));} {}
}
Function {getnearest(int x,int y)} {return_type int
} {
- code {
-x-=5;y-=5;
+ code {x-=5;y-=5;
int nearestpoint=0;
int nearestval=1000000;//a big value
@@ -202,13 +201,14 @@ class EnvelopeUI {: {public Fl_Group}
code {envwindow->hide();
hide();
freemodeeditwindow->hide();
-delete (envwindow);
-delete (freemodeeditwindow);} {}
+//delete (envwindow);
+delete (freemodeeditwindow);} {selected
+ }
}
Function {make_freemode_edit_window()} {} {
Fl_Window freemodeeditwindow {
label Envelope
- xywh {132 455 575 180} hide
+ xywh {132 455 575 180} type Double hide
} {
Fl_Box freeedit {
label Envelope
@@ -320,7 +320,7 @@ envfree->redraw();}
}
Function {make_ADSR_window()} {} {
Fl_Window envADSR {
- xywh {440 55 205 70} color 50 labelfont 1 hide
+ xywh {440 55 205 70} type Double color 50 labelfont 1 hide
class Fl_Group
} {
Fl_Group {} {
@@ -388,7 +388,7 @@ freeedit->redraw();}
}
Function {make_ASR_window()} {} {
Fl_Window envASR {
- xywh {433 172 210 70} hide
+ xywh {433 172 210 70} type Double hide
class Fl_Group
} {
Fl_Group {} {
@@ -450,11 +450,11 @@ freeedit->redraw();}
}
Function {make_ADSRfilter_window()} {} {
Fl_Window envADSRfilter {
- xywh {406 296 275 70} color 50 labelfont 1 hide
+ xywh {406 296 275 70} type Double color 50 labelfont 1 hide
class Fl_Group
} {
Fl_Group {} {
- label {Filter Envelope} selected
+ label {Filter Envelope}
xywh {0 0 275 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17
} {
Fl_Dial {} {
@@ -528,7 +528,7 @@ freeedit->redraw();}
}
Function {make_ASRbw_window()} {} {
Fl_Window envASRbw {
- xywh {431 279 210 70} hide
+ xywh {431 279 210 70} type Double hide
class Fl_Group
} {
Fl_Group {} {
@@ -590,7 +590,7 @@ freeedit->redraw();}
}
Function {make_free_window()} {} {
Fl_Window envfree {
- xywh {289 383 205 70} color 50 labelfont 1 hide resizable
+ xywh {289 383 205 70} type Double color 50 labelfont 1 hide resizable
class Fl_Group
} {
Fl_Group envfreegroup {
diff --git a/src/UI/FilterUI.fl b/src/UI/FilterUI.fl
@@ -158,8 +158,9 @@ nvowel=0;nformant=0;nseqpos=0;} {}
code {filterui->hide();
formantparswindow->hide();
hide();
-delete (filterui);
-delete (formantparswindow);} {}
+//delete (filterui);
+delete (formantparswindow);} {selected
+ }
}
Function {make_window()} {} {
Fl_Window filterui {
@@ -568,8 +569,7 @@ wvknob->when(0);
formant_freq_dial->when(0);
formant_q_dial->when(0);
formant_amp_dial->when(0);
-strchdial->when(0);} {selected
- }
+strchdial->when(0);} {}
}
decl {FilterParams *pars;} {}
decl {unsigned char *velsnsamp,*velsns;} {}
diff --git a/src/UI/LFOUI.fl b/src/UI/LFOUI.fl
@@ -41,7 +41,8 @@ class LFOUI {: {public Fl_Group}
Function {~LFOUI()} {} {
code {lfoui->hide();
hide();
-delete (lfoui);} {}
+//delete (lfoui);} {selected
+ }
}
Function {make_window()} {} {
Fl_Window lfoui {
diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl
@@ -236,7 +236,7 @@ for (i=1;i<lx;i++){
class Oscilharmonic {: {public Fl_Group}
} {
- Function {make_window()} {private
+ Function {make_window()} {open private
} {
Fl_Window harmonic {
private xywh {421 154 90 225} type Double hide
@@ -324,9 +324,10 @@ phase->value(oscil->Phphase[n]);
if (oscil->Phmag[n]==64) mag->selection_color(0);
else mag->selection_color(222);} {}
}
- Function {~Oscilharmonic()} {} {
+ Function {~Oscilharmonic()} {open
+ } {
code {harmonic->hide();
-delete(harmonic);} {}
+//delete(harmonic);} {}
}
decl {OscilGen *oscil;} {}
decl {Fl_Group *display;} {}
@@ -338,7 +339,7 @@ delete(harmonic);} {}
class OscilEditor {} {
Function {make_window()} {} {
Fl_Window osceditUI {
- label {ADsynth Oscillator Editor}
+ label {ADsynth Oscillator Editor} selected
xywh {4 91 745 590} type Double hide
code0 {if (oscil->ADvsPAD) o->label("PADsynth Harmonic Content Editor");}
} {
@@ -830,7 +831,7 @@ redrawoscil();}
} {}
}
Fl_Group {} {
- xywh {600 305 130 30} box ENGRAVED_BOX
+ xywh {600 305 135 30} box ENGRAVED_BOX
} {
Fl_Choice sabutton {
label {Sp.adj.}
@@ -909,7 +910,7 @@ redrawoscil();} open
Fl_Dial adhrpow {
label pow
callback {oscil->Padaptiveharmonicspower=(int)o->value();
-redrawoscil();} selected
+redrawoscil();}
tooltip {Adaptive harmonics power} xywh {710 450 25 25} labelsize 10 maximum 100 step 1
class WidgetPDial
}
@@ -996,7 +997,7 @@ osceditUI->show();} {}
}
Function {~OscilEditor()} {} {
code {osceditUI->hide();
-for (int i=0;i<MAX_AD_HARMONICS;i++) delete (h[i]);
+//for (int i=0;i<MAX_AD_HARMONICS;i++) delete (h[i]);
delete (osceditUI);} {}
}
Function {refresh()} {} {
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -76,7 +76,7 @@ end();} {}
}
Function {~PartSysEffSend()} {} {
code {syseffsend->hide();
-delete(syseffsend);} {}
+//delete(syseffsend);} {}
}
decl {Master *master;} {}
decl {int neff;} {}
@@ -265,7 +265,7 @@ end();} {}
}
Function {~PartKitItem()} {} {
code {partkititem->hide();
-delete(partkititem);} {}
+//delete(partkititem);} {}
}
decl {Part *part;} {}
decl {int n;} {}
@@ -274,7 +274,7 @@ delete(partkititem);} {}
decl {PartUI_ *partui;} {}
}
-class PartUI {: {public Fl_Group,PartUI_}
+class PartUI {open : {public Fl_Group,PartUI_}
} {
Function {make_window()} {private
} {
@@ -1115,13 +1115,14 @@ if ((engine==0)&&(adnoteui!=NULL)) adnoteui->ADnoteGlobalParameters->show();
if ((engine==1)&&(subnoteui!=NULL)) subnoteui->SUBparameters->show();
if ((engine==2)&&(adnoteui!=NULL)) padnoteui->padnotewindow->show();} {}
}
- Function {~PartUI()} {} {
+ Function {~PartUI()} {open
+ } {
code {if (adnoteui!=NULL) delete (adnoteui);
if (subnoteui!=NULL) delete (subnoteui);
if (padnoteui!=NULL) delete (padnoteui);
partgroup->hide();
-delete(partgroup);
+//delete(partgroup);
ctlwindow->hide();
delete(ctlwindow);
diff --git a/src/UI/SUBnoteUI.fl b/src/UI/SUBnoteUI.fl
@@ -96,8 +96,7 @@ delete(harmonic);} {}
}
class SUBnoteUI {} {
- Function {make_window()} {selected
- } {
+ Function {make_window()} {} {
Fl_Window SUBparameters {
label {SUBsynth Parameters}
xywh {4 225 735 390} type Double hide
@@ -371,9 +370,10 @@ globalfiltergroup->redraw();}
make_window();} {}
}
Function {~SUBnoteUI()} {} {
- code {for (int i=0;i<MAX_SUB_HARMONICS;i++) delete (h[i]);
+ code {//for (int i=0;i<MAX_SUB_HARMONICS;i++) delete (h[i]);
SUBparameters->hide();
-delete(SUBparameters);} {}
+delete(SUBparameters);} {selected
+ }
}
decl {SUBnoteParameters *pars;} {}
decl {SUBnoteharmonic *h[MAX_SUB_HARMONICS];} {}
