commit 8c00f575721d068b4cf5075d6833c3086f7151b1
parent 4bfef06e003980c94ef03ee507e8d4182c89aa36
Author: paulnasca <paulnasca>
Date: Mon, 30 Oct 2006 17:05:46 +0000
*** empty log message ***
Diffstat:
32 files changed, 1639 insertions(+), 1022 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -0,0 +1,6 @@
+Main author:
+ Nasca Octavian Paul
+
+Contribuitors:
+
+
diff --git a/COPYING b/COPYING
@@ -1,7 +1,7 @@
NOTE! The GPL below is copyrighted by the Free Software Foundation, but
the instance of code that it refers to (the ZynAddSubFX application)
-is copyrighted by the author (Nasca Octavian Paul) who actually wrote it.
+is copyrighted by the authors (Nasca Octavian Paul and others) who actually wrote it.
---------------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
@@ -806,5 +806,6 @@
20 Aug 2006 - Adaugat 88200 ca rata de esantionare
14 Sep 2006 - Se afiseaza spectrul la nota cu frecventa de 440 Hz la Oscil si pentru parametru Adaptive Harmonics
30 Oct 2006 - Adaugat un patch "standalone zombie fix stripped from Lars"
+ - Adaugat un patch "Extended mono" si "font resizing stuff" de Gerald Folcher
diff --git a/README.txt b/README.txt
@@ -1,7 +1,7 @@
ZynAddSubFX
-----------
It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
-Copyright (c) 2002-2005 Nasca Octavian Paul
+Copyright (c) 2002-2006 Nasca Octavian Paul and others contribuitors
e-mail: zynaddsubfx AT yahoo D0T com
ZynAddSubFX is free program and is distribuited WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
diff --git a/src/Misc/Part.C b/src/Misc/Part.C
@@ -77,6 +77,7 @@ Part::Part(Microtonal *microtonal_,FFTwrapper *fft_, pthread_mutex_t *mutex_){
oldvolumel=oldvolumer=0.5;
lastnote=-1;
+ lastpos=0; // lastpos will store previously used NoteOn(...)'s pos.
defaults();
@@ -88,6 +89,7 @@ void Part::defaults(){
Pmaxkey=127;
Pnoteon=1;
Ppolymode=1;
+ Plegatomode=0;
setPvolume(96);
Pkeyshift=64;
Prcvchn=0;
@@ -180,11 +182,34 @@ Part::~Part(){
* Note On Messages
*/
void Part::NoteOn(unsigned char note,unsigned char velocity,int masterkeyshift){
- int i,pos;
-
- lastnote=note;
+ int i,pos;
+
+ // Legato and MonoMem used vars:
+ bool doinglegato=false; // true when we determined we do a legato note.
+ bool ismonofirstnote=false; /*(In Mono/Legato) true when we determined
+ no other notes are held down or sustained.*/
+ int lastnotecopy=lastnote; // Useful after lastnote has been changed.
+
+ if (Pnoteon==0) return; // (This check was performed later)
if ((note<Pminkey)||(note>Pmaxkey)) return;
-
+
+ // MonoMem stuff:
+ if (Ppolymode==0){ // If Poly is off (should we check for drummode too ?).
+ monomemnotes.push_back(note); // Add note to the list.
+ monomem[note].velocity=velocity; // Store this note's velocity.
+ monomem[note].mkeyshift=masterkeyshift; /* Store masterkeyshift too,
+ I'm not sure why though... */
+ if ((partnote[lastpos].status!=KEY_PLAYING)
+ && (partnote[lastpos].status!=KEY_RELASED_AND_SUSTAINED)){
+ ismonofirstnote=true; // No other keys are held or sustained.
+ }
+ } else {
+ // Poly mode is On so just make sure the list is empty.
+ if (not monomemnotes.empty()) monomemnotes.clear();
+ }
+
+ lastnote=note;
+
pos=-1;
for (i=0;i<POLIPHONY;i++){
if (partnote[i].status==KEY_OFF){
@@ -193,84 +218,172 @@ void Part::NoteOn(unsigned char note,unsigned char velocity,int masterkeyshift){
};
};
- if (Ppolymode==0){//if the mode is 'mono' turn off all other notes
+ if ((Plegatomode!=0) && (Pdrummode==0)){
+ // Legato mode is on and applicable.
+ if (Ppolymode!=0){
+ fprintf(stderr, "ZynAddSubFX WARNING: Poly and Legato modes are both On, that should not happen ! ... Disabling Legato mode ! - (Part.C::NoteOn(..))\n");
+ Plegatomode=0;
+ } else {
+ if (not ismonofirstnote){
+ // At least one other key is held or sustained
+ doinglegato=true; // So we'll do a legato note.
+ pos=lastpos; // A legato note uses same pos as previous.
+ } else {
+ for (i=0;i<POLIPHONY;i++)
+ if ((partnote[i].status==KEY_PLAYING) ||
+ (partnote[i].status==KEY_RELASED_AND_SUSTAINED))
+ RelaseNotePos(i);
+ }
+ }
+ } else { // Legato mode is either off or non-applicable.
+ if (Ppolymode==0){//if the mode is 'mono' turn off all other notes
for (i=0;i<POLIPHONY;i++)
- if (partnote[i].status==KEY_PLAYING) NoteOff(partnote[i].note);
- RelaseSustainedKeys();
- };
-
+ if (partnote[i].status==KEY_PLAYING) RelaseNotePos(i);
+ RelaseSustainedKeys();
+ }
+ }
+
if (pos==-1){
//test
- fprintf(stderr,"%s","NOTES TOO MANY (> POLIPHONY) - (Part.C::NoteOn(..))\n");
+ fprintf(stderr,"%s","NOTES TOO MANY (> POLIPHONY) - (Part.C::NoteOn(..))\n");
} else {
- if (Pnoteon!=0){
- //start the note
- partnote[pos].status=KEY_PLAYING;
- partnote[pos].note=note;
-
- //this computes the velocity sensing of the part
- REALTYPE vel=VelF(velocity/127.0,Pvelsns);
-
- //compute the velocity offset
- vel+=(Pveloffs-64.0)/64.0;
- if (vel<0.0) vel=0.0; else if (vel>1.0) vel=1.0;
-
- //compute the keyshift
- int partkeyshift=(int)Pkeyshift-64;
- int keyshift=masterkeyshift+partkeyshift;
-
- //initialise note frequency
- REALTYPE notebasefreq;
- if (Pdrummode==0){
- notebasefreq=microtonal->getnotefreq(note,keyshift);
- if (notebasefreq<0.0) return;//the key is no mapped
- } else {
- notebasefreq=440.0*pow(2.0,(note-69.0)/12.0);
- };
-
- //Portamento
- if (oldfreq<1.0) oldfreq=notebasefreq;//this is only the first note is played
-
- int portamento=ctl.initportamento(oldfreq,notebasefreq);
-
- if (portamento!=0) ctl.portamento.noteusing=pos;
- oldfreq=notebasefreq;
-
- partnote[pos].itemsplaying=0;
- if (Pkitmode==0){//init the notes for the "normal mode"
- partnote[pos].kititem[0].sendtoparteffect=0;
- if (kit[0].Padenabled!=0) partnote[pos].kititem[0].adnote=new ADnote(kit[0].adpars,&ctl,notebasefreq,vel,portamento,note);
- if (kit[0].Psubenabled!=0) partnote[pos].kititem[0].subnote=new SUBnote(kit[0].subpars,&ctl,notebasefreq,vel,portamento,note);
- if (kit[0].Ppadenabled!=0) partnote[pos].kititem[0].padnote=new PADnote(kit[0].padpars,&ctl,notebasefreq,vel,portamento,note);
- if ((kit[0].Padenabled!=0)||(kit[0].Psubenabled!=0)||(kit[0].Ppadenabled!=0)) partnote[pos].itemsplaying++;
-
- } else {//init the notes for the "kit mode"
- for (int item=0;item<NUM_KIT_ITEMS;item++){
- if (kit[item].Pmuted!=0) continue;
- if ((note<kit[item].Pminkey)||(note>kit[item].Pmaxkey)) continue;
-
- int ci=partnote[pos].itemsplaying;//ci=current item
-
- partnote[pos].kititem[ci].sendtoparteffect=( kit[item].Psendtoparteffect<NUM_PART_EFX ?
- kit[item].Psendtoparteffect: NUM_PART_EFX);//if this parameter is 127 for "unprocessed"
-
- if ((kit[item].adpars!=NULL)&&(kit[item].Padenabled)!=0)
- partnote[pos].kititem[ci].adnote=new ADnote(kit[item].adpars,&ctl,notebasefreq,vel,portamento,note);
-
- if ((kit[item].subpars!=NULL)&&(kit[item].Psubenabled)!=0)
- partnote[pos].kititem[ci].subnote=new SUBnote(kit[item].subpars,&ctl,notebasefreq,vel,portamento,note);
-
- if ((kit[item].padpars!=NULL)&&(kit[item].Ppadenabled)!=0)
- partnote[pos].kititem[ci].padnote=new PADnote(kit[item].padpars,&ctl,notebasefreq,vel,portamento,note);
+ /// if (Pnoteon!=0){
+
+ //start the note
+ partnote[pos].status=KEY_PLAYING;
+ partnote[pos].note=note;
+
+ //this computes the velocity sensing of the part
+ REALTYPE vel=VelF(velocity/127.0,Pvelsns);
+
+ //compute the velocity offset
+ vel+=(Pveloffs-64.0)/64.0;
+ if (vel<0.0) vel=0.0; else if (vel>1.0) vel=1.0;
+
+ //compute the keyshift
+ int partkeyshift=(int)Pkeyshift-64;
+ int keyshift=masterkeyshift+partkeyshift;
+
+ //initialise note frequency
+ REALTYPE notebasefreq;
+ if (Pdrummode==0){
+ notebasefreq=microtonal->getnotefreq(note,keyshift);
+ if (notebasefreq<0.0) return;//the key is no mapped
+ } else {
+ notebasefreq=440.0*pow(2.0,(note-69.0)/12.0);
+ };
- if ((kit[item].adpars!=NULL)|| (kit[item].subpars!=NULL)) {
- partnote[pos].itemsplaying++;
- if ( ((kit[item].Padenabled!=0)||(kit[item].Psubenabled!=0)||(kit[item].Ppadenabled!=0))
- && (Pkitmode==2) ) break;
- };
- };
+ //Portamento
+ if (oldfreq<1.0) oldfreq=notebasefreq;//this is only the first note is played
+
+ // For Mono/Legato: Force Portamento Off on first
+ // notes. That means it is required that the previous note is
+ // still held down or sustained for the Portamento to activate
+ // (that's like Legato).
+ int portamento=0;
+ if ((Ppolymode!=0) || (not ismonofirstnote)){
+ // I added a third argument to the
+ // ctl.initportamento(...) function to be able
+ // to tell it if we're doing a legato note.
+ portamento=ctl.initportamento(oldfreq,notebasefreq,doinglegato);
+ }
+
+ if (portamento!=0) ctl.portamento.noteusing=pos;
+ oldfreq=notebasefreq;
+
+ lastpos=pos; // Keep a trace of used pos.
+
+ if (doinglegato){
+ // Do Legato note
+ if (Pkitmode==0){ // "normal mode" legato note
+ if ((kit[0].Padenabled!=0)
+ && (partnote[pos].kititem[0].adnote!=NULL))
+ partnote[pos].kititem[0].adnote->ADlegatonote(kit[0].adpars, &ctl, notebasefreq, vel, portamento, note);
+
+ if ((kit[0].Psubenabled!=0)
+ && (partnote[pos].kititem[0].subnote!=NULL))
+ partnote[pos].kititem[0].subnote->SUBlegatonote(kit[0].subpars, &ctl, notebasefreq, vel, portamento, note);
+
+ if ((kit[0].Ppadenabled!=0)
+ && (partnote[pos].kititem[0].padnote!=NULL))
+ partnote[pos].kititem[0].padnote->PADlegatonote(kit[0].padpars, &ctl, notebasefreq, vel, portamento, note);
+
+ } else { // "kit mode" legato note
+ int ci=0;
+ for (int item=0;item<NUM_KIT_ITEMS;item++){
+ if (kit[item].Pmuted!=0) continue;
+ if ((note<kit[item].Pminkey)||(note>kit[item].Pmaxkey)) continue;
+
+ if ((lastnotecopy<kit[item].Pminkey)
+ ||(lastnotecopy>kit[item].Pmaxkey))
+ continue; // We will not perform legato across 2 key regions.
+
+ partnote[pos].kititem[ci].sendtoparteffect=( kit[item].Psendtoparteffect<NUM_PART_EFX ?
+ kit[item].Psendtoparteffect: NUM_PART_EFX);//if this parameter is 127 for "unprocessed"
+
+ if ((kit[item].Padenabled!=0) && (kit[item].adpars!=NULL)
+ && (partnote[pos].kititem[ci].adnote!=NULL))
+ partnote[pos].kititem[ci].adnote->ADlegatonote(kit[item].adpars,&ctl,notebasefreq,vel,portamento,note);
+
+ if ((kit[item].Psubenabled!=0) && (kit[item].subpars!=NULL)
+ && (partnote[pos].kititem[ci].subnote!=NULL))
+ partnote[pos].kititem[ci].subnote->SUBlegatonote(kit[item].subpars,&ctl,notebasefreq,vel,portamento,note);
+
+ if ((kit[item].Ppadenabled!=0) && (kit[item].padpars!=NULL)
+ && (partnote[pos].kititem[ci].padnote!=NULL))
+ partnote[pos].kititem[ci].padnote->PADlegatonote(kit[item].padpars,&ctl,notebasefreq,vel,portamento,note);
+
+ /* In the non-legato equivalent, (kit[item].padpars!=NULL)
+ is not checked, is there a reason for that or is it a bug ? */
+ if ((kit[item].adpars!=NULL)||(kit[item].subpars!=NULL)||(kit[item].padpars!=NULL)) {
+ ci++;
+ if ( ((kit[item].Padenabled!=0)||(kit[item].Psubenabled!=0)||(kit[item].Ppadenabled!=0)) && (Pkitmode==2) ) break;
+ }
+ }
+ if (ci==0){
+ // No legato were performed at all, so pretend nothing happened:
+ monomemnotes.pop_back(); // Remove last note from the list.
+ lastnote=lastnotecopy; // Set lastnote back to previous value.
+ }
+ }
+ return; // Ok, Legato note stuff done, return.
+ }
+
+ partnote[pos].itemsplaying=0;
+
+ if (Pkitmode==0){//init the notes for the "normal mode"
+ partnote[pos].kititem[0].sendtoparteffect=0;
+ if (kit[0].Padenabled!=0) partnote[pos].kititem[0].adnote=new ADnote(kit[0].adpars,&ctl,notebasefreq,vel,portamento,note);
+ if (kit[0].Psubenabled!=0) partnote[pos].kititem[0].subnote=new SUBnote(kit[0].subpars,&ctl,notebasefreq,vel,portamento,note);
+ if (kit[0].Ppadenabled!=0) partnote[pos].kititem[0].padnote=new PADnote(kit[0].padpars,&ctl,notebasefreq,vel,portamento,note);
+ if ((kit[0].Padenabled!=0)||(kit[0].Psubenabled!=0)||(kit[0].Ppadenabled!=0)) partnote[pos].itemsplaying++;
+ } else {//init the notes for the "kit mode"
+ for (int item=0;item<NUM_KIT_ITEMS;item++){
+ if (kit[item].Pmuted!=0) continue;
+ if ((note<kit[item].Pminkey)||(note>kit[item].Pmaxkey)) continue;
+
+ int ci=partnote[pos].itemsplaying;//ci=current item
+
+ partnote[pos].kititem[ci].sendtoparteffect=( kit[item].Psendtoparteffect<NUM_PART_EFX ?
+ kit[item].Psendtoparteffect: NUM_PART_EFX);//if this parameter is 127 for "unprocessed"
+
+ if ((kit[item].adpars!=NULL)&&(kit[item].Padenabled)!=0)
+ partnote[pos].kititem[ci].adnote=new ADnote(kit[item].adpars,&ctl,notebasefreq,vel,portamento,note);
+
+ if ((kit[item].subpars!=NULL)&&(kit[item].Psubenabled)!=0)
+ partnote[pos].kititem[ci].subnote=new SUBnote(kit[item].subpars,&ctl,notebasefreq,vel,portamento,note);
+
+ if ((kit[item].padpars!=NULL)&&(kit[item].Ppadenabled)!=0)
+ partnote[pos].kititem[ci].padnote=new PADnote(kit[item].padpars,&ctl,notebasefreq,vel,portamento,note);
+
+ if ((kit[item].adpars!=NULL)|| (kit[item].subpars!=NULL)) {
+ partnote[pos].itemsplaying++;
+ if ( ((kit[item].Padenabled!=0)||(kit[item].Psubenabled!=0)||(kit[item].Ppadenabled!=0))
+ && (Pkitmode==2) ) break;
};
+ };
};
+ /// };
};
//this only relase the keys if there is maximum number of keys allowed
@@ -282,16 +395,24 @@ void Part::NoteOn(unsigned char note,unsigned char velocity,int masterkeyshift){
*/
void Part::NoteOff(unsigned char note){//relase the key
int i;
+
+ // This note is released, so we remove it from the list.
+ if (not monomemnotes.empty()) monomemnotes.remove(note);
+
for (i=POLIPHONY-1;i>=0;i--){ //first note in, is first out if there are same note multiple times
- if ((partnote[i].status==KEY_PLAYING)&&(partnote[i].note==note)) {
- if (ctl.sustain.sustain==0){ //the sustain pedal is not pushed
- RelaseNotePos(i);
- break;
- } else {//the sustain pedal is pushed
- partnote[i].status=KEY_RELASED_AND_SUSTAINED;
- };
- };
- };
+ if ((partnote[i].status==KEY_PLAYING)&&(partnote[i].note==note)) {
+ if (ctl.sustain.sustain==0){ //the sustain pedal is not pushed
+ if ((Ppolymode==0) && (not monomemnotes.empty())){
+ MonoMemRenote(); // To play most recent still held note.
+ } else {
+ RelaseNotePos(i);
+ /// break;
+ }
+ } else {//the sustain pedal is pushed
+ partnote[i].status=KEY_RELASED_AND_SUSTAINED;
+ }
+ }
+ }
};
/*
@@ -368,6 +489,11 @@ void Part::SetController(unsigned int type,int par){
*/
void Part::RelaseSustainedKeys(){
+ // Let's call MonoMemRenote() on some conditions:
+ if ((Ppolymode==0) && (not monomemnotes.empty()))
+ if (monomemnotes.back()!=lastnote) // Sustain controller manipulation would cause repeated same note respawn without this check.
+ MonoMemRenote(); // To play most recent still held note.
+
for (int i=0;i<POLIPHONY;i++)
if (partnote[i].status==KEY_RELASED_AND_SUSTAINED) RelaseNotePos(i);
};
@@ -384,6 +510,19 @@ void Part::RelaseAllKeys(){
};
};
+// Call NoteOn(...) with the most recent still held key as new note
+// (Made for Mono/Legato).
+void Part::MonoMemRenote(){
+ unsigned char mmrtempnote=monomemnotes.back(); // Last list element.
+ monomemnotes.pop_back();// We remove it, will be added again in NoteOn(...).
+ if (Pnoteon==0){
+ RelaseNotePos(lastpos);
+ } else {
+ NoteOn(mmrtempnote, monomem[mmrtempnote].velocity,
+ monomem[mmrtempnote].mkeyshift);
+ }
+}
+
/*
* Release note at position
*/
@@ -720,6 +859,7 @@ void Part::add2XML(XMLwrapper *xml){
xml->addparbool("note_on",Pnoteon);
xml->addparbool("poly_mode",Ppolymode);
+ xml->addparbool("legato_mode",Plegatomode);
xml->addpar("key_limit",Pkeylimit);
xml->beginbranch("INSTRUMENT");
@@ -856,6 +996,7 @@ void Part::getfromXML(XMLwrapper *xml){
Pnoteon=xml->getparbool("note_on",Pnoteon);
Ppolymode=xml->getparbool("poly_mode",Ppolymode);
+ Plegatomode=xml->getparbool("legato_mode",Plegatomode);
Pkeylimit=xml->getpar127("key_limit",Pkeylimit);
diff --git a/src/Misc/Part.h b/src/Misc/Part.h
@@ -38,6 +38,8 @@
#include "../Effects/EffectMgr.h"
#include "XMLwrapper.h"
+#include <list> // For the monomemnotes list.
+
class Part{
public:
@@ -111,6 +113,7 @@ class Part{
unsigned char Pdrummode;//if all keys are mapped and the system is 12tET (used for drums)
unsigned char Ppolymode;//Part mode - 0=monophonic , 1=polyphonic
+ unsigned char Plegatomode;// 0=normal, 1=legato
unsigned char Pkeylimit;//how many keys are alowed to be played same time (0=off), the older will be relased
unsigned char *Pname; //name of the instrument
@@ -145,6 +148,8 @@ class Part{
private:
void KillNotePos(int pos);
void RelaseNotePos(int pos);
+ void MonoMemRenote(); // MonoMem stuff.
+
int killallnotes;//is set to 1 if I want to kill all notes
struct PartNotes{
@@ -159,7 +164,22 @@ class Part{
} kititem[NUM_KIT_ITEMS];
int time;
};
-
+
+ int lastpos; // To keep track of previously used pos.
+
+ // MonoMem stuff
+ std::list<unsigned char> monomemnotes; // A list to remember held notes.
+ struct {
+ unsigned char velocity;
+ int mkeyshift;// I'm not sure masterkeyshift should be remembered.
+ } monomem[256]; /* 256 is to cover all possible note values.
+ monomem[] is used in conjunction with the list to
+ store the velocity and masterkeyshift values of a
+ given note (the list only store note values).
+ For example 'monomem[note].velocity' would be the
+ velocity value of the note 'note'.
+ */
+
PartNotes partnote[POLIPHONY];
REALTYPE *tmpoutl;//used to get the note
diff --git a/src/Params/Controller.C b/src/Params/Controller.C
@@ -58,7 +58,7 @@ void Controller::defaults(){
resonancecenter.depth=64;
resonancebandwidth.depth=64;
- initportamento(440.0,440.0);
+ initportamento(440.0,440.0,false); // Now has a third argument
setportamento(0);
};
@@ -163,9 +163,17 @@ void Controller::setportamento(int value){
if (portamento.receive!=0) portamento.portamento=((value<64) ? 0 : 1 );
};
-int Controller::initportamento(REALTYPE oldfreq,REALTYPE newfreq){
+// I added a third argument to pass legato status,
+// when legatoflag is true it means "there's a legato in progress".
+int Controller::initportamento(REALTYPE oldfreq,REALTYPE newfreq,bool legatoflag){
portamento.x=0.0;
- if ((portamento.used!=0) || (portamento.portamento==0)) return(0);
+
+ if (legatoflag){ // Legato in progress
+ if (portamento.portamento==0) return(0);
+ } else { // No legato, do the original if...return
+ if ((portamento.used!=0) || (portamento.portamento==0)) return(0);
+ };
+
REALTYPE portamentotime=pow(100.0,portamento.time/127.0)/50.0;//portamento time in seconds
if ((portamento.updowntimestretch>=64)&&(newfreq<oldfreq)){
diff --git a/src/Params/Controller.h b/src/Params/Controller.h
@@ -57,7 +57,7 @@ class Controller{
void setparameternumber(unsigned int type,int value);//used for RPN and NRPN's
int getnrpn(int *parhi, int *parlo, int *valhi, int *vallo);
- int initportamento(REALTYPE oldfreq,REALTYPE newfreq);//returns 1 if the portamento's conditions are true, else return 0
+ int initportamento(REALTYPE oldfreq,REALTYPE newfreq,bool legatoflag);//returns 1 if the portamento's conditions are true, else return 0
void updateportamento(); //update portamento values
// Controllers values
diff --git a/src/Synth/ADnote.C b/src/Synth/ADnote.C
@@ -179,6 +179,210 @@ ADnote::ADnote(ADnoteParameters *pars,Controller *ctl_,REALTYPE freq,REALTYPE ve
};
+// ADlegatonote: This function is a copy of ADnote(...) and
+// initparameters() stuck together with some lines removed so that it
+// only alter the already playing note (to perform legato). It is
+// possible I left stuff that is not required for this.
+void ADnote::ADlegatonote(ADnoteParameters *pars, Controller *ctl_, REALTYPE freq, REALTYPE velocity, int portamento_, int midinote_){
+ portamento=portamento_;
+ midinote=midinote_;
+ basefreq=freq;
+
+ if (velocity>1.0) velocity=1.0;
+ this->velocity=velocity;
+
+ stereo=pars->GlobalPar.PStereo;
+
+ NoteGlobalPar.Detune=getdetune(pars->GlobalPar.PDetuneType
+ ,pars->GlobalPar.PCoarseDetune,pars->GlobalPar.PDetune);
+ bandwidthDetuneMultiplier=pars->getBandwidthDetuneMultiplier();
+
+ if (pars->GlobalPar.PPanning==0) NoteGlobalPar.Panning=RND;
+ else NoteGlobalPar.Panning=pars->GlobalPar.PPanning/128.0;
+
+
+ NoteGlobalPar.FilterCenterPitch=pars->GlobalPar.GlobalFilter->getfreq()+//center freq
+ pars->GlobalPar.PFilterVelocityScale/127.0*6.0* //velocity sensing
+ (VelF(velocity,pars->GlobalPar.PFilterVelocityScaleFunction)-1);
+
+ if (pars->GlobalPar.PPunchStrength!=0) {
+ NoteGlobalPar.Punch.Enabled=1;
+ NoteGlobalPar.Punch.t=1.0;//start from 1.0 and to 0.0
+ NoteGlobalPar.Punch.initialvalue=( (pow(10,1.5*pars->GlobalPar.PPunchStrength/127.0)-1.0)
+ *VelF(velocity,pars->GlobalPar.PPunchVelocitySensing) );
+ REALTYPE time=pow(10,3.0*pars->GlobalPar.PPunchTime/127.0)/10000.0;//0.1 .. 100 ms
+ REALTYPE stretch=pow(440.0/freq,pars->GlobalPar.PPunchStretch/64.0);
+ NoteGlobalPar.Punch.dt=1.0/(time*SAMPLE_RATE*stretch);
+ } else NoteGlobalPar.Punch.Enabled=0;
+
+ for (int nvoice=0;nvoice<NUM_VOICES;nvoice++){
+ if (pars->VoicePar[nvoice].Enabled==0) {
+ NoteVoicePar[nvoice].Enabled=OFF;
+ continue; //the voice is disabled
+ };
+
+ NoteVoicePar[nvoice].fixedfreq=pars->VoicePar[nvoice].Pfixedfreq;
+ NoteVoicePar[nvoice].fixedfreqET=pars->VoicePar[nvoice].PfixedfreqET;
+
+ //use the Globalpars.detunetype if the detunetype is 0
+ if (pars->VoicePar[nvoice].PDetuneType!=0){
+ NoteVoicePar[nvoice].Detune=getdetune(pars->VoicePar[nvoice].PDetuneType
+ ,pars->VoicePar[nvoice].PCoarseDetune,8192);//coarse detune
+ NoteVoicePar[nvoice].FineDetune=getdetune(pars->VoicePar[nvoice].PDetuneType
+ ,0,pars->VoicePar[nvoice].PDetune);//fine detune
+ } else {
+ NoteVoicePar[nvoice].Detune=getdetune(pars->GlobalPar.PDetuneType
+ ,pars->VoicePar[nvoice].PCoarseDetune,8192);//coarse detune
+ NoteVoicePar[nvoice].FineDetune=getdetune(pars->GlobalPar.PDetuneType
+ ,0,pars->VoicePar[nvoice].PDetune);//fine detune
+ };
+ if (pars->VoicePar[nvoice].PFMDetuneType!=0){
+ NoteVoicePar[nvoice].FMDetune=getdetune(pars->VoicePar[nvoice].PFMDetuneType
+ ,pars->VoicePar[nvoice].PFMCoarseDetune,pars->VoicePar[nvoice].PFMDetune);
+ } else {
+ NoteVoicePar[nvoice].FMDetune=getdetune(pars->GlobalPar.PDetuneType
+ ,pars->VoicePar[nvoice].PFMCoarseDetune,pars->VoicePar[nvoice].PFMDetune);
+ };
+
+ //Get the voice's oscil or external's voice oscil
+ int vc=nvoice;
+ if (pars->VoicePar[nvoice].Pextoscil!=-1) vc=pars->VoicePar[nvoice].Pextoscil;
+ if (!pars->GlobalPar.Hrandgrouping) pars->VoicePar[vc].OscilSmp->newrandseed(rand());
+
+ ///oscposhi[nvoice]=pars->VoicePar[vc].OscilSmp->get(NoteVoicePar[nvoice].OscilSmp,getvoicebasefreq(nvoice),pars->VoicePar[nvoice].Presonance);
+ pars->VoicePar[vc].OscilSmp->get(NoteVoicePar[nvoice].OscilSmp,getvoicebasefreq(nvoice),pars->VoicePar[nvoice].Presonance);//(gf)Modif of the above line.
+
+ //I store the first elments to the last position for speedups
+ for (int i=0;i<OSCIL_SMP_EXTRA_SAMPLES;i++) NoteVoicePar[nvoice].OscilSmp[OSCIL_SIZE+i]=NoteVoicePar[nvoice].OscilSmp[i];
+
+ ///oscposhi[nvoice]+=(int)((pars->VoicePar[nvoice].Poscilphase-64.0)/128.0*OSCIL_SIZE+OSCIL_SIZE*4);
+ ///oscposhi[nvoice]%=OSCIL_SIZE;
+
+ NoteVoicePar[nvoice].FilterCenterPitch=pars->VoicePar[nvoice].VoiceFilter->getfreq();
+ NoteVoicePar[nvoice].filterbypass=pars->VoicePar[nvoice].Pfilterbypass;
+
+ switch(pars->VoicePar[nvoice].PFMEnabled){
+ case 1:NoteVoicePar[nvoice].FMEnabled=MORPH;break;
+ case 2:NoteVoicePar[nvoice].FMEnabled=RING_MOD;break;
+ case 3:NoteVoicePar[nvoice].FMEnabled=PHASE_MOD;break;
+ case 4:NoteVoicePar[nvoice].FMEnabled=FREQ_MOD;break;
+ case 5:NoteVoicePar[nvoice].FMEnabled=PITCH_MOD;break;
+ default:NoteVoicePar[nvoice].FMEnabled=NONE;
+ };
+
+ NoteVoicePar[nvoice].FMVoice=pars->VoicePar[nvoice].PFMVoice;
+
+ //Compute the Voice's modulator volume (incl. damping)
+ REALTYPE fmvoldamp=pow(440.0/getvoicebasefreq(nvoice),pars->VoicePar[nvoice].PFMVolumeDamp/64.0-1.0);
+
+ switch (NoteVoicePar[nvoice].FMEnabled){
+ case PHASE_MOD:fmvoldamp=pow(440.0/getvoicebasefreq(nvoice),pars->VoicePar[nvoice].PFMVolumeDamp/64.0);
+ NoteVoicePar[nvoice].FMVolume=(exp(pars->VoicePar[nvoice].PFMVolume/127.0*FM_AMP_MULTIPLIER)-1.0)*fmvoldamp*4.0;
+ break;
+ case FREQ_MOD:NoteVoicePar[nvoice].FMVolume=(exp(pars->VoicePar[nvoice].PFMVolume/127.0*FM_AMP_MULTIPLIER)-1.0)*fmvoldamp*4.0;
+ break;
+ // case PITCH_MOD:NoteVoicePar[nvoice].FMVolume=(pars->VoicePar[nvoice].PFMVolume/127.0*8.0)*fmvoldamp;//???????????
+ // break;
+ default:if (fmvoldamp>1.0) fmvoldamp=1.0;
+ NoteVoicePar[nvoice].FMVolume=pars->VoicePar[nvoice].PFMVolume/127.0*fmvoldamp;
+ };
+
+ //Voice's modulator velocity sensing
+ NoteVoicePar[nvoice].FMVolume*=VelF(velocity,partparams->VoicePar[nvoice].PFMVelocityScaleFunction);
+
+ NoteVoicePar[nvoice].DelayTicks=(int)((exp(pars->VoicePar[nvoice].PDelay/127.0*log(50.0))-1.0)/SOUND_BUFFER_SIZE/10.0*SAMPLE_RATE);
+ };
+
+ /// initparameters();
+
+ ///////////////
+ // Altered content of initparameters():
+
+ int nvoice,i,tmp[NUM_VOICES];
+
+ NoteGlobalPar.Volume=4.0*pow(0.1,3.0*(1.0-partparams->GlobalPar.PVolume/96.0))//-60 dB .. 0 dB
+ *VelF(velocity,partparams->GlobalPar.PAmpVelocityScaleFunction);//velocity sensing
+
+ globalnewamplitude=NoteGlobalPar.Volume*NoteGlobalPar.AmpEnvelope->envout_dB()*NoteGlobalPar.AmpLfo->amplfoout();
+
+ NoteGlobalPar.FilterQ=partparams->GlobalPar.GlobalFilter->getq();
+ NoteGlobalPar.FilterFreqTracking=partparams->GlobalPar.GlobalFilter->getfreqtracking(basefreq);
+
+ // Forbids the Modulation Voice to be greater or equal than voice
+ for (i=0;i<NUM_VOICES;i++) if (NoteVoicePar[i].FMVoice>=i) NoteVoicePar[i].FMVoice=-1;
+
+ // Voice Parameter init
+ for (nvoice=0;nvoice<NUM_VOICES;nvoice++){
+ if (NoteVoicePar[nvoice].Enabled==0) continue;
+
+ NoteVoicePar[nvoice].noisetype=partparams->VoicePar[nvoice].Type;
+ /* Voice Amplitude Parameters Init */
+ NoteVoicePar[nvoice].Volume=pow(0.1,3.0*(1.0-partparams->VoicePar[nvoice].PVolume/127.0)) // -60 dB .. 0 dB
+ *VelF(velocity,partparams->VoicePar[nvoice].PAmpVelocityScaleFunction);//velocity
+
+ if (partparams->VoicePar[nvoice].PVolumeminus!=0) NoteVoicePar[nvoice].Volume=-NoteVoicePar[nvoice].Volume;
+
+ if (partparams->VoicePar[nvoice].PPanning==0)
+ NoteVoicePar[nvoice].Panning=RND;// random panning
+ else NoteVoicePar[nvoice].Panning=partparams->VoicePar[nvoice].PPanning/128.0;
+
+ newamplitude[nvoice]=1.0;
+ if (partparams->VoicePar[nvoice].PAmpEnvelopeEnabled!=0) {
+ newamplitude[nvoice]*=NoteVoicePar[nvoice].AmpEnvelope->envout_dB();
+ };
+
+ if (partparams->VoicePar[nvoice].PAmpLfoEnabled!=0){
+ newamplitude[nvoice]*=NoteVoicePar[nvoice].AmpLfo->amplfoout();
+ };
+
+
+ NoteVoicePar[nvoice].FilterFreqTracking=partparams->VoicePar[nvoice].VoiceFilter->getfreqtracking(basefreq);
+
+ /* Voice Modulation Parameters Init */
+ if ((NoteVoicePar[nvoice].FMEnabled!=NONE)&&(NoteVoicePar[nvoice].FMVoice<0)){
+ partparams->VoicePar[nvoice].FMSmp->newrandseed(rand());
+
+ //Perform Anti-aliasing only on MORPH or RING MODULATION
+
+ int vc=nvoice;
+ if (partparams->VoicePar[nvoice].PextFMoscil!=-1) vc=partparams->VoicePar[nvoice].PextFMoscil;
+
+ REALTYPE tmp=1.0;
+ if ((partparams->VoicePar[vc].FMSmp->Padaptiveharmonics!=0)||
+ (NoteVoicePar[nvoice].FMEnabled==MORPH)||
+ (NoteVoicePar[nvoice].FMEnabled==RING_MOD)){
+ tmp=getFMvoicebasefreq(nvoice);
+ };
+ if (!partparams->GlobalPar.Hrandgrouping) partparams->VoicePar[vc].FMSmp->newrandseed(rand());
+
+ ///oscposhiFM[nvoice]=(oscposhi[nvoice]+partparams->VoicePar[vc].FMSmp->get(NoteVoicePar[nvoice].FMSmp,tmp)) % OSCIL_SIZE;
+ // / oscposhi[nvoice]+partparams->VoicePar[vc].FMSmp->get(NoteVoicePar[nvoice].FMSmp,tmp); //(gf) Modif of the above line.
+ for (int i=0;i<OSCIL_SMP_EXTRA_SAMPLES;i++) NoteVoicePar[nvoice].FMSmp[OSCIL_SIZE+i]=NoteVoicePar[nvoice].FMSmp[i];
+ ///oscposhiFM[nvoice]+=(int)((partparams->VoicePar[nvoice].PFMoscilphase-64.0)/128.0*OSCIL_SIZE+OSCIL_SIZE*4);
+ ///oscposhiFM[nvoice]%=OSCIL_SIZE;
+ };
+
+ FMnewamplitude[nvoice]=NoteVoicePar[nvoice].FMVolume*ctl->fmamp.relamp;
+
+ if (partparams->VoicePar[nvoice].PFMAmpEnvelopeEnabled!=0){
+ FMnewamplitude[nvoice]*=NoteVoicePar[nvoice].FMAmpEnvelope->envout_dB();
+ };
+ };
+
+ for (nvoice=0;nvoice<NUM_VOICES;nvoice++){
+ for (i=nvoice+1;i<NUM_VOICES;i++) tmp[i]=0;
+ for (i=nvoice+1;i<NUM_VOICES;i++)
+ if ((NoteVoicePar[i].FMVoice==nvoice)&&(tmp[i]==0)){
+ tmp[i]=1;
+ };
+ /// if (NoteVoicePar[nvoice].VoiceOut!=NULL) for (i=0;i<SOUND_BUFFER_SIZE;i++) NoteVoicePar[nvoice].VoiceOut[i]=0.0;
+ };
+ ///////////////
+
+ // End of the ADlegatonote function.
+};
+
+
/*
* Kill a voice of ADnote
*/
diff --git a/src/Synth/ADnote.h b/src/Synth/ADnote.h
@@ -41,6 +41,9 @@ class ADnote{ //ADDitive note
public:
ADnote(ADnoteParameters *pars,Controller *ctl_,REALTYPE freq,REALTYPE velocity,int portamento_,int midinote_);
~ADnote();
+
+ void ADlegatonote(ADnoteParameters *pars, Controller *ctl_, REALTYPE freq, REALTYPE velocity, int portamento_, int midinote_);
+
int noteout(REALTYPE *outl,REALTYPE *outr);
void relasekey();
int finished();
diff --git a/src/Synth/PADnote.C b/src/Synth/PADnote.C
@@ -125,6 +125,93 @@ PADnote::PADnote(PADnoteParameters *parameters, Controller *ctl_,REALTYPE freq,
};
};
+
+// PADlegatonote: This function is a copy of PADnote(...)
+// with some lines removed so that it only alter the already playing
+// note (to perform legato). It is possible I left stuff that is not
+// required for this.
+void PADnote::PADlegatonote(PADnoteParameters *parameters, Controller *ctl_, REALTYPE freq, REALTYPE velocity, int portamento_, int midinote){
+ portamento=portamento_;
+ this->velocity=velocity;
+ finished_=false;
+
+ if (pars->Pfixedfreq==0) basefreq=freq;
+ else {
+ basefreq=440.0;
+ int fixedfreqET=pars->PfixedfreqET;
+ if (fixedfreqET!=0) {//if the frequency varies according the keyboard note
+ REALTYPE tmp=(midinote-69.0)/12.0*(pow(2.0,(fixedfreqET-1)/63.0)-1.0);
+ if (fixedfreqET<=64) basefreq*=pow(2.0,tmp);
+ else basefreq*=pow(3.0,tmp);
+ };
+ };
+
+ released=false;
+ realfreq=basefreq;
+ ///NoteGlobalPar.Detune=getdetune(pars->PDetuneType
+ /// ,pars->PCoarseDetune,pars->PDetune);
+ getdetune(pars->PDetuneType,pars->PCoarseDetune,pars->PDetune);//(gf) modif
+
+
+ //find out the closest note
+ REALTYPE logfreq=log(basefreq*pow(2.0,NoteGlobalPar.Detune/1200.0));
+ REALTYPE mindist=fabs(logfreq-log(pars->sample[0].basefreq+0.0001));
+ nsample=0;
+ for (int i=1;i<PAD_MAX_SAMPLES;i++){
+ if (pars->sample[i].smp==NULL) break;
+ REALTYPE dist=fabs(logfreq-log(pars->sample[i].basefreq+0.0001));
+
+ if (dist<mindist){
+ nsample=i;
+ mindist=dist;
+ };
+ };
+
+ int size=pars->sample[nsample].size;
+ if (size==0) size=1;
+
+ ///poshi_l=(int)(RND*(size-1));
+ ///if (pars->PStereo!=0) poshi_r=(poshi_l+size/2)%size;
+ ///else poshi_r=poshi_l;
+ ///poslo=0.0;
+
+ if (pars->PPanning==0) NoteGlobalPar.Panning=RND;
+ else NoteGlobalPar.Panning=pars->PPanning/128.0;
+
+ NoteGlobalPar.FilterCenterPitch=pars->GlobalFilter->getfreq()+//center freq
+ pars->PFilterVelocityScale/127.0*6.0* //velocity sensing
+ (VelF(velocity,pars->PFilterVelocityScaleFunction)-1);
+
+ if (pars->PPunchStrength!=0) {
+ NoteGlobalPar.Punch.Enabled=1;
+ NoteGlobalPar.Punch.t=1.0;//start from 1.0 and to 0.0
+ NoteGlobalPar.Punch.initialvalue=( (pow(10,1.5*pars->PPunchStrength/127.0)-1.0)
+ *VelF(velocity,pars->PPunchVelocitySensing) );
+ REALTYPE time=pow(10,3.0*pars->PPunchTime/127.0)/10000.0;//0.1 .. 100 ms
+ REALTYPE stretch=pow(440.0/freq,pars->PPunchStretch/64.0);
+ NoteGlobalPar.Punch.dt=1.0/(time*SAMPLE_RATE*stretch);
+ } else NoteGlobalPar.Punch.Enabled=0;
+
+
+ NoteGlobalPar.Volume=4.0*pow(0.1,3.0*(1.0-pars->PVolume/96.0))//-60 dB .. 0 dB
+ *VelF(velocity,pars->PAmpVelocityScaleFunction);//velocity sensing
+
+ NoteGlobalPar.AmpEnvelope->envout_dB();//discard the first envelope output
+ globaloldamplitude=globalnewamplitude=NoteGlobalPar.Volume*NoteGlobalPar.AmpEnvelope->envout_dB()*NoteGlobalPar.AmpLfo->amplfoout();
+
+ NoteGlobalPar.FilterQ=pars->GlobalFilter->getq();
+ NoteGlobalPar.FilterFreqTracking=pars->GlobalFilter->getfreqtracking(basefreq);
+
+
+ if (parameters->sample[nsample].smp==NULL){
+ finished_=true;
+ return;
+ };
+
+ // End of the PADlegatonote function.
+};
+
+
PADnote::~PADnote(){
delete (NoteGlobalPar.FreqEnvelope);
delete (NoteGlobalPar.FreqLfo);
diff --git a/src/Synth/PADnote.h b/src/Synth/PADnote.h
@@ -33,8 +33,10 @@ class PADnote{
public:
PADnote(PADnoteParameters *parameters, Controller *ctl_,REALTYPE freq, REALTYPE velocity, int portamento_, int midinote);
~PADnote();
-
- int noteout(REALTYPE *outl,REALTYPE *outr);
+
+ void PADlegatonote(PADnoteParameters *parameters, Controller *ctl_, REALTYPE freq, REALTYPE velocity, int portamento_, int midinote);
+
+ int noteout(REALTYPE *outl,REALTYPE *outr);
int finished();
void relasekey();
diff --git a/src/Synth/SUBnote.C b/src/Synth/SUBnote.C
@@ -141,6 +141,125 @@ SUBnote::SUBnote(SUBnoteParameters *parameters,Controller *ctl_,REALTYPE freq,RE
ready=1;
};
+
+// SUBlegatonote: This function is a copy of SUBnote(...) and
+// initparameters(...) stuck together with some lines removed so that
+// it only alter the already playing note (to perform legato). It is
+// possible I left stuff that is not required for this.
+void SUBnote::SUBlegatonote(SUBnoteParameters *parameters, Controller *ctl_, REALTYPE freq, REALTYPE velocity, int portamento_, int midinote){
+ portamento=portamento_;
+
+ volume=pow(0.1,3.0*(1.0-pars->PVolume/96.0));//-60 dB .. 0 dB
+ volume*=VelF(velocity,pars->PAmpVelocityScaleFunction);
+ if (pars->PPanning!=0) panning=pars->PPanning/127.0;
+ else panning=RND;
+ numstages=pars->Pnumstages;
+ stereo=pars->Pstereo;
+ start=pars->Pstart;
+
+ int pos[MAX_SUB_HARMONICS];
+
+ if (pars->Pfixedfreq==0) basefreq=freq;
+ else {
+ basefreq=440.0;
+ int fixedfreqET=pars->PfixedfreqET;
+ if (fixedfreqET!=0) {//if the frequency varies according the keyboard note
+ REALTYPE tmp=(midinote-69.0)/12.0*(pow(2.0,(fixedfreqET-1)/63.0)-1.0);
+ if (fixedfreqET<=64) basefreq*=pow(2.0,tmp);
+ else basefreq*=pow(3.0,tmp);
+ };
+ };
+ REALTYPE detune=getdetune(pars->PDetuneType,pars->PCoarseDetune,pars->PDetune);
+ basefreq*=pow(2.0,detune/1200.0);//detune
+
+ //global filter
+ GlobalFilterCenterPitch=pars->GlobalFilter->getfreq()+//center freq
+ (pars->PGlobalFilterVelocityScale/127.0*6.0)* //velocity sensing
+ (VelF(velocity,pars->PGlobalFilterVelocityScaleFunction)-1);
+
+ //select only harmonics that desire to compute
+ numharmonics=0;
+ for (int n=0;n<MAX_SUB_HARMONICS;n++){
+ if (pars->Phmag[n]==0)continue;
+ if (n*basefreq>SAMPLE_RATE/2.0) break;//remove the freqs above the Nyquist freq
+ pos[numharmonics++]=n;
+ };
+
+ if (numharmonics==0) {
+ NoteEnabled=OFF;
+ return;
+ };
+
+
+ //how much the amplitude is normalised (because the harmonics)
+ REALTYPE reduceamp=0.0;
+
+ for (int n=0;n<numharmonics;n++){
+
+ REALTYPE freq=basefreq*(pos[n]+1);
+
+ //the bandwidth is not absolute(Hz); it is relative to frequency
+ REALTYPE bw=pow(10,(pars->Pbandwidth-127.0)/127.0*4)*numstages;
+
+ //Bandwidth Scale
+ bw*=pow(1000/freq,(pars->Pbwscale-64.0)/64.0*3.0);
+
+ //Relative BandWidth
+ bw*=pow(100,(pars->Phrelbw[pos[n]]-64.0)/64.0);
+
+ if (bw>25.0) bw=25.0;
+
+ //try to keep same amplitude on all freqs and bw. (empirically)
+ REALTYPE gain=sqrt(1500.0/(bw*freq));
+
+ REALTYPE hmagnew=1.0-pars->Phmag[pos[n]]/127.0;
+ REALTYPE hgain;
+
+ switch(pars->Phmagtype){
+ case 1:hgain=exp(hmagnew*log(0.01)); break;
+ case 2:hgain=exp(hmagnew*log(0.001));break;
+ case 3:hgain=exp(hmagnew*log(0.0001));break;
+ case 4:hgain=exp(hmagnew*log(0.00001));break;
+ default:hgain=1.0-hmagnew;
+ };
+ gain*=hgain;
+ reduceamp+=hgain;
+
+ for (int nph=0;nph<numstages;nph++){
+ REALTYPE amp=1.0;
+ if (nph==0) amp=gain;
+ initfilter(lfilter[nph+n*numstages],freq,bw,amp,hgain);
+ if (stereo!=0) initfilter(rfilter[nph+n*numstages],freq,bw,amp,hgain);
+ };
+ };
+
+ if (reduceamp<0.001) reduceamp=1.0;
+ volume/=reduceamp;
+
+ oldpitchwheel=0;
+ oldbandwidth=64;
+
+ if (pars->Pfixedfreq==0) freq=basefreq;
+ else freq*=basefreq/440.0;
+
+
+ ///////////////
+ // Altered initparameters(...) content:
+
+ if (pars->PGlobalFilterEnabled!=0){
+ globalfiltercenterq=pars->GlobalFilter->getq();
+ GlobalFilterFreqTracking=pars->GlobalFilter->getfreqtracking(basefreq);
+ };
+
+ // end of the altered initparameters function content.
+ ///////////////
+
+ oldamplitude=newamplitude;
+
+ // End of the SUBlegatonote function.
+};
+
+
SUBnote::~SUBnote(){
if (NoteEnabled!=OFF) KillNote();
delete [] tmpsmp;
diff --git a/src/Synth/SUBnote.h b/src/Synth/SUBnote.h
@@ -33,6 +33,9 @@ class SUBnote{
public:
SUBnote(SUBnoteParameters *parameters,Controller *ctl_,REALTYPE freq,REALTYPE velocity,int portamento_,int midinote);
~SUBnote();
+
+ void SUBlegatonote(SUBnoteParameters *parameters, Controller *ctl_, REALTYPE freq, REALTYPE velocity, int portamento_, int midinote);
+
int noteout(REALTYPE *outl,REALTYPE *outr);//note output,return 0 if the note is finished
void relasekey();
int finished();
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.0106
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -69,7 +69,7 @@ class ADvoicelistitem {: {public Fl_Group}
}
Fl_Check_Button voiceresonanceenabled {
callback {pars->VoicePar[nvoice].Presonance=(int)o->value();}
- tooltip {Resonance On/Off} xywh {245 7 15 17} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 12 align 4
+ tooltip {Resonance On/Off} xywh {245 7 15 17} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 11 align 4
code0 {o->value(pars->VoicePar[nvoice].Presonance);}
}
Fl_Value_Slider voicelfofreq {
@@ -79,7 +79,7 @@ class ADvoicelistitem {: {public Fl_Group}
}
Fl_Dial voicepanning {
callback {pars->VoicePar[nvoice].PPanning=(int) o->value();}
- tooltip {Panning (leftmost is Random)} xywh {215 5 20 20} box ROUND_UP_BOX labelsize 11 align 4 maximum 127 step 1
+ tooltip {Panning (leftmost is Random)} xywh {215 5 20 20} box ROUND_UP_BOX labelsize 10 align 4 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PPanning);}
class WidgetPDial
}
@@ -117,7 +117,7 @@ detunevalueoutput->do_callback();}
voicelfofreq->deactivate();
voiceoscil->deactivate();
};}
- xywh {65 5 20 20} labelfont 1 labelsize 16 labelcolor 7
+ xywh {65 5 20 20} labelfont 1 labelsize 13 labelcolor 7
code0 {if (pars->VoicePar[nvoice].Type==0) o->hide();}
}
}
@@ -127,7 +127,7 @@ detunevalueoutput->do_callback();}
if (o->value()==0) voicelistitemgroup->deactivate();
else voicelistitemgroup->activate();
o->redraw();}
- private xywh {30 5 20 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 4
+ private xywh {30 5 20 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 4
code0 {char tmp[10];snprintf(tmp,10,"%d",nvoice+1);o->label(strdup(tmp));}
code1 {o->value(pars->VoicePar[nvoice].Enabled);}
}
@@ -172,12 +172,13 @@ ADnoteVoiceListItem->redraw();} {}
decl {Master *master;} {}
}
-class ADvoiceUI {: {public Fl_Group}
+class ADvoiceUI {open : {public Fl_Group}
} {
- Function {make_window()} {} {
+ Function {make_window()} {open
+ } {
Fl_Window ADnoteVoiceParameters {
label Voice
- xywh {231 132 765 525} type Double hide
+ xywh {225 174 765 525} type Double hide
class Fl_Group
} {
Fl_Group voiceparametersgroup {
@@ -189,12 +190,12 @@ class ADvoiceUI {: {public Fl_Group}
} {
Fl_Group voiceFMparametersgroup {
label MODULATOR
- xywh {530 5 230 515} box THIN_UP_FRAME color 48 labeltype EMBOSSED_LABEL labelfont 1 labelsize 18 align 17
+ xywh {530 5 230 515} box THIN_UP_FRAME color 48 labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
code0 {if (pars->VoicePar[nvoice].PFMEnabled==0) o->deactivate();}
} {
Fl_Group modfrequency {
label {Mod.FREQUENCY}
- xywh {535 220 220 145} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {535 220 220 145} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Group voiceFMfreqenvgroup {
label {ADSynth Modulator - Frequency Envelope}
@@ -208,7 +209,7 @@ class ADvoiceUI {: {public Fl_Group}
callback {pars->VoicePar[nvoice].PFMFreqEnvelopeEnabled=(int)o->value();
if (o->value()==0) voiceFMfreqenvgroup->deactivate();
else voiceFMfreqenvgroup->activate();
-o->redraw();}
+o->redraw();} selected
tooltip {Forced Relase} xywh {545 295 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->VoicePar[nvoice].PFMFreqEnvelopeEnabled);}
}
@@ -218,7 +219,7 @@ o->redraw();}
if (k<0) k+=1024;
pars->VoicePar[nvoice].PFMCoarseDetune = k+
(pars->VoicePar[nvoice].PFMCoarseDetune/1024)*1024;}
- tooltip {Coarse Detune} xywh {685 270 60 15} labelsize 11 align 1 minimum -64 maximum 63 step 1 textfont 1 textsize 12
+ tooltip {Coarse Detune} xywh {685 270 60 15} labelsize 10 align 1 minimum -64 maximum 63 step 1 textfont 1 textsize 11
code0 {int k=pars->VoicePar[nvoice].PFMCoarseDetune%1024;}
code1 {if (k>=512) k-=1024;}
code2 {o->value(k);}
@@ -230,7 +231,7 @@ pars->VoicePar[nvoice].PFMCoarseDetune = k+
if (k<0) k+=16;
pars->VoicePar[nvoice].PFMCoarseDetune = k*1024+
pars->VoicePar[nvoice].PFMCoarseDetune%1024;}
- tooltip Octave xywh {625 270 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 12
+ tooltip Octave xywh {625 270 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 11
code0 {int k=pars->VoicePar[nvoice].PFMCoarseDetune/1024;}
code1 {if (k>=8) k-=16;}
code2 {o->value(k);}
@@ -259,18 +260,18 @@ fmdetunevalueoutput->do_callback();} open
}
Fl_Group {} {
label {Mod.AMPLITUDE}
- xywh {535 60 220 160} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {535 60 220 160} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Value_Slider {} {
label Vol
callback {pars->VoicePar[nvoice].PFMVolume=(int)o->value();}
- tooltip Volume xywh {540 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip Volume xywh {540 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMVolume);}
}
Fl_Value_Slider {} {
label {V.Sns}
callback {pars->VoicePar[nvoice].PFMVelocityScaleFunction=(int) o->value();}
- tooltip {Velocity Sensing Function (rightmost to disable)} xywh {540 100 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip {Velocity Sensing Function (rightmost to disable)} xywh {540 100 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMVelocityScaleFunction);}
}
Fl_Group voiceFMampenvgroup {
@@ -292,7 +293,7 @@ o->redraw();}
Fl_Value_Slider {} {
label {F.Damp}
callback {pars->VoicePar[nvoice].PFMVolumeDamp=(int) o->value()+64;}
- tooltip {Modulator Damp at Higher frequency} xywh {540 120 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 minimum -64 maximum 63 step 1
+ tooltip {Modulator Damp at Higher frequency} xywh {540 120 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 minimum -64 maximum 63 step 1
code0 {o->value(pars->VoicePar[nvoice].PFMVolumeDamp-64);}
}
}
@@ -316,8 +317,8 @@ 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,NULL,master);} selected
- xywh {700 370 55 15} box THIN_UP_BOX labelfont 1 labelsize 12
+oscedit=new OscilEditor(pars->VoicePar[nv].FMSmp,fmoscil,NULL,NULL,master);}
+ xywh {700 370 55 15} box THIN_UP_BOX labelfont 1 labelsize 11
code0 {if (pars->VoicePar[nvoice].PextFMoscil>=0) o->labelcolor(FL_BLUE);}
}
Fl_Slider {} {
@@ -372,34 +373,34 @@ o->redraw();}
xywh {535 40 80 20} down_box BORDER_BOX align 5
code0 {o->value(pars->VoicePar[nvoice].PFMEnabled);}
} {
- menuitem {} {
+ MenuItem {} {
label OFF
xywh {40 40 100 20} labelfont 1
}
- menuitem {} {
+ MenuItem {} {
label MORPH
xywh {50 50 100 20} labelfont 1
}
- menuitem {} {
+ MenuItem {} {
label RING
xywh {60 60 100 20} labelfont 1
}
- menuitem {} {
+ MenuItem {} {
label PM
xywh {70 70 100 20} labelfont 1
}
- menuitem {} {
+ MenuItem {} {
label FM
xywh {80 80 100 20} labelfont 1
}
- menuitem {} {
+ MenuItem {} {
label PITCH
xywh {90 90 100 20} labelfont 1 deactivate
}
}
Fl_Group {} {
label FREQUENCY
- xywh {5 250 525 120} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {5 250 525 120} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Group voicefreqenvgroup {
label {ADSynth Voice - Frequency Envelope} open
@@ -430,7 +431,7 @@ o->redraw();}
if (o->value()==0) voicefreqlfogroup->deactivate();
else voicefreqlfogroup->activate();
o->redraw();}
- tooltip {Forced Relase} xywh {220 295 55 10} down_box DOWN_BOX labelfont 1 labelsize 12 align 24
+ tooltip {Forced Relase} xywh {220 295 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->VoicePar[nvoice].PFreqLfoEnabled);}
}
Fl_Counter {} {
@@ -439,7 +440,7 @@ o->redraw();}
if (k<0) k+=16;
pars->VoicePar[nvoice].PCoarseDetune = k*1024+
pars->VoicePar[nvoice].PCoarseDetune%1024;}
- tooltip Octave xywh {470 270 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 12
+ tooltip Octave xywh {470 270 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 11
code0 {int k=pars->VoicePar[nvoice].PCoarseDetune/1024;}
code1 {if (k>=8) k-=16;}
code2 {o->value(k);}
@@ -450,7 +451,7 @@ pars->VoicePar[nvoice].PCoarseDetune = k*1024+
if (k<0) k+=1024;
pars->VoicePar[nvoice].PCoarseDetune = k+
(pars->VoicePar[nvoice].PCoarseDetune/1024)*1024;}
- tooltip {Coarse Detune} xywh {455 340 60 20} labelsize 11 align 1 minimum -64 maximum 63 step 1 textfont 1 textsize 12
+ tooltip {Coarse Detune} xywh {455 340 60 20} labelsize 10 align 1 minimum -64 maximum 63 step 1 textfont 1 textsize 11
code0 {int k=pars->VoicePar[nvoice].PCoarseDetune%1024;}
code1 {if (k>=512) k-=1024;}
code2 {o->value(k);}
@@ -474,7 +475,7 @@ detunevalueoutput->do_callback();}
pars->VoicePar[nvoice].Pfixedfreq=x;
if (x==0) fixedfreqetdial->deactivate();
else fixedfreqetdial->activate();}
- tooltip {Set the voice base frequency to 440Hz} xywh {345 253 55 15} down_box DOWN_BOX labelfont 1 labelsize 12
+ tooltip {Set the voice base frequency to 440Hz} xywh {345 253 55 15} down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(pars->VoicePar[nvoice].Pfixedfreq);}
}
Fl_Dial fixedfreqetdial {
@@ -508,12 +509,12 @@ int nv=nvoice;
if (pars->VoicePar[nvoice].Pextoscil>=0) nv=pars->VoicePar[nvoice].Pextoscil;
oscedit=new OscilEditor(pars->VoicePar[nv].OscilSmp,voiceoscil,NULL,NULL,master);}
- xywh {5 475 65 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {5 475 65 20} box THIN_UP_BOX labelfont 1 labelsize 11
code0 {if (pars->VoicePar[nvoice].Pextoscil>=0) o->labelcolor(FL_BLUE);}
}
Fl_Box {} {
label {Voice Oscillator}
- xywh {5 375 75 35} labelfont 1 align 128
+ xywh {5 375 75 35} labelfont 1 labelsize 12 align 128
}
Fl_Slider {} {
label Phase
@@ -526,7 +527,7 @@ voiceoscil->redraw();}
Fl_Check_Button {} {
label {R.}
callback {pars->VoicePar[nvoice].Presonance=(int) o->value();}
- tooltip {Resonance On/Off} xywh {210 5 35 35} box THIN_UP_BOX down_box DOWN_BOX labelfont 1 labelsize 12
+ tooltip {Resonance On/Off} xywh {210 5 35 35} box THIN_UP_BOX down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(pars->VoicePar[nvoice].Presonance);}
}
Fl_Choice {} {
@@ -550,18 +551,18 @@ voiceonbutton->redraw();} open
}
Fl_Group {} {
label AMPLITUDE
- xywh {5 40 240 210} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {5 40 240 210} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Value_Slider {} {
label Vol
callback {pars->VoicePar[nvoice].PVolume=(int)o->value();}
- tooltip Volume xywh {10 60 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip Volume xywh {10 60 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PVolume);}
}
Fl_Value_Slider {} {
label {V.Sns}
callback {pars->VoicePar[nvoice].PAmpVelocityScaleFunction=(int) o->value();}
- tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 80 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PAmpVelocityScaleFunction);}
}
Fl_Group voiceampenvgroup {
@@ -574,7 +575,7 @@ voiceonbutton->redraw();} open
Fl_Dial {} {
label Pan
callback {pars->VoicePar[nvoice].PPanning=(int) o->value();}
- tooltip {Panning (leftmost is Random)} xywh {210 60 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Panning (leftmost is Random)} xywh {210 60 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PPanning);}
class WidgetPDial
}
@@ -600,7 +601,7 @@ o->redraw();}
if (o->value()==0) voiceamplfogroup->deactivate();
else voiceamplfogroup->activate();
o->redraw();}
- tooltip {Forced Relase} xywh {15 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 12 align 24
+ tooltip {Forced Relase} xywh {15 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->VoicePar[nvoice].PAmpLfoEnabled);}
}
Fl_Check_Button {} {
@@ -612,7 +613,7 @@ o->redraw();}
}
Fl_Group voicefiltergroup {
label FILTER
- xywh {245 5 285 245} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {245 5 285 245} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
code0 {if (pars->VoicePar[nvoice].PFilterEnabled==0) o->deactivate();}
} {
Fl_Group {} {
@@ -650,13 +651,13 @@ o->redraw();}
if (o->value()==0) voicefilterlfogroup->deactivate();
else voicefilterlfogroup->activate();
o->redraw();}
- tooltip {Forced Relase} xywh {255 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 12 align 24
+ tooltip {Forced Relase} xywh {255 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->VoicePar[nvoice].PFilterLfoEnabled);}
}
}
Fl_Group {} {
label 01
- xywh {5 5 55 35} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 30 align 16
+ xywh {5 5 55 35} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 16
code0 {char tmp[10];snprintf(tmp,10,"%d",nvoice+1);o->label(strdup(tmp));}
} {}
Fl_Choice {} {
@@ -665,17 +666,17 @@ pars->VoicePar[nvoice].Type=x;
if (x==0) voicemodegroup->activate();
else voicemodegroup->deactivate();
noiselabel->do_callback();}
- tooltip {Oscillator Type (sound/noise)} xywh {5 500 65 20} down_box BORDER_BOX labelsize 11 textfont 1 textsize 11
+ tooltip {Oscillator Type (sound/noise)} xywh {5 500 65 20} down_box BORDER_BOX labelsize 10 textfont 1 textsize 10
code0 {o->value(pars->VoicePar[nvoice].Type);}
code1 {if (pars->VoicePar[nvoice].Type!=0) voicemodegroup->deactivate();}
} {
- menuitem {} {
+ MenuItem {} {
label Sound
- xywh {5 5 100 20} labelfont 1 labelsize 13
+ xywh {5 5 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label NOISE
- xywh {15 15 100 20} labelfont 1 labelsize 13 labelcolor 1
+ xywh {15 15 100 20} labelfont 1 labelsize 11 labelcolor 1
}
}
Fl_Check_Button bypassfiltercheckbutton {
@@ -690,7 +691,7 @@ noiselabel->do_callback();}
Fl_Value_Slider {} {
label Delay
callback {pars->VoicePar[nvoice].PDelay=(int)o->value();}
- tooltip Volume xywh {120 21 84 12} type {Horz Knob} box FLAT_BOX labelsize 12 align 5 maximum 127 step 1
+ tooltip Volume xywh {120 21 84 12} type {Horz Knob} box FLAT_BOX labelsize 11 align 5 maximum 127 step 1
code0 {o->value(pars->VoicePar[nvoice].PDelay);}
}
}
@@ -701,7 +702,7 @@ if (o->value()==0) voicefiltergroup->deactivate();
else voicefiltergroup->activate();
o->redraw();
bypassfiltercheckbutton->redraw();}
- tooltip {Enable Filter} xywh {250 15 60 15} down_box DOWN_BOX labelfont 1 labelsize 12
+ tooltip {Enable Filter} xywh {250 15 60 15} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->VoicePar[nvoice].PFilterEnabled);}
}
Fl_Box noiselabel {
@@ -717,7 +718,7 @@ bypassfiltercheckbutton->redraw();}
if (o->value()==0) voiceparametersgroup->deactivate();
else voiceparametersgroup->activate();
o->redraw();}
- xywh {60 5 55 35} box THIN_UP_BOX down_box DOWN_BOX labelfont 1 labelsize 16
+ xywh {60 5 55 35} box THIN_UP_BOX down_box DOWN_BOX labelfont 1 labelsize 13
code0 {o->value(pars->VoicePar[nvoice].Enabled);}
}
}
@@ -753,15 +754,15 @@ 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}
- xywh {66 187 535 405} type Double hide
+ xywh {462 186 535 405} type Double hide
} {
Fl_Group {} {
label FREQUENCY
- xywh {5 255 525 115} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {5 255 525 115} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Group freqenv {
label {ADSynth Global - Frequency Envelope} open
@@ -775,7 +776,7 @@ class ADnoteUI {: {public PresetsUI_}
if (k<0) k+=16;
pars->GlobalPar.PCoarseDetune = k*1024+
pars->GlobalPar.PCoarseDetune%1024;}
- tooltip Octave xywh {450 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 11
code0 {int k=pars->GlobalPar.PCoarseDetune/1024;if (k>=8) k-=16;}
code2 {o->value(k);}
}
@@ -785,7 +786,7 @@ pars->GlobalPar.PCoarseDetune = k*1024+
if (k<0) k+=1024;
pars->GlobalPar.PCoarseDetune = k+
(pars->GlobalPar.PCoarseDetune/1024)*1024;}
- tooltip {Coarse Detune} xywh {455 345 60 20} labelsize 10 align 5 minimum -64 maximum 63 step 1 textfont 1 textsize 12
+ tooltip {Coarse Detune} xywh {455 345 60 20} labelsize 10 align 5 minimum -64 maximum 63 step 1 textfont 1 textsize 11
code0 {int k=pars->GlobalPar.PCoarseDetune%1024;if (k>=512) k-=1024;}
code2 {o->value(k);}
code3 {o->lstep(10);}
@@ -825,59 +826,59 @@ 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
+ tooltip {Bandwidth - how the relative fine detune of the voice are changed} xywh {500 270 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PBandwidth);}
class WidgetPDial
}
}
Fl_Group {} {
label AMPLITUDE
- xywh {5 5 240 250} box THIN_UP_FRAME labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {5 5 240 250} box THIN_UP_FRAME labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Value_Slider volume {
label Vol
callback {pars->GlobalPar.PVolume=(int)o->value();}
- tooltip Volume xywh {10 30 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip Volume xywh {10 30 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PVolume);}
}
Fl_Value_Slider vsns {
label {V.Sns}
callback {pars->GlobalPar.PAmpVelocityScaleFunction=(int) o->value();}
- tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PAmpVelocityScaleFunction);}
}
Fl_Dial pan {
label Pan
callback {pars->GlobalPar.PPanning=(int) o->value();}
- tooltip {Panning (leftmost is Random)} xywh {210 25 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Panning (leftmost is Random)} xywh {210 25 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PPanning);}
class WidgetPDial
}
Fl_Dial pstr {
label {P.Str.}
callback {pars->GlobalPar.PPunchStrength=(int) o->value();}
- tooltip {Punch Strength} xywh {125 227 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Strength} xywh {125 227 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PPunchStrength);}
class WidgetPDial
}
Fl_Dial pt {
label {P.t.}
callback {pars->GlobalPar.PPunchTime=(int) o->value();}
- tooltip {Punch Time (duration)} xywh {155 227 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Time (duration)} xywh {155 227 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PPunchTime);}
class WidgetPDial
}
Fl_Dial pstc {
label {P.Stc.}
callback {pars->GlobalPar.PPunchStretch=(int) o->value();}
- tooltip {Punch Stretch} xywh {185 227 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Stretch} xywh {185 227 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PPunchStretch);}
class WidgetPDial
}
Fl_Dial pvel {
label {P.Vel.}
callback {pars->GlobalPar.PPunchVelocitySensing=(int) o->value();}
- tooltip {Punch Velocity Sensing} xywh {215 227 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Velocity Sensing} xywh {215 227 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->GlobalPar.PPunchVelocitySensing);}
class WidgetPDial
}
@@ -902,7 +903,7 @@ for (int i=0;i<NUM_VOICES;i++){
}
Fl_Group {} {
label FILTER
- xywh {245 5 285 250} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {245 5 285 250} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Group filterenv {
label {ADSynth Global - Filter Envelope} open
@@ -926,7 +927,7 @@ for (int i=0;i<NUM_VOICES;i++){
Fl_Check_Button stereo {
label Stereo
callback {pars->GlobalPar.PStereo=(int) o->value();}
- xywh {5 220 65 35} box ENGRAVED_BOX down_box DOWN_BOX labelfont 1 labelsize 12
+ xywh {5 220 65 35} box ENGRAVED_BOX down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(pars->GlobalPar.PStereo);}
}
Fl_Button {} {
@@ -940,7 +941,7 @@ ADnoteVoiceList->show();}
Fl_Button {} {
label {Show Voice Parameters}
callback {ADnoteVoice->show();}
- xywh {5 375 170 25} labelfont 1
+ xywh {5 375 170 25} labelfont 1 labelsize 12
}
Fl_Button {} {
label Close
@@ -956,12 +957,12 @@ resui->resonancewindow->show();}
Fl_Button {} {
label C
callback {presetsui->copy(pars);}
- xywh {405 380 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {405 380 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(pars,this);}
- xywh {435 380 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {435 380 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
Fl_Window ADnoteVoice {
@@ -990,18 +991,18 @@ ADnoteVoice->add(advoice);
advoice->init(pars,nvoice,master);
advoice->show();
ADnoteVoice->redraw();}
- xywh {5 530 130 25} type Simple labelfont 1 align 8 minimum 0 maximum 2 step 1 value 1 textfont 1 textsize 18
+ xywh {5 530 130 25} type Simple labelfont 1 align 8 minimum 0 maximum 2 step 1 value 1 textfont 1 textsize 13
code0 {o->bounds(1,NUM_VOICES);}
}
Fl_Button {} {
label C
callback {presetsui->copy(pars,nvoice);}
- xywh {700 535 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {700 535 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(pars,this,nvoice);}
- xywh {730 535 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {730 535 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
Fl_Window ADnoteVoiceList {
@@ -1010,27 +1011,27 @@ ADnoteVoice->redraw();}
} {
Fl_Text_Display {} {
label {No.}
- xywh {10 15 30 10} box NO_BOX labelfont 1 labelsize 13
+ xywh {10 15 30 10} box NO_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label Vol
- xywh {145 15 30 10} box NO_BOX labelfont 1 labelsize 13
+ xywh {145 15 30 10} box NO_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label Detune
- xywh {384 15 25 10} box NO_BOX labelfont 1 labelsize 13
+ xywh {384 15 25 10} box NO_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label Pan
- xywh {210 15 30 10} box NO_BOX labelfont 1 labelsize 13
+ xywh {210 15 30 10} box NO_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label {Vib. Depth}
- xywh {560 15 30 10} box NO_BOX labelfont 1 labelsize 13
+ xywh {560 15 30 10} box NO_BOX labelfont 1 labelsize 11
}
Fl_Text_Display {} {
label {R.}
- xywh {245 15 25 10} box NO_BOX labelfont 1 labelsize 13
+ xywh {245 15 25 10} box NO_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label {Hide Voice List}
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0104
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -37,7 +37,7 @@ class BankProcess_ {} {
}
}
-class BankSlot {: {public Fl_Button,BankProcess_}
+class BankSlot {open : {public Fl_Button,BankProcess_}
} {
Function {BankSlot(int x,int y, int w, int h, const char *label=0):Fl_Button(x,y,w,h,label)} {} {
code {what=NULL;
@@ -59,7 +59,8 @@ int tmp=Fl_Button::handle(event);
if ((*what!=0) && Fl::event_inside(this)) (bp->*fnc)();
return(tmp);} {}
}
- Function {init(int nslot_, int *what_, int *whatslot_,void (BankProcess_:: *fnc_)(void),BankProcess_ *bp_,Bank *bank_,int *nselected_)} {} {
+ Function {init(int nslot_, int *what_, int *whatslot_,void (BankProcess_:: *fnc_)(void),BankProcess_ *bp_,Bank *bank_,int *nselected_)} {open
+ } {
code {nslot=nslot_;
what=what_;
whatslot=whatslot_;
@@ -68,10 +69,13 @@ bp=bp_;
bank=bank_;
nselected=nselected_;
box(FL_THIN_UP_BOX);
+labelfont(0);
+labelsize(13);
align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
highlight=0;
-refresh();} {}
+refresh();} {selected
+ }
}
Function {refresh()} {} {
code {if (bank->emptyslot(nslot)) {
@@ -141,28 +145,28 @@ class BankUI {: {public BankProcess_}
label WRITE
callback {if (o->value()>0.5) mode=2;
removeselection();}
- xywh {116 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 1 labeltype ENGRAVED_LABEL labelfont 1 labelsize 18
+ xywh {116 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 1 labeltype ENGRAVED_LABEL labelfont 1 labelsize 13
code0 {if (bank->locked()) o->deactivate();}
}
Fl_Light_Button readbutton {
label READ
callback {if (o->value()>0.5) mode=1;
removeselection();}
- xywh {11 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 101 labeltype ENGRAVED_LABEL labelfont 1 labelsize 18
+ xywh {11 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 101 labeltype ENGRAVED_LABEL labelfont 1 labelsize 13
code0 {o->value(1);}
}
Fl_Light_Button clearbutton {
label CLEAR
callback {if (o->value()>0.5) mode=3;
removeselection();}
- xywh {221 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 0 labeltype ENGRAVED_LABEL labelfont 1 labelsize 18
+ xywh {221 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 0 labeltype ENGRAVED_LABEL labelfont 1 labelsize 13
code0 {if (bank->locked()) o->deactivate();}
}
Fl_Light_Button swapbutton {
label SWAP
callback {if (o->value()>0.5) mode=4;
removeselection();}
- xywh {325 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 227 labeltype ENGRAVED_LABEL labelfont 1 labelsize 18
+ xywh {325 534 99 30} type Radio box PLASTIC_UP_BOX down_box THIN_DOWN_BOX selection_color 227 labeltype ENGRAVED_LABEL labelfont 1 labelsize 13
code0 {if (bank->locked()) o->deactivate();}
}
}
@@ -179,7 +183,7 @@ int result=bank->newbank(dirname);
if (result!=0) fl_alert("Error: Could not make a new bank (directory)..");
refreshmainwindow();}
- xywh {685 5 93 25} box PLASTIC_UP_BOX labelfont 1 labelsize 12 align 128
+ xywh {685 5 93 25} box PLASTIC_UP_BOX labelfont 1 labelsize 11 align 128
}
Fl_Check_Button {} {
label {auto close}
@@ -196,19 +200,19 @@ if (bank->loadbank(dirname)==2)
fl_alert("Error: Could not load the bank from the directory\\n%s.",dirname);
for (int i=0;i<BANK_SIZE;i++) bs[i]->refresh();
refreshmainwindow();} open
- xywh {5 8 220 20} down_box BORDER_BOX labelfont 1 align 0 textfont 1 textsize 12
+ xywh {5 8 220 20} down_box BORDER_BOX labelfont 1 align 0 textfont 1 textsize 11
} {}
Fl_Button {} {
label {Refresh bank list}
callback {rescan_for_banks();
banklist->value(0);}
- tooltip {Refresh the bank list (rescan)} xywh {230 8 105 20} box THIN_UP_BOX color 50 labelsize 12
+ tooltip {Refresh the bank list (rescan)} xywh {230 8 105 20} box THIN_UP_BOX color 50 labelsize 11
}
Fl_Check_Button {} {
label {Show PADsynth status}
callback {config.cfg.CheckPADsynth=(int) o->value();
refreshmainwindow();}
- xywh {435 530 150 15} down_box DOWN_BOX labelsize 12
+ xywh {435 530 150 15} down_box DOWN_BOX labelsize 11
code0 {o->value(config.cfg.CheckPADsynth);}
}
}
@@ -301,8 +305,7 @@ if (mode==4){//swap
bs[slot]->refresh();
};
};
-if (mode!=4) refreshmainwindow();} {selected
- }
+if (mode!=4) refreshmainwindow();} {}
}
Function {refreshmainwindow()} {} {
code {bankuiwindow->label(bank->bankfiletitle);
diff --git a/src/UI/ConfigUI.fl b/src/UI/ConfigUI.fl
@@ -105,7 +105,7 @@ config.cfg.SampleRate=strtoul(o->value(),&tmp,10);}
label {Buffer Size}
callback {char *tmp;
config.cfg.SoundBufferSize=strtoul(o->value(),&tmp,10);}
- tooltip {Internal Sound Buffer Size (samples)} xywh {190 45 60 20} type Int labelsize 12 align 129 textfont 1
+ tooltip {Internal Sound Buffer Size (samples)} xywh {190 45 60 20} type Int labelsize 11 align 129 textfont 1
code0 {char *tmpbuf=new char[100];o->cut(0,o->maximum_size());}
code1 {snprintf(tmpbuf,100,"%d",config.cfg.SoundBufferSize);o->insert(tmpbuf);}
code2 {delete(tmpbuf);}
@@ -113,13 +113,13 @@ config.cfg.SoundBufferSize=strtoul(o->value(),&tmp,10);}
Fl_Light_Button {} {
label {Swap Stereo }
callback {config.cfg.SwapStereo=(int) o->value();}
- xywh {20 80 85 20} box THIN_UP_BOX labelsize 11
+ xywh {20 80 85 20} box THIN_UP_BOX labelsize 10
code0 {o->value(config.cfg.SwapStereo);}
}
Fl_Choice {} {
label OscilSize
callback {config.cfg.OscilSize=128<<o->value();}
- tooltip {ADSynth Oscillator Size (samples)} xywh {175 80 75 20} down_box BORDER_BOX labelfont 1 labelsize 12 textsize 10
+ tooltip {ADSynth Oscillator Size (samples)} xywh {175 80 75 20} down_box BORDER_BOX labelfont 1 labelsize 11 textsize 10
code0 {o->value( (int) (log(config.cfg.OscilSize/128.0-1.0)/log(2)) +1);}
} {
menuitem {} {
@@ -157,11 +157,11 @@ config.cfg.SoundBufferSize=strtoul(o->value(),&tmp,10);}
}
Fl_Box {} {
label {Most settings has effect only after ZynAddSubFX is restarted.}
- xywh {15 275 235 30} labelfont 1 labelsize 12 align 128
+ xywh {15 275 235 30} labelfont 1 labelsize 11 align 128
}
Fl_Box {} {
label {Read the Readme.txt for other settings}
- xywh {10 255 240 20} labelfont 1 labelsize 12 align 128
+ xywh {10 255 240 20} labelfont 1 labelsize 11 align 128
}
Fl_Group {} {
xywh {15 125 230 85} box ENGRAVED_BOX
@@ -191,11 +191,11 @@ dump.startnow();//this has effect only if this option was disabled}
} {
Fl_Box {} {
label {Note: Not all the following settings are used (this depends on the operating system, etc..)}
- xywh {260 50 235 45} labelfont 1 labelsize 12 align 128
+ xywh {260 50 235 45} labelfont 1 labelsize 11 align 128
}
Fl_Group {} {
label Linux
- xywh {260 110 235 115} box ENGRAVED_BOX labelfont 1 labelsize 16 align 5
+ xywh {260 110 235 115} box ENGRAVED_BOX labelfont 1 labelsize 13 align 5
} {
Fl_File_Input {} {
label {OSS Sequencer Device (/dev/...)}
@@ -212,19 +212,19 @@ dump.startnow();//this has effect only if this option was disabled}
}
Fl_Group {} {
label Windows
- xywh {260 250 235 50} box ENGRAVED_BOX labelfont 1 labelsize 16 align 5
+ xywh {260 250 235 50} box ENGRAVED_BOX labelfont 1 labelsize 13 align 5
} {
Fl_Counter {} {
label {Midi In Dev}
callback {config.cfg.WindowsMidiInId=(int) o->value();
midiinputnamebox->label(config.winmididevices[config.cfg.WindowsMidiInId].name);}
- xywh {270 270 65 20} type Simple labelsize 12 align 1 minimum 0 maximum 100 step 1
+ xywh {270 270 65 20} type Simple labelsize 11 align 1 minimum 0 maximum 100 step 1
code0 {o->maximum(config.winmidimax-1);}
code1 {o->value(config.cfg.WindowsMidiInId);}
}
Fl_Box midiinputnamebox {
label {Midi input device name}
- xywh {340 260 150 35} labelfont 1 labelsize 12 align 212
+ xywh {340 260 150 35} labelfont 1 labelsize 11 align 212
code0 {o->label(config.winmididevices[config.cfg.WindowsMidiInId].name);}
}
}
@@ -232,13 +232,13 @@ midiinputnamebox->label(config.winmididevices[config.cfg.WindowsMidiInId].name);
Fl_Counter {} {
label {XML compression level}
callback {config.cfg.GzipCompression=(int) o->value();}
- tooltip {gzip compression level (0 - uncompressed)} xywh {20 215 65 15} type Simple labelsize 12 align 8 minimum 0 maximum 9 step 1
+ tooltip {gzip compression level (0 - uncompressed)} xywh {20 215 65 15} type Simple labelsize 11 align 8 minimum 0 maximum 9 step 1
code0 {o->value(config.cfg.GzipCompression);}
}
Fl_Choice {} {
label {PADsynth Interpolation}
callback {config.cfg.Interpolation=(int) o->value();}
- xywh {175 105 75 15} down_box BORDER_BOX labelsize 11 textsize 12
+ xywh {175 105 75 15} down_box BORDER_BOX labelsize 10 textsize 11
code0 {o->value(config.cfg.Interpolation);}
} {
menuitem {} {
@@ -253,20 +253,20 @@ midiinputnamebox->label(config.winmididevices[config.cfg.WindowsMidiInId].name);
Fl_Choice {} {
label {Virtual Keyboard Layout}
callback {config.cfg.VirKeybLayout=(int) o->value();;} open selected
- xywh {155 235 85 20} down_box BORDER_BOX labelsize 13 textfont 1 textsize 12
+ xywh {155 235 85 20} down_box BORDER_BOX labelsize 12 textfont 1 textsize 11
code0 {o->value(config.cfg.VirKeybLayout);}
} {
menuitem {} {
label { }
- xywh {5 5 100 20} labelfont 1 labelsize 13 deactivate
+ xywh {5 5 100 20} labelfont 1 labelsize 11 deactivate
}
menuitem {} {
label QWERTY
- xywh {15 15 100 20} labelfont 1 labelsize 13
+ xywh {15 15 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Dvorak
- xywh {25 25 100 20} labelfont 1 labelsize 13
+ xywh {25 25 100 20} labelfont 1 labelsize 11
}
}
}
diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0104
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -155,7 +155,7 @@ return(log(freq/20.0)/log(1000.0));} {}
decl {int maxdB;} {}
}
-class EffUI {: {public Fl_Group,public PresetsUI_}
+class EffUI {open : {public Fl_Group,public PresetsUI_}
} {
Function {EffUI(int x,int y, int w, int h, const char *label=0):Fl_Group(x,y,w,h,label)} {} {
code {eff=NULL;
@@ -184,7 +184,7 @@ if (filterwindow!=NULL){
} {
Fl_Text_Display {} {
label {No Effect}
- xywh {120 35 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 labelcolor 43 align 8
+ xywh {120 35 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 labelcolor 43 align 8
}
}
}
@@ -195,64 +195,64 @@ if (filterwindow!=NULL){
} {
Fl_Text_Display {} {
label {Reverb }
- xywh {275 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {275 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Choice revp {
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Cathedral 1}
xywh {10 10 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Cathedral 2}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Cathedral 3}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Hall 1}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Hall 2}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Room 1}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Room 2}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Basement
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Tunnel
xywh {90 90 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echoed 1}
xywh {100 100 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echoed 2}
xywh {110 110 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Very Long 1}
xywh {120 120 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Very Long 2}
xywh {130 130 100 20} labelfont 1 labelsize 10 labelcolor 7
}
@@ -260,13 +260,13 @@ refresh(eff);}
Fl_Choice revp10 {
label Type
callback {eff->seteffectpar(10,(int) o->value());}
- xywh {110 15 75 15} down_box BORDER_BOX color 14 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {110 15 75 15} down_box BORDER_BOX color 14 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label Random
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Freeverb
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
@@ -274,61 +274,61 @@ refresh(eff);}
Fl_Dial revp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp2 {
label Time
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp3 {
label {I.del}
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial revp4 {
label {I.delfb}
callback {eff->seteffectpar(4,(int) o->value());}
- xywh {155 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {155 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp5 {
label {R.delay}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127 deactivate
+ xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127 deactivate
class WidgetPDial
}
Fl_Dial revp6 {
label {E/R}
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127 deactivate
+ xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127 deactivate
class WidgetPDial
}
Fl_Dial revp7 {
label LPF
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp8 {
label HPF
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {305 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {305 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp9 {
label Damp
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {340 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 minimum 64 maximum 127 step 1
+ xywh {340 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 minimum 64 maximum 127 step 1
class WidgetPDial
}
Fl_Dial revp11 {
@@ -351,89 +351,89 @@ eff->seteffectpar(11,x);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Echo 1}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echo 2}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echo 3}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Simple Echo}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Canyon
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Panning Echo 1}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Panning Echo 2}
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Panning Echo 3}
xywh {90 90 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Feedback Echo}
xywh {100 100 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Echo
- xywh {295 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {295 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial echop0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial echop1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial echop2 {
label Delay
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial echop3 {
label {LRdl.}
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial echop4 {
label {LRc.}
callback {eff->seteffectpar(4,(int) o->value());}
- xywh {155 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {155 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial echop5 {
label {Fb.}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {195 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {195 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial echop6 {
label Damp
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
}
@@ -447,105 +447,105 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Chorus 1}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Chorus 2}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Chorus 3}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Celeste 1}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Celeste 2}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 1}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 2}
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 3}
xywh {90 90 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 4}
xywh {100 100 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 5}
xywh {110 110 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Chorus
- xywh {265 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {265 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial chorusp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp3 {
label Rnd
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial chorusp5 {
label {St.df}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp6 {
label Dpth
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp7 {
label Delay
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp8 {
label Fb
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {305 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {305 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp9 {
label {L/R}
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {340 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {340 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Check_Button {} {
@@ -564,120 +564,121 @@ refresh(eff);}
callback {eff->seteffectpar(4,(int) o->value());}
tooltip {LFO function} xywh {155 50 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 130 textsize 8
} {
- menuitem {} {
+ MenuItem {} {
label SINE
xywh {15 15 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label TRI
xywh {25 25 100 20} labelfont 1 labelsize 10
}
}
}
}
- Function {make_phaser_window()} {} {
- Fl_Window effphaserwindow {
- xywh {197 313 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ Function {make_phaser_window()} {open
+ } {
+ Fl_Window effphaserwindow {selected
+ xywh {458 210 380 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Choice phaserp {
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Phaser 1}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 2}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 3}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 4}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 5}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 6}
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Phaser
- xywh {275 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {275 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial phaserp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp3 {
label Rnd
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial phaserp5 {
label {St.df}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp6 {
label Dpth
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp7 {
label Fb
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp9 {
label {L/R}
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {345 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {345 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Check_Button phaserp10 {
label Substract
callback {eff->seteffectpar(10,(int) o->value());}
- xywh {185 10 70 20} box THIN_UP_BOX down_box DOWN_BOX color 230 labelfont 1 labelsize 10
+ xywh {185 10 74 20} box THIN_UP_BOX down_box DOWN_BOX color 230 labelfont 1 labelsize 10
}
Fl_Choice phaserp4 {
label {LFO type}
callback {eff->seteffectpar(4,(int) o->value());}
tooltip {LFO function} xywh {155 50 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 130 textsize 8
} {
- menuitem {} {
+ MenuItem {} {
label SINE
xywh {15 15 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label TRI
xywh {25 25 100 20} labelfont 1 labelsize 10
}
@@ -685,7 +686,7 @@ refresh(eff);}
Fl_Counter phaserp8 {
label Stages
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {305 55 35 15} type Simple labelfont 1 labelsize 12 minimum 0 maximum 127 step 1
+ xywh {305 55 35 15} type Simple labelfont 1 labelsize 11 minimum 0 maximum 127 step 1
code0 {o->range(1,MAX_PHASER_STAGES);}
}
Fl_Dial phaserp11 {
@@ -705,75 +706,75 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Alienwah 1}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Alienwah 2}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Alienwah 3}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Alienwah 4}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label AlienWah
- xywh {245 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {245 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial awp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp3 {
label Rnd
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial awp5 {
label {St.df}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp6 {
label Dpth
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp7 {
label Fb
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {270 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp9 {
label {L/R}
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {345 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {345 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Choice awp4 {
@@ -781,11 +782,11 @@ refresh(eff);}
callback {eff->seteffectpar(4,(int) o->value());}
tooltip {LFO function} xywh {155 50 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 130 textsize 8
} {
- menuitem {} {
+ MenuItem {} {
label SINE
xywh {15 15 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label TRI
xywh {25 25 100 20} labelfont 1 labelsize 10
}
@@ -793,13 +794,13 @@ refresh(eff);}
Fl_Dial awp10 {
label Phase
callback {eff->seteffectpar(10,(int) o->value());}
- xywh {160 5 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {160 5 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Counter awp8 {
label Delay
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {305 55 35 15} type Simple labelfont 1 labelsize 12 minimum 0 maximum 127 step 1
+ xywh {305 55 35 15} type Simple labelfont 1 labelsize 11 minimum 0 maximum 127 step 1
code0 {o->range(1,MAX_ALIENWAH_DELAY);}
}
}
@@ -813,137 +814,137 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Overdrive 1}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Overdrive 2}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {A. Exciter 1}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {A. Exciter 2}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Guitar Amp}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Quantisize
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Distortion
- xywh {230 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {230 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial distp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial distp1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial distp2 {
label {LRc.}
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial distp3 {
label Drive
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial distp4 {
label Level
callback {eff->seteffectpar(4,(int) o->value());}
- xywh {155 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {155 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial distp7 {
label LPF
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {285 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {285 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial distp8 {
label HPF
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {320 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {320 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Choice distp5 {
label Type
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {190 50 60 20} box UP_BOX down_box BORDER_BOX labelfont 1 labelsize 12 align 2 textsize 10
+ xywh {190 50 60 20} box UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 align 2 textsize 10
} {
- menuitem {} {
+ MenuItem {} {
label Atan
xywh {55 55 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Asym1
xywh {65 65 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Pow
xywh {75 75 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Sine
xywh {85 85 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Qnts
xywh {95 95 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Zigzg
xywh {105 105 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Lmt
xywh {115 115 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label LmtU
xywh {125 125 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label LmtL
xywh {135 135 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label ILmt
xywh {147 147 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Clip
xywh {157 157 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Asym2
xywh {75 75 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Pow2
xywh {85 85 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Sgm
xywh {95 95 100 20} labelfont 1 labelsize 10
}
@@ -951,17 +952,17 @@ refresh(eff);}
Fl_Check_Button distp6 {
label {Neg.}
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {260 55 15 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 2
+ xywh {260 55 15 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 2
}
Fl_Check_Button distp9 {
label {St.}
callback {eff->seteffectpar(9,(int) o->value());}
- tooltip Stereo xywh {355 60 15 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 2
+ tooltip Stereo xywh {355 60 15 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 2
}
Fl_Check_Button distp10 {
label PF
callback {eff->seteffectpar(10,(int) o->value());}
- tooltip {Applies the filters(before or after) the distorsion} xywh {355 44 15 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 1
+ tooltip {Applies the filters(before or after) the distorsion} xywh {355 44 15 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 1
}
}
}
@@ -972,13 +973,13 @@ refresh(eff);}
} {
Fl_Text_Display {} {
label EQ
- xywh {320 10 15 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {320 10 15 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial eqp0 {
label Gain
callback {eff->seteffectpar(0,(int) o->value());
eqgraph->redraw();}
- xywh {10 35 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 35 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Counter bandcounter {
@@ -1006,7 +1007,7 @@ qdial->value(q);
int dbl=eff->geteffectpar(npb+4);
stagescounter->value(dbl);}
- tooltip {Band no.} xywh {240 20 45 15} type Simple labelfont 1 labelsize 12 align 1 minimum 0 maximum 1 step 1 textfont 1 textsize 12
+ tooltip {Band no.} xywh {240 20 45 15} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 1 step 1 textfont 1 textsize 11
code0 {o->bounds(0,MAX_EQ_BANDS-1);}
}
Fl_Group bandgroup {
@@ -1042,7 +1043,7 @@ eqgraph->redraw();}
callback {int np=eqband*5+14;
eff->seteffectpar(np,(int) o->value());
eqgraph->redraw();}
- tooltip {Additional filter stages} xywh {340 60 30 15} type Simple labelfont 1 labelsize 10 minimum 1 maximum 127 step 1 textfont 1 textsize 12
+ tooltip {Additional filter stages} xywh {340 60 30 15} type Simple labelfont 1 labelsize 10 minimum 1 maximum 127 step 1 textfont 1 textsize 11
code0 {o->bounds(0,MAX_FILTER_STAGES-1);}
}
}
@@ -1054,43 +1055,43 @@ bandcounter->do_callback();
eqgraph->redraw();}
tooltip Type xywh {290 20 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 when 6 textsize 10
} {
- menuitem {} {
+ MenuItem {} {
label OFF
xywh {0 0 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Lp1
xywh {10 10 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Hp1
xywh {20 20 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Lp2
xywh {30 30 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Hp2
xywh {40 40 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Bp2
xywh {50 50 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label N2
xywh {60 60 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Pk
xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label LSh
xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label HSh
xywh {80 80 100 20} labelfont 1 labelsize 10
}
@@ -1111,67 +1112,67 @@ eqgraph->redraw();}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label WahWah
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label AutoWah
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Sweep
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label VocalMorph1
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label VocalMorph2
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label DynFilter
- xywh {245 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {245 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial dfp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp1 {
label Pan
callback {eff->seteffectpar(1,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp3 {
label Rnd
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial dfp5 {
label {St.df}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {200 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp6 {
label LfoD
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {235 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Choice dfp4 {
@@ -1179,11 +1180,11 @@ refresh(eff);}
callback {eff->seteffectpar(4,(int) o->value());}
tooltip {LFO function} xywh {155 50 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 130 textsize 8
} {
- menuitem {} {
+ MenuItem {} {
label SINE
xywh {15 15 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label TRI
xywh {25 25 100 20} labelfont 1 labelsize 10
}
@@ -1199,19 +1200,19 @@ refresh(eff);}
Fl_Dial dfp7 {
label {A.S.}
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {275 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {275 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp9 {
label {A.M}
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {305 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {305 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Check_Button dfp8 {
label {A.Inv.}
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {345 55 15 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 2
+ xywh {345 55 15 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 2
}
}
}
@@ -1437,12 +1438,12 @@ effdynamicfilterwindow->hide();//delete (effdynamicfilterwindow);} {}
}
Function {make_null_window()} {} {
Fl_Window effnullwindow {
- xywh {539 150 233 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ xywh {539 150 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Text_Display {} {
label {No Effect}
- xywh {25 35 35 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 labelcolor 43 align 8
+ xywh {25 35 35 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 labelcolor 43 align 8
}
}
}
@@ -1453,64 +1454,64 @@ effdynamicfilterwindow->hide();//delete (effdynamicfilterwindow);} {}
} {
Fl_Text_Display {} {
label {Reverb }
- xywh {115 10 20 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {115 10 20 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Choice revp {
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Cathedral 1}
xywh {10 10 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Cathedral 2}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Cathedral 3}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Hall 1}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Hall 2}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Room 1}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Room 2}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Basement
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Tunnel
xywh {90 90 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echoed 1}
xywh {100 100 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echoed 2}
xywh {110 110 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Very Long 1}
xywh {120 120 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Very Long 2}
xywh {130 130 100 20} labelfont 1 labelsize 10 labelcolor 7
}
@@ -1518,25 +1519,25 @@ refresh(eff);}
Fl_Dial revp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp2 {
label Time
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial revp3 {
label {I.del}
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial revp9 {
label Damp
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 minimum 64 maximum 127 step 1
+ xywh {120 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 minimum 64 maximum 127 step 1
class WidgetPDial
}
}
@@ -1550,65 +1551,65 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Echo 1}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echo 2}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Echo 3}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Simple Echo}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Canyon
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Panning Echo 1}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Panning Echo 2}
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Panning Echo 3}
xywh {90 90 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Feedback Echo}
xywh {100 100 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Echo
- xywh {145 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {145 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial echop0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial echop2 {
label Delay
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial echop5 {
label {Fb.}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
}
@@ -1622,81 +1623,81 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Chorus 1}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Chorus 2}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Chorus 3}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Celeste 1}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Celeste 2}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 1}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 2}
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 3}
xywh {90 90 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 4}
xywh {100 100 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Flange 5}
xywh {110 110 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Chorus
- xywh {120 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {120 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial chorusp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp6 {
label Dpth
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp7 {
label Delay
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {115 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {115 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial chorusp8 {
label Fb
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {150 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {150 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Check_Button {} {
@@ -1709,78 +1710,78 @@ refresh(eff);}
}
Function {make_phaser_window()} {} {
Fl_Window effphaserwindow {
- xywh {171 303 232 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
+ xywh {171 303 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide
class Fl_Group
} {
Fl_Choice phaserp {
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Phaser 1}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 2}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 3}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 4}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 5}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Phaser 6}
xywh {80 80 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Phaser
- xywh {125 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {125 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial phaserp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp5 {
label {St.df}
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp6 {
label Dpth
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {115 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {115 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial phaserp7 {
label Fb
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {150 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {150 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Counter phaserp8 {
label Stages
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {185 55 35 15} type Simple labelfont 1 labelsize 12 minimum 0 maximum 127 step 1
+ xywh {185 55 35 15} type Simple labelfont 1 labelsize 11 minimum 0 maximum 127 step 1
code0 {o->range(1,MAX_PHASER_STAGES);}
}
}
@@ -1794,51 +1795,51 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Alienwah 1}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Alienwah 2}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Alienwah 3}
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Alienwah 4}
xywh {70 70 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label AlienWah
- xywh {100 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {100 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial awp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial awp6 {
label Dpth
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {85 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Counter awp8 {
label Delay
callback {eff->seteffectpar(8,(int) o->value());}
- xywh {125 55 35 15} type Simple labelfont 1 labelsize 12 minimum 0 maximum 127 step 1
+ xywh {125 55 35 15} type Simple labelfont 1 labelsize 11 minimum 0 maximum 127 step 1
code0 {o->range(1,MAX_ALIENWAH_DELAY);}
}
}
@@ -1852,119 +1853,119 @@ refresh(eff);}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {11 15 95 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label {Overdrive 1}
xywh {20 20 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Overdrive 2}
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {A. Exciter 1}
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {A. Exciter 2}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label {Guitar Amp}
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Quantisize
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label Distortion
- xywh {110 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 20 align 8
+ xywh {110 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 8
}
Fl_Dial distp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial distp3 {
label Drive
callback {eff->seteffectpar(3,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 when 4 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 when 4 maximum 127
class WidgetPDial
}
Fl_Dial distp4 {
label Level
callback {eff->seteffectpar(4,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial distp7 {
label LPF
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {190 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {190 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Choice distp5 {
label Type
callback {eff->seteffectpar(5,(int) o->value());}
- xywh {120 50 60 20} box UP_BOX down_box BORDER_BOX labelfont 1 labelsize 12 align 2 textsize 10
+ xywh {120 50 60 20} box UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 align 2 textsize 10
} {
- menuitem {} {
+ MenuItem {} {
label Atan
xywh {55 55 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Asym1
xywh {65 65 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Pow
xywh {75 75 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Sine
xywh {85 85 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Qnts
xywh {95 95 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Zigzg
xywh {105 105 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Lmt
xywh {115 115 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label LmtU
xywh {125 125 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label LmtL
xywh {135 135 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label ILmt
xywh {147 147 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Clip
xywh {157 157 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Asym2
xywh {75 75 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Pow2
xywh {85 85 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Sgm
xywh {95 95 100 20} labelfont 1 labelsize 10
}
@@ -1978,7 +1979,7 @@ refresh(eff);}
} {
Fl_Text_Display {} {
label EQ
- xywh {170 5 15 25} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {170 5 15 25} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Counter bandcounter {
label Band
@@ -2005,7 +2006,7 @@ qdial->value(q);
int dbl=eff->geteffectpar(npb+4);
stagescounter->value(dbl);}
- tooltip {Band no.} xywh {85 15 45 15} type Simple labelfont 1 labelsize 12 align 1 minimum 0 maximum 1 step 1 textfont 1 textsize 12
+ tooltip {Band no.} xywh {85 15 45 15} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 1 step 1 textfont 1 textsize 11
code0 {o->bounds(0,MAX_EQ_BANDS-1);}
}
Fl_Group bandgroup {
@@ -2041,7 +2042,7 @@ eqgraph->redraw();}
callback {int np=eqband*5+14;
eff->seteffectpar(np,(int) o->value());
eqgraph->redraw();}
- tooltip {Additional filter stages} xywh {40 55 30 15} type Simple labelfont 1 labelsize 10 minimum 1 maximum 127 step 1 textfont 1 textsize 12
+ tooltip {Additional filter stages} xywh {40 55 30 15} type Simple labelfont 1 labelsize 10 minimum 1 maximum 127 step 1 textfont 1 textsize 11
code0 {o->bounds(0,MAX_FILTER_STAGES-1);}
}
}
@@ -2053,43 +2054,43 @@ bandcounter->do_callback();
eqgraph->redraw();}
tooltip Type xywh {135 15 40 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 when 6 textsize 10
} {
- menuitem {} {
+ MenuItem {} {
label OFF
xywh {10 10 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Lp1
xywh {20 20 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Hp1
xywh {30 30 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Lp2
xywh {40 40 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Hp2
xywh {50 50 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Bp2
xywh {60 60 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label N2
xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Pk
xywh {90 90 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label LSh
xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label HSh
xywh {90 90 100 20} labelfont 1 labelsize 10
}
@@ -2110,49 +2111,49 @@ eqgraph->redraw();}
label Preset
callback {eff->changepreset((int)o->value());
refresh(eff);}
- xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 labelcolor 0 align 5 textfont 1 textsize 10 textcolor 7
+ xywh {10 15 90 15} down_box BORDER_BOX color 14 selection_color 0 labelfont 1 labelsize 10 align 5 textfont 1 textsize 10 textcolor 7
} {
- menuitem {} {
+ MenuItem {} {
label WahWah
xywh {30 30 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label AutoWah
xywh {40 40 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label Sweep
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label VocalMorph1
xywh {50 50 100 20} labelfont 1 labelsize 10 labelcolor 7
}
- menuitem {} {
+ MenuItem {} {
label VocalMorph2
xywh {60 60 100 20} labelfont 1 labelsize 10 labelcolor 7
}
}
Fl_Text_Display {} {
label DynFilter
- xywh {100 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 26 align 8
+ xywh {100 10 10 20} box NO_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 22 align 8
}
Fl_Dial dfp0 {
label Vol
callback {eff->seteffectpar(0,(int) o->value());}
- xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {10 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp2 {
label Freq
callback {eff->seteffectpar(2,(int) o->value());}
- xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {45 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp6 {
label LfoD
callback {eff->seteffectpar(6,(int) o->value());}
- xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {80 40 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Group {} {open
@@ -2161,13 +2162,13 @@ refresh(eff);}
Fl_Dial dfp7 {
label {A.S.}
callback {eff->seteffectpar(7,(int) o->value());}
- xywh {120 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {120 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
Fl_Dial dfp9 {
label {A.M}
callback {eff->seteffectpar(9,(int) o->value());}
- xywh {150 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 12 maximum 127
+ xywh {150 45 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 maximum 127
class WidgetPDial
}
}
@@ -2299,8 +2300,7 @@ switch(eff->geteffect()){
break;
};
-this->show();} {selected
- }
+this->show();} {}
}
Function {refresh()} {} {
code {refresh(eff);} {}
diff --git a/src/UI/EnvelopeUI.fl b/src/UI/EnvelopeUI.fl
@@ -288,14 +288,14 @@ freeedit->redraw();}
Fl_Check_Button forcedreleasecheck {
label frcR
callback {env->Pforcedrelease=(int)o->value();}
- tooltip {Forced Relase} xywh {410 165 40 15} down_box DOWN_BOX labelsize 11
+ tooltip {Forced Relase} xywh {410 165 40 15} down_box DOWN_BOX labelsize 10
code0 {o->value(env->Pforcedrelease);}
code1 {if (env->Pfreemode==0) o->hide();}
}
Fl_Dial envstretchdial {
label {Str.}
callback {env->Penvstretch=(int)o->value();}
- tooltip {Envelope stretch (on lower notes make the envelope longer)} xywh {380 155 25 25} box ROUND_UP_BOX labelsize 11 align 4 maximum 127 step 1
+ tooltip {Envelope stretch (on lower notes make the envelope longer)} xywh {380 155 25 25} box ROUND_UP_BOX labelsize 10 align 4 maximum 127 step 1
code0 {o->value(env->Penvstretch);}
code1 {if (env->Pfreemode==0) o->hide();}
class WidgetPDial
@@ -308,7 +308,7 @@ freeedit->redraw();}
Fl_Check_Button linearenvelopecheck {
label L
callback {env->Plinearenvelope=(int)o->value();}
- tooltip {Linear Envelope} xywh {410 151 30 15} down_box DOWN_BOX labelsize 11
+ tooltip {Linear Envelope} xywh {410 151 30 15} down_box DOWN_BOX labelsize 10
code0 {o->value(env->Plinearenvelope);}
code1 {if ((env->Pfreemode==0)||(env->Envmode>2)) o->hide();}
}
@@ -317,7 +317,7 @@ freeedit->redraw();}
callback {env->Penvsustain=(int) o->value();
freeedit->redraw();
envfree->redraw();}
- tooltip {Sustain (0 is disabled)} xywh {315 155 40 15} type Simple labelsize 12 align 4 minimum 0 maximum 127 step 1
+ tooltip {Sustain (0 is disabled)} xywh {315 155 40 15} type Simple labelsize 11 align 4 minimum 0 maximum 127 step 1
code0 {o->value(env->Penvsustain);}
code1 {if (env->Pfreemode==0) o->hide();}
code2 {o->maximum(env->Penvpoints-2);}
@@ -341,13 +341,13 @@ envfree->redraw();}
} {
Fl_Group {} {
label {Amplitude Envelope}
- xywh {0 0 205 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17
+ xywh {0 0 205 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 10 align 17
} {
Fl_Dial e1adt {
label {A.dt}
callback {env->PA_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Attack time} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Attack time} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_dt);}
class WidgetPDial
}
@@ -355,7 +355,7 @@ freeedit->redraw();}
label {D.dt}
callback {env->PD_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Decay time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Decay time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PD_dt);}
class WidgetPDial
}
@@ -363,7 +363,7 @@ freeedit->redraw();}
label {R.dt}
callback {env->PR_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Release time} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release time} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_dt);}
class WidgetPDial
}
@@ -371,20 +371,20 @@ freeedit->redraw();}
label {S.val}
callback {env->PS_val=(int)o->value();
freeedit->redraw();}
- tooltip {Sustain value} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Sustain value} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PS_val);}
class WidgetPDial
}
Fl_Check_Button e1forcedrelease {
label frcR
callback {env->Pforcedrelease=(int)o->value();}
- tooltip {Forced Relase} xywh {180 35 20 15} down_box DOWN_BOX labelsize 11 align 6
+ tooltip {Forced Relase} xywh {180 35 20 15} down_box DOWN_BOX labelsize 10 align 6
code0 {o->value(env->Pforcedrelease);}
}
Fl_Dial e1envstretch {
label Stretch
callback {env->Penvstretch=(int)o->value();}
- tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {145 25 25 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {145 25 25 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->Penvstretch);}
class WidgetPDial
}
@@ -396,7 +396,7 @@ freeedit->redraw();}
Fl_Check_Button e1linearenvelope {
label L
callback {env->Plinearenvelope=(int)o->value();}
- tooltip {The evelope is linear} xywh {180 20 15 15} down_box DOWN_BOX labelsize 11 align 4
+ tooltip {The evelope is linear} xywh {180 20 15 15} down_box DOWN_BOX labelsize 10 align 4
code0 {o->value(env->Plinearenvelope);}
}
Fl_Button {} {
@@ -419,13 +419,13 @@ freeedit->redraw();}
} {
Fl_Group {} {
label {Frequency Envelope}
- xywh {0 0 210 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17
+ xywh {0 0 210 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 10 align 17
} {
Fl_Dial e2aval {
label {A.val}
callback {env->PA_val=(int)o->value();
freeedit->redraw();}
- tooltip {Starting value} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Starting value} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_val);}
class WidgetPDial
}
@@ -433,7 +433,7 @@ freeedit->redraw();}
label {A.dt}
callback {env->PA_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Attack time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Attack time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_dt);}
class WidgetPDial
}
@@ -441,7 +441,7 @@ freeedit->redraw();}
label {R.val}
callback {env->PR_val=(int)o->value();
freeedit->redraw();}
- tooltip {Release value} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release value} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_val);}
class WidgetPDial
}
@@ -449,21 +449,21 @@ freeedit->redraw();}
label {R.dt}
callback {env->PR_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Release time} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release time} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_dt);}
class WidgetPDial
}
Fl_Dial e2envstretch {
label Stretch
callback {env->Penvstretch=(int)o->value();}
- tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {145 25 25 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {145 25 25 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->Penvstretch);}
class WidgetPDial
}
Fl_Check_Button e2forcedrelease {
label frcR
callback {env->Pforcedrelease=(int)o->value();}
- tooltip {Forced release} xywh {180 25 15 25} down_box DOWN_BOX labelsize 11 align 6
+ tooltip {Forced release} xywh {180 25 15 25} down_box DOWN_BOX labelsize 10 align 6
code0 {o->value(env->Pforcedrelease);}
}
Fl_Button {} {
@@ -491,13 +491,13 @@ freeedit->redraw();}
} {
Fl_Group {} {
label {Filter Envelope}
- xywh {0 0 275 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17
+ xywh {0 0 275 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 10 align 17
} {
Fl_Dial e3aval {
label {A.val}
callback {env->PA_val=(int)o->value();
freeedit->redraw();}
- tooltip {Starting value} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Starting value} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_val);}
class WidgetPDial
}
@@ -505,7 +505,7 @@ freeedit->redraw();}
label {A.dt}
callback {env->PA_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Attack time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Attack time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_dt);}
class WidgetPDial
}
@@ -513,7 +513,7 @@ freeedit->redraw();}
label {D.val}
callback {env->PD_val=(int)o->value();
freeedit->redraw();}
- tooltip {decay value} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {decay value} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PD_val);}
class WidgetPDial
}
@@ -521,7 +521,7 @@ freeedit->redraw();}
label {D.dt}
callback {env->PD_dt=(int)o->value();
freeedit->redraw();}
- tooltip {decay time} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {decay time} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PD_dt);}
class WidgetPDial
}
@@ -529,7 +529,7 @@ freeedit->redraw();}
label {R.dt}
callback {env->PR_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Release time} xywh {145 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release time} xywh {145 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_dt);}
class WidgetPDial
}
@@ -537,21 +537,21 @@ freeedit->redraw();}
label {R.val}
callback {env->PR_val=(int)o->value();
freeedit->redraw();}
- tooltip {Release value} xywh {180 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release value} xywh {180 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_val);}
class WidgetPDial
}
Fl_Dial e3envstretch {
label Stretch
callback {env->Penvstretch=(int)o->value();}
- tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {215 25 25 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {215 25 25 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->Penvstretch);}
class WidgetPDial
}
Fl_Check_Button e3forcedrelease {
label frcR
callback {env->Pforcedrelease=(int)o->value();}
- tooltip {Forced Relase} xywh {250 30 15 20} down_box DOWN_BOX labelsize 11 align 6
+ tooltip {Forced Relase} xywh {250 30 15 20} down_box DOWN_BOX labelsize 10 align 6
code0 {o->value(env->Pforcedrelease);}
}
Fl_Button {} {
@@ -579,13 +579,13 @@ freeedit->redraw();}
} {
Fl_Group {} {
label {BandWidth Envelope}
- xywh {0 0 210 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17
+ xywh {0 0 210 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 10 align 17
} {
Fl_Dial e4aval {
label {A.val}
callback {env->PA_val=(int)o->value();
freeedit->redraw();}
- tooltip {Starting value} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Starting value} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_val);}
class WidgetPDial
}
@@ -593,7 +593,7 @@ freeedit->redraw();}
label {A.dt}
callback {env->PA_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Attack time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Attack time} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PA_dt);}
class WidgetPDial
}
@@ -601,7 +601,7 @@ freeedit->redraw();}
label {R.val}
callback {env->PR_val=(int)o->value();
freeedit->redraw();}
- tooltip {Release value} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release value} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_val);}
class WidgetPDial
}
@@ -609,21 +609,21 @@ freeedit->redraw();}
label {R.dt}
callback {env->PR_dt=(int)o->value();
freeedit->redraw();}
- tooltip {Release time} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Release time} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->PR_dt);}
class WidgetPDial
}
Fl_Dial e4envstretch {
label Stretch
callback {env->Penvstretch=(int)o->value();}
- tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {145 25 25 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Envelope stretch (on lower notes makes the envelope longer)} xywh {145 25 25 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(env->Penvstretch);}
class WidgetPDial
}
Fl_Check_Button e4forcedrelease {
label frcR
callback {env->Pforcedrelease=(int)o->value();}
- tooltip {Forced release} xywh {180 25 15 25} down_box DOWN_BOX labelsize 11 align 6
+ tooltip {Forced release} xywh {180 25 15 25} down_box DOWN_BOX labelsize 10 align 6
code0 {o->value(env->Pforcedrelease);}
}
Fl_Button {} {
@@ -651,7 +651,7 @@ freeedit->redraw();}
} {
Fl_Group envfreegroup {
label {Amplitude Envelope}
- xywh {0 0 205 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17 resizable
+ xywh {0 0 205 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 10 align 17 resizable
} {
Fl_Box freeeditsmall {
label Envelope
diff --git a/src/UI/FilterUI.fl b/src/UI/FilterUI.fl
@@ -171,7 +171,7 @@ delete (formantparswindow);} {}
} {
Fl_Group filterparamswindow {
label {Filter Parameters}
- xywh {0 0 275 75} box PLASTIC_UP_BOX color 183 labeltype ENGRAVED_LABEL labelsize 11 align 17
+ xywh {0 0 275 75} box PLASTIC_UP_BOX color 183 labeltype ENGRAVED_LABEL labelsize 10 align 17
} {
Fl_Choice analogfiltertypechoice {
label FilterType
@@ -264,7 +264,7 @@ pars->changed=true;}
Fl_Dial cfreqdial {
label {C.Freq}
callback {pars->Pfreq=(int)o->value();}
- tooltip {Center Frequency of the Filter or the base position in the vowel's sequence} xywh {75 25 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Center Frequency of the Filter or the base position in the vowel's sequence} xywh {75 25 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->Pfreq);}
class WidgetPDial
}
@@ -272,27 +272,27 @@ pars->changed=true;}
label Q
callback {pars->Pq=(int)o->value();
formantfiltergraph->redraw();}
- tooltip {Filter resonance or bandwidth} xywh {110 25 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Filter resonance or bandwidth} xywh {110 25 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->Pq);}
class WidgetPDial
}
Fl_Dial freqtrdial {
label {freq.tr.}
callback {pars->Pfreqtrack=(int) o->value();}
- tooltip {Filter frequency tracking (left is negative, middle is 0, and right is positive)} xywh {215 25 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Filter frequency tracking (left is negative, middle is 0, and right is positive)} xywh {215 25 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->Pfreqtrack);}
class WidgetPDial
}
Fl_Dial vsnsadial {
label {V.SnsA.}
callback {if (velsnsamp!=NULL) *velsnsamp=(int)o->value();}
- tooltip {Velocity sensing amount of the Filter} xywh {145 25 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Velocity sensing amount of the Filter} xywh {145 25 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial vsnsdial {
label {V.Sns.}
callback {if (velsns!=NULL) *velsns=(int)o->value();}
- tooltip {Velocity Sensing Function of the Filter} xywh {180 25 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Velocity Sensing Function of the Filter} xywh {180 25 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial gaindial {
@@ -300,7 +300,7 @@ formantfiltergraph->redraw();}
callback {pars->Pgain=(int)o->value();
formantfiltergraph->redraw();
pars->changed=true;}
- tooltip {Filter output gain/damp} xywh {250 35 20 20} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Filter output gain/damp} xywh {250 35 20 20} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->Pgain);}
class WidgetPDial
}
@@ -317,7 +317,7 @@ pars->changed=true;} open
Fl_Button editbutton {
label Edit
callback {formantparswindow->show();}
- xywh {15 40 50 25} box PLASTIC_UP_BOX labelfont 1 labelsize 12
+ xywh {15 40 50 25} box PLASTIC_UP_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label C
@@ -353,7 +353,7 @@ formantfiltergraph->redraw();}
callback {nvowel=(int) o->value();
update_formant_window();
formantfiltergraph->redraw();}
- xywh {545 55 40 20} type Simple labelfont 1 labelsize 10 align 4 minimum 0 maximum 127 step 1 textfont 1 textsize 12
+ xywh {545 55 40 20} type Simple labelfont 1 labelsize 10 align 4 minimum 0 maximum 127 step 1 textfont 1 textsize 11
code0 {o->bounds(0,FF_MAX_VOWELS-1);}
code1 {o->value(nvowel);}
}
@@ -365,7 +365,7 @@ formantfiltergraph->redraw();}
callback {pars->Pvowels[nvowel].formants[nformant].freq=(int) o->value();
formantfiltergraph->redraw();
pars->changed=true;}
- tooltip {Formant frequency} xywh {495 115 25 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Formant frequency} xywh {495 115 25 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial formant_q_dial {
@@ -373,7 +373,7 @@ pars->changed=true;}
callback {pars->Pvowels[nvowel].formants[nformant].q=(int) o->value();
formantfiltergraph->redraw();
pars->changed=true;}
- tooltip {Formant's Q} xywh {525 115 24 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Formant's Q} xywh {525 115 24 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial formant_amp_dial {
@@ -381,7 +381,7 @@ pars->changed=true;}
callback {pars->Pvowels[nvowel].formants[nformant].amp=(int) o->value();
formantfiltergraph->redraw();
pars->changed=true;}
- tooltip {Formant amplitude} xywh {555 115 24 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Formant amplitude} xywh {555 115 24 25} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
}
@@ -394,7 +394,7 @@ pars->changed=true;}
callback {pars->Psequencesize=(int) o->value();
update_formant_window();
pars->changed=true;}
- xywh {595 62 55 20} type Simple labelfont 1 labelsize 10 align 5 minimum 0 maximum 127 step 1 textfont 1 textsize 12
+ xywh {595 62 55 20} type Simple labelfont 1 labelsize 10 align 5 minimum 0 maximum 127 step 1 textfont 1 textsize 11
code0 {o->bounds(1,FF_MAX_SEQUENCE-1);}
code1 {o->value(pars->Psequencesize);}
}
@@ -411,7 +411,7 @@ pars->changed=true;}
label Vowel
callback {pars->Psequence[nseqpos].nvowel=(int) o->value();
pars->changed=true;}
- xywh {640 97 40 15} type Simple labelsize 10 align 1 minimum 0 maximum 127 step 1 textsize 11
+ xywh {640 97 40 15} type Simple labelsize 10 align 1 minimum 0 maximum 127 step 1 textsize 10
code0 {o->bounds(0,FF_MAX_VOWELS-1);}
}
Fl_Check_Button {} {
@@ -425,7 +425,7 @@ pars->changed=true;}
label Strch
callback {pars->Psequencestretch=(int) o->value();
pars->changed=true;}
- tooltip {Sequence Stretch} xywh {595 130 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Sequence Stretch} xywh {595 130 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Psequencestretch);}
class WidgetPDial
}
@@ -436,7 +436,7 @@ pars->changed=true;}
update_formant_window();
pars->changed=true;
formantfiltergraph->redraw();}
- xywh {485 15 65 20} type Simple labelfont 1 labelsize 11 align 5 minimum 0 maximum 127 step 1
+ xywh {485 15 65 20} type Simple labelfont 1 labelsize 10 align 5 minimum 0 maximum 127 step 1
code0 {o->bounds(1,FF_MAX_FORMANTS);}
code1 {o->value(pars->Pnumformants);}
}
@@ -444,7 +444,7 @@ formantfiltergraph->redraw();}
label {Fr.Sl.}
callback {pars->Pformantslowness=(int) o->value();
pars->changed=true;}
- tooltip {Formant's Slowness (Morphing)} xywh {565 15 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 align 1 maximum 127 step 1
+ tooltip {Formant's Slowness (Morphing)} xywh {565 15 25 25} box ROUND_UP_BOX labelfont 1 labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Pformantslowness);}
class WidgetPDial
}
@@ -484,7 +484,7 @@ formantfiltergraph->redraw();}
label {Vw.Cl.}
callback {pars->Pvowelclearness=(int) o->value();
pars->changed=true;}
- tooltip {Vowel "clearness" (how the mixed vowels are avoided)} xywh {600 15 25 25} box ROUND_UP_BOX labelfont 1 labelsize 11 align 1 maximum 127 step 1
+ tooltip {Vowel "clearness" (how the mixed vowels are avoided)} xywh {600 15 25 25} box ROUND_UP_BOX labelfont 1 labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Pvowelclearness);}
class WidgetPDial
}
@@ -496,12 +496,12 @@ pars->changed=true;}
Fl_Button {} {
label C
callback {presetsui->copy(pars,nvowel);}
- xywh {635 25 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {635 25 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(pars,this,nvowel);}
- xywh {665 25 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {665 25 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Box {} {
label Vowel
diff --git a/src/UI/LFOUI.fl b/src/UI/LFOUI.fl
@@ -53,30 +53,30 @@ hide();
} {
Fl_Group lfoparamswindow {
label LFO
- xywh {0 0 230 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 11 align 17
+ xywh {0 0 230 70} box PLASTIC_UP_BOX color 223 labeltype ENGRAVED_LABEL labelsize 10 align 17
} {
Fl_Dial freq {
label {Freq.}
callback {pars->Pfreq=o->value();}
- tooltip {LFO Frequency} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 11 step 1e-05
+ tooltip {LFO Frequency} xywh {5 20 30 30} box ROUND_UP_BOX labelsize 10 step 1e-05
class WidgetPDial
}
Fl_Dial intensity {
label Depth
callback {pars->Pintensity=(int)o->value();}
- tooltip {LFO Amount} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {LFO Amount} xywh {40 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial delay {
label Delay
callback {pars->Pdelay=(int)o->value();}
- tooltip {LFO delay} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {LFO delay} xywh {110 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial startphase {
label Start
callback {pars->Pstartphase=(int)o->value();}
- tooltip {LFO Startphase (leftmost is Random)} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {LFO Startphase (leftmost is Random)} xywh {75 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
class WidgetPDial
}
Fl_Dial randomness {
@@ -122,7 +122,7 @@ hide();
Fl_Check_Button continous {
label {C.}
callback {pars->Pcontinous=(int)o->value();}
- tooltip {Continous LFO} xywh {165 35 15 15} down_box DOWN_BOX labelsize 11 align 2
+ tooltip {Continous LFO} xywh {165 35 15 15} down_box DOWN_BOX labelsize 10 align 2
}
Fl_Dial freqrand {
label {F.R.}
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0106
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -365,7 +365,7 @@ if ((int) o->value()==0) panellistitemgroup->deactivate();
};
o->redraw();}
- private xywh {5 0 45 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 24
+ private xywh {5 0 45 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 24
code0 {char tmp[10];snprintf(tmp,10,"%d",npart+1);o->label(strdup(tmp));}
code1 {o->value(master->part[npart]->Penabled);}
}
@@ -413,8 +413,10 @@ panellistitemgroup->redraw();} {}
decl {BankUI *bankui;} {}
}
-class MasterUI {} {
- Function {make_window()} {} {
+class MasterUI {open
+} {
+ Function {make_window()} {open
+ } {
Fl_Window masterwindow {
label zynaddsubfx
callback {\#ifdef VSTAUDIOOUT
@@ -424,32 +426,32 @@ if (fl_ask("Exit and leave the unsaved data?")) {
config.save();
*exitprogram=1;
};
-\#endif} selected
- xywh {353 127 390 465} type Double hide
+\#endif}
+ xywh {31 206 390 465} type Double visible
} {
Fl_Menu_Bar mastermenu {
xywh {-5 0 690 25}
} {
- submenu {} {
+ Submenu {} {
label {&File}
xywh {0 0 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {&New (erase all)...}
callback {do_new_master();}
xywh {20 20 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {&Open Parameters...}
callback {do_load_master();}
xywh {20 20 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {&Save All Parameters...}
callback {do_save_master();}
xywh {10 10 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {&Load Scale Settings...}
callback {char *filename;
filename=fl_file_chooser("Open:","({*.xsz})",NULL,0);
@@ -471,7 +473,7 @@ if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not a
else if (result<0) fl_alert("Error: Could not load the file.");}
xywh {35 35 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {Save Sc&ale Settings ..}
callback {char *filename;
int result=0;
@@ -498,32 +500,32 @@ if (result<0) fl_alert("Error: Could not save the file.");
updatepanel();}
xywh {25 25 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {Show Scale Settings...}
callback {microtonalui->show();}
xywh {0 0 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {&Settings...}
callback {configui->show();}
xywh {25 25 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {&Copyright...}
callback {aboutwindow->show();}
xywh {15 15 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {E&xit}
callback {masterwindow->do_callback();}
xywh {10 10 100 20}
}
}
- submenu {} {
+ Submenu {} {
label {&Instrument}
xywh {10 10 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {&Clear Instrument...}
callback {if (fl_ask("Clear instrument's parameters ?")){
// int npart=(int)npartcounter->value()-1;
@@ -537,7 +539,7 @@ updatepanel();}
updatepanel();}
xywh {35 35 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {&Open Instrument...}
callback {const char *filename;
filename=fl_file_chooser("Load:","({*.xiz})",NULL,0);
@@ -563,7 +565,7 @@ if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not an
else if (result<0) fl_alert("Error: Could not load the file.");}
xywh {30 30 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {&Save Instrument ...}
callback {char *filename;
@@ -588,22 +590,22 @@ if (result<0) fl_alert("Error: Could not save the file.");
updatepanel();}
xywh {20 20 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {Show Instrument &Bank...}
callback {bankui->show();}
xywh {0 0 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {&Virtual Keyboard...}
callback {virkeyboard->show();}
xywh {10 10 100 20}
}
}
- submenu recordmenu {
+ Submenu recordmenu {
label {&Record}
xywh {0 0 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {&Choose WAV file...}
callback {char *filename;
recordbutton->deactivate();
@@ -626,21 +628,21 @@ if (result!=0) fl_alert("Error: Could not save the file.");}
xywh {0 0 100 20}
}
}
- submenu {} {
+ Submenu {} {
label {&Sequencer}
xywh {0 0 100 20} hide
} {
- menuitem {} {
+ MenuItem {} {
label {Show &Sequencer...}
callback {sequi->show();}
xywh {0 0 100 20}
}
}
- submenu {} {
+ Submenu {} {
label Misc
xywh {10 10 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {Switch User Interface Mode}
callback {if (fl_ask("Switch the User Interface to Beginner mode ?")){
masterwindow->hide();
@@ -655,14 +657,14 @@ if (result!=0) fl_alert("Error: Could not save the file.");}
Fl_Dial mastervolumedial {
label {M.Vol}
callback {master->setPvolume((int) o->value());}
- tooltip {Master Volume} xywh {5 30 30 30} box ROUND_UP_BOX labelfont 1 labelsize 12 align 130 maximum 127 step 1
+ tooltip {Master Volume} xywh {5 30 30 30} box ROUND_UP_BOX labelfont 1 labelsize 11 align 130 maximum 127 step 1
code0 {o->value(master->Pvolume);}
class WidgetPDial
}
Fl_Counter masterkeyshiftcounter {
label {Master KeyShift}
callback {master->setPkeyshift((int) o->value()+64);}
- xywh {45 31 90 20} labelsize 12 minimum -64 maximum 64 step 1
+ xywh {45 31 90 20} labelsize 11 minimum -64 maximum 64 step 1
code0 {o->lstep(12);}
code1 {o->value(master->Pkeyshift-64);}
}
@@ -689,14 +691,14 @@ pthread_mutex_unlock(&master->mutex);}
} {
Fl_Group {} {
label {System Effects} open
- xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 18 align 25
+ xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 15 align 25
} {
Fl_Counter syseffnocounter {
label {Sys.Effect No.}
callback {nsyseff=(int) o->value()-1;
sysefftype->value(master->sysefx[nsyseff]->geteffect());
syseffectui->refresh(master->sysefx[nsyseff]);}
- xywh {5 120 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
+ xywh {5 120 80 20} type Simple labelfont 1 labelsize 10 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
code0 {o->bounds(1,NUM_SYS_EFX);}
code1 {o->value(nsyseff+1);}
}
@@ -706,44 +708,44 @@ syseffectui->refresh(master->sysefx[nsyseff]);}
master->sysefx[nsyseff]->changeeffect((int) o->value());
pthread_mutex_unlock(&master->mutex);
syseffectui->refresh(master->sysefx[nsyseff]);}
- xywh {315 125 70 15} down_box BORDER_BOX labelsize 11
+ xywh {315 125 70 15} down_box BORDER_BOX labelsize 10
code0 {o->value(master->sysefx[nsyseff]->geteffect());}
} {
- menuitem {} {
+ MenuItem {} {
label {No Effect}
- xywh {10 10 100 20} labelfont 1 labelsize 11
+ xywh {10 10 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Reverb
- xywh {20 20 100 20} labelfont 1 labelsize 11
+ xywh {20 20 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Echo
- xywh {30 30 100 20} labelfont 1 labelsize 11
+ xywh {30 30 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Chorus
- xywh {40 40 100 20} labelfont 1 labelsize 11
+ xywh {40 40 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Phaser
- xywh {50 50 100 20} labelfont 1 labelsize 11
+ xywh {50 50 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label AlienWah
- xywh {60 60 100 20} labelfont 1 labelsize 11
+ xywh {60 60 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Distortion
- xywh {70 70 100 20} labelfont 1 labelsize 11
+ xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label EQ
- xywh {80 80 100 20} labelfont 1 labelsize 11
+ xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label DynFilter
- xywh {90 90 100 20} labelfont 1 labelsize 11
+ xywh {90 90 100 20} labelfont 1 labelsize 10
}
}
Fl_Group syseffectuigroup {
@@ -758,24 +760,24 @@ syseffectui->refresh(master->sysefx[nsyseff]);}
Fl_Button {} {
label {Send to...}
callback {syseffsendwindow->show();}
- xywh {95 120 75 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {95 120 75 20} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label C
callback {presetsui->copy(master->sysefx[nsyseff]);}
- xywh {215 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {215 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {pthread_mutex_lock(&master->mutex);
presetsui->paste(master->sysefx[nsyseff],syseffectui);
pthread_mutex_unlock(&master->mutex);}
- xywh {245 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {245 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
Fl_Group {} {
label {Insertion Effects}
- xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 18 align 25 hide
+ xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 15 align 25 hide
} {
Fl_Counter inseffnocounter {
label {Ins.Effect No.}
@@ -793,7 +795,7 @@ if (master->Pinsparts[ninseff]!=-1) {
inseffectui->deactivate();
inseffectuigroup->deactivate();
};}
- xywh {5 120 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
+ xywh {5 120 80 20} type Simple labelfont 1 labelsize 10 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
code0 {o->bounds(1,NUM_INS_EFX);}
code1 {o->value(ninseff+1);}
}
@@ -804,45 +806,45 @@ master->insefx[ninseff]->changeeffect((int) o->value());
pthread_mutex_unlock(&master->mutex);
inseffectui->refresh(master->insefx[ninseff]);
inseffectui->show();}
- xywh {315 125 70 15} down_box BORDER_BOX labelsize 11
+ xywh {315 125 70 15} down_box BORDER_BOX labelsize 10
code0 {o->value(master->insefx[ninseff]->geteffect());}
code1 {if (master->Pinsparts[ninseff]== -1) o->deactivate();}
} {
- menuitem {} {
+ MenuItem {} {
label {No Effect}
- xywh {25 25 100 20} labelfont 1 labelsize 11
+ xywh {25 25 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Reverb
- xywh {35 35 100 20} labelfont 1 labelsize 11
+ xywh {35 35 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Echo
- xywh {45 45 100 20} labelfont 1 labelsize 11
+ xywh {45 45 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Chorus
- xywh {55 55 100 20} labelfont 1 labelsize 11
+ xywh {55 55 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Phaser
- xywh {60 60 100 20} labelfont 1 labelsize 11
+ xywh {60 60 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label AlienWah
- xywh {70 70 100 20} labelfont 1 labelsize 11
+ xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Distortion
- xywh {80 80 100 20} labelfont 1 labelsize 11
+ xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label EQ
- xywh {90 90 100 20} labelfont 1 labelsize 11
+ xywh {90 90 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label DynFilter
- xywh {100 100 100 20} labelfont 1 labelsize 11
+ xywh {100 100 100 20} labelfont 1 labelsize 10
}
}
Fl_Group inseffectuigroup {
@@ -876,14 +878,14 @@ master->insefx[ninseff]->cleanup();} open
Fl_Button {} {
label C
callback {presetsui->copy(master->insefx[ninseff]);}
- xywh {215 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {215 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {pthread_mutex_lock(&master->mutex);
presetsui->paste(master->insefx[ninseff],inseffectui);
pthread_mutex_unlock(&master->mutex);}
- xywh {245 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {245 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
}
@@ -997,8 +999,8 @@ panelwindow->show();}
xywh {629 278 330 210} type Double hide
} {
Fl_Box {} {
- label {Copyright (c) 2002-2005 Nasca O. Paul}
- xywh {5 35 320 25} labeltype EMBOSSED_LABEL labelsize 18 align 16
+ label {Copyright (c) 2002-2005 Nasca O. Paul and others}
+ xywh {0 35 330 25} labeltype EMBOSSED_LABEL labelsize 15 align 16
}
Fl_Box {} {
label {This is free software; you may redistribute it and/or modify it under the terms of the
@@ -1007,16 +1009,16 @@ version 2 of the GNU General Public License as published by the Free Software Fu
ABSOLUTELY NO WARRANTY.
See the version 2 of the
GNU General Public License for details.}
- xywh {0 60 325 115} labelfont 1 labelsize 12 align 144
+ xywh {0 60 325 115} labelfont 1 labelsize 11 align 144
}
Fl_Button {} {
label {Close this window}
callback {aboutwindow->hide();}
- xywh {80 180 180 25} box THIN_UP_BOX labelsize 12
+ xywh {80 180 180 25} box THIN_UP_BOX labelsize 11
}
Fl_Box {} {
label ZynAddSubFX
- xywh {5 5 325 30} labeltype EMBOSSED_LABEL labelfont 1 labelsize 24 labelcolor 0 align 16
+ xywh {5 5 325 30} labeltype EMBOSSED_LABEL labelfont 1 labelsize 20 align 16
}
}
Fl_Window syseffsendwindow {
@@ -1040,7 +1042,7 @@ GNU General Public License for details.}
}
Fl_Window panelwindow {
label {ZynAddSubFX Panel}
- xywh {72 60 630 635} type Double hide
+ xywh {89 59 630 635} type Double hide
} {
Fl_Scroll {} {open
xywh {0 5 570 310} type HORIZONTAL box THIN_UP_BOX
@@ -1062,12 +1064,12 @@ GNU General Public License for details.}
label Close
callback {panelwindow->hide();
updatepanel();}
- xywh {575 605 50 25} box THIN_UP_BOX
+ xywh {575 605 50 25} box THIN_UP_BOX labelsize 13
}
Fl_Button {} {
label Refresh
callback {updatepanel();}
- xywh {575 570 55 25} box THIN_UP_BOX
+ xywh {575 570 55 25} box THIN_UP_BOX labelsize 13
}
}
Fl_Window simplemasterwindow {
@@ -1080,51 +1082,51 @@ if (fl_ask("Exit and leave the unsaved data?")) {
*exitprogram=1;
};
\#endif}
- xywh {135 383 600 335} type Double hide
+ xywh {400 405 600 335} type Double hide
} {
Fl_Menu_Bar {} {
xywh {0 0 690 25}
} {
- submenu {} {
+ Submenu {} {
label {&File}
xywh {10 10 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {&New (erase all)...}
callback {do_new_master();}
xywh {30 30 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {&Open Parameters...}
callback {do_load_master();}
xywh {30 30 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {&Save All Parameters...}
callback {do_save_master();}
xywh {20 20 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {&Settings...}
callback {configui->show();}
xywh {35 35 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {&Copyright...}
callback {aboutwindow->show();}
xywh {25 25 100 20} divider
}
- menuitem {} {
+ MenuItem {} {
label {E&xit}
callback {masterwindow->do_callback();}
xywh {20 20 100 20}
}
}
- submenu {} {
+ Submenu {} {
label {&Instrument}
xywh {20 20 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {&Open Instrument...}
callback {const char *filename;
filename=fl_file_chooser("Load:","({*.xiz})",NULL,0);
@@ -1149,17 +1151,17 @@ if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not an
else if (result<0) fl_alert("Error: Could not load the file.");}
xywh {40 40 100 20}
}
- menuitem {} {
+ MenuItem {} {
label {Show Instrument &Bank...}
callback {bankui->show();}
xywh {10 10 100 20} divider
}
}
- submenu {} {
+ Submenu {} {
label Misc
xywh {0 0 100 20}
} {
- menuitem {} {
+ MenuItem {} {
label {Switch User Interface Mode}
callback {if (fl_ask("Switch the User Interface to Advanced mode ?")){
simplemasterwindow->hide();
@@ -1181,7 +1183,7 @@ if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not an
bankui->cbwig->do_callback();
};
bankui->show();}
- xywh {130 72 205 18} box PLASTIC_THIN_DOWN_BOX down_box FLAT_BOX color 247 labelfont 1 labelsize 12 align 208
+ xywh {130 72 205 18} box PLASTIC_THIN_DOWN_BOX down_box FLAT_BOX color 247 labelfont 1 labelsize 11 align 208
}
Fl_Slider partpanning {
label Pan
@@ -1194,7 +1196,7 @@ bankui->show();}
callback {virkeys->relaseallkeys(0);
master->part[npart]->Prcvchn=(int) o->value();
virkeys->midich=(int) o->value();} open
- tooltip {receive from Midi channel} xywh {140 157 65 18} down_box BORDER_BOX labelsize 11 align 130 textfont 1
+ tooltip {receive from Midi channel} xywh {140 157 65 18} down_box BORDER_BOX labelsize 10 align 130 textfont 1
code0 {char nrstr[10]; for(int i=0;i<NUM_MIDI_CHANNELS;i++){sprintf(nrstr,"Ch%d",i+1);if (i!=9) o->add(nrstr); else o->add("Dr10");};}
code1 {o->value(master->part[npart]->Prcvchn);}
} {}
@@ -1256,7 +1258,7 @@ simplemaxkcounter->do_callback();}
Fl_Counter simplepartkeyshiftcounter {
label KeyShift
callback {master->part[npart]->Pkeyshift=(int) o->value()+64;}
- xywh {240 120 90 20} labelsize 12 minimum -64 maximum 64 step 1
+ xywh {240 120 90 20} labelsize 11 minimum -64 maximum 64 step 1
code0 {o->lstep(12);}
code1 {o->value(master->part[npart]->Pkeyshift-64);}
}
@@ -1286,7 +1288,7 @@ if ((int) o->value()==0) simplelistitemgroup->deactivate();
};
o->redraw();}
- private xywh {250 40 85 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 24
+ private xywh {250 40 85 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 24
code0 {//char tmp[10];snprintf(tmp,10,"%d",npart+1);o->label(strdup(tmp));}
code1 {o->value(master->part[npart]->Penabled);}
}
@@ -1304,7 +1306,7 @@ o->redraw();}
} {
Fl_Group {} {
label {System Effects}
- xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 align 18
+ xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 labelsize 12 align 18
} {
Fl_Counter simplesyseffnocounter {
label {Sys.Effect No.}
@@ -1312,7 +1314,7 @@ o->redraw();}
simplesysefftype->value(master->sysefx[nsyseff]->geteffect());
simplesyseffectui->refresh(master->sysefx[nsyseff]);
simplerefresh();}
- xywh {350 75 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
+ xywh {350 75 80 20} type Simple labelfont 1 labelsize 10 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
code0 {o->bounds(1,NUM_SYS_EFX);}
code1 {o->value(nsyseff+1);}
}
@@ -1322,44 +1324,44 @@ simplerefresh();}
master->sysefx[nsyseff]->changeeffect((int) o->value());
pthread_mutex_unlock(&master->mutex);
simplesyseffectui->refresh(master->sysefx[nsyseff]);}
- xywh {515 80 70 15} down_box BORDER_BOX labelsize 11 align 5
+ xywh {515 80 70 15} down_box BORDER_BOX labelsize 10 align 5
code0 {o->value(master->sysefx[nsyseff]->geteffect());}
} {
- menuitem {} {
+ MenuItem {} {
label {No Effect}
- xywh {20 20 100 20} labelfont 1 labelsize 11
+ xywh {20 20 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Reverb
- xywh {30 30 100 20} labelfont 1 labelsize 11
+ xywh {30 30 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Echo
- xywh {40 40 100 20} labelfont 1 labelsize 11
+ xywh {40 40 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Chorus
- xywh {50 50 100 20} labelfont 1 labelsize 11
+ xywh {50 50 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Phaser
- xywh {60 60 100 20} labelfont 1 labelsize 11
+ xywh {60 60 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label AlienWah
- xywh {70 70 100 20} labelfont 1 labelsize 11
+ xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Distortion
- xywh {80 80 100 20} labelfont 1 labelsize 11
+ xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label EQ
- xywh {90 90 100 20} labelfont 1 labelsize 11
+ xywh {90 90 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label DynFilter
- xywh {100 100 100 20} labelfont 1 labelsize 11
+ xywh {100 100 100 20} labelfont 1 labelsize 10
}
}
Fl_Group simplesyseffectuigroup {
@@ -1374,19 +1376,19 @@ simplesyseffectui->refresh(master->sysefx[nsyseff]);}
Fl_Button {} {
label {Send to...}
callback {syseffsendwindow->show();}
- xywh {435 75 75 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {435 75 75 20} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label P
callback {pthread_mutex_lock(&master->mutex);
presetsui->paste(master->sysefx[nsyseff],simplesyseffectui);
pthread_mutex_unlock(&master->mutex);}
- xywh {560 65 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {560 65 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
Fl_Group {} {
label {Insertion Effects}
- xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 align 18 hide
+ xywh {345 55 245 155} box ENGRAVED_FRAME labelfont 1 labelsize 12 align 18 hide
} {
Fl_Counter simpleinseffnocounter {
label {Ins.Effect No.}
@@ -1404,7 +1406,7 @@ if (master->Pinsparts[ninseff]!=-1) {
simpleinseffectui->deactivate();
simpleinseffectuigroup->deactivate();
};}
- xywh {350 75 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
+ xywh {350 75 80 20} type Simple labelfont 1 labelsize 10 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
code0 {o->bounds(1,NUM_INS_EFX);}
code1 {o->value(ninseff+1);}
}
@@ -1415,45 +1417,45 @@ master->insefx[ninseff]->changeeffect((int) o->value());
pthread_mutex_unlock(&master->mutex);
simpleinseffectui->refresh(master->insefx[ninseff]);
simpleinseffectui->show();}
- xywh {515 80 70 15} down_box BORDER_BOX labelsize 11 align 5
+ xywh {515 80 70 15} down_box BORDER_BOX labelsize 10 align 5
code0 {o->value(master->insefx[ninseff]->geteffect());}
code1 {if (master->Pinsparts[ninseff]== -1) o->deactivate();}
} {
- menuitem {} {
+ MenuItem {} {
label {No Effect}
- xywh {35 35 100 20} labelfont 1 labelsize 11
+ xywh {35 35 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Reverb
- xywh {45 45 100 20} labelfont 1 labelsize 11
+ xywh {45 45 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Echo
- xywh {55 55 100 20} labelfont 1 labelsize 11
+ xywh {55 55 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Chorus
- xywh {65 65 100 20} labelfont 1 labelsize 11
+ xywh {65 65 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Phaser
- xywh {70 70 100 20} labelfont 1 labelsize 11
+ xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label AlienWah
- xywh {80 80 100 20} labelfont 1 labelsize 11
+ xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Distortion
- xywh {90 90 100 20} labelfont 1 labelsize 11
+ xywh {90 90 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label EQ
- xywh {100 100 100 20} labelfont 1 labelsize 11
+ xywh {100 100 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label DynFilter
- xywh {110 110 100 20} labelfont 1 labelsize 11
+ xywh {110 110 100 20} labelfont 1 labelsize 10
}
}
Fl_Group simpleinseffectuigroup {
@@ -1489,7 +1491,7 @@ master->insefx[ninseff]->cleanup();} open
callback {pthread_mutex_lock(&master->mutex);
presetsui->paste(master->insefx[ninseff],simpleinseffectui);
pthread_mutex_unlock(&master->mutex);}
- xywh {560 65 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {560 65 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
}
@@ -1507,14 +1509,14 @@ pthread_mutex_unlock(&master->mutex);}
Fl_Dial simplemastervolumedial {
label {Master Volume}
callback {master->setPvolume((int) o->value());}
- tooltip {Master Volume} xywh {10 35 40 40} box ROUND_UP_BOX labelfont 1 labelsize 12 align 130 maximum 127 step 1
+ tooltip {Master Volume} xywh {10 35 40 40} box ROUND_UP_BOX labelfont 1 labelsize 11 align 130 maximum 127 step 1
code0 {o->value(master->Pvolume);}
class WidgetPDial
}
Fl_Counter simplemasterkeyshiftcounter {
label {Master KeyShift}
callback {master->setPkeyshift((int) o->value()+64);}
- xywh {25 110 90 20} labelsize 12 minimum -64 maximum 64 step 1
+ xywh {25 110 90 20} labelsize 11 minimum -64 maximum 64 step 1
code0 {o->lstep(12);}
code1 {o->value(master->Pkeyshift-64);}
}
@@ -1524,18 +1526,18 @@ pthread_mutex_unlock(&master->mutex);}
pthread_mutex_lock(&master->mutex);
master->shutup=1;
pthread_mutex_unlock(&master->mutex);}
- xywh {5 149 115 31} box PLASTIC_UP_BOX color 231 labelfont 1 labelsize 12
+ xywh {5 149 115 31} box PLASTIC_UP_BOX color 231 labelfont 1 labelsize 11
}
Fl_Button {} {
label Reset
callback {simpleglobalfinedetuneslider->value(64.0);
simpleglobalfinedetuneslider->do_callback();}
- tooltip {Master fine detune reset} xywh {70 32 50 10} box THIN_UP_BOX labelfont 1 labelsize 12 align 128
+ tooltip {Master fine detune reset} xywh {70 32 50 10} box THIN_UP_BOX labelfont 1 labelsize 11 align 128
}
Fl_Dial simpleglobalfinedetuneslider {
label {Fine Detune}
callback {master->microtonal.Pglobalfinedetune=(int) o->value();}
- tooltip {global fine detune} xywh {80 45 30 30} box ROUND_UP_BOX labelsize 12 align 130 maximum 127 step 1 value 64
+ tooltip {global fine detune} xywh {80 45 30 30} box ROUND_UP_BOX labelsize 11 align 130 maximum 127 step 1 value 64
code0 {o->value(master->microtonal.Pglobalfinedetune);}
class WidgetPDial
}
@@ -1555,7 +1557,7 @@ virkeys->midich=master->part[npart]->Prcvchn;}
callback {virkeys->relaseallkeys(0);
virkeys->midioct=(int) o->value();
virkeys->take_focus();}
- tooltip {Midi Octave} xywh {5 195 55 20} type Simple labelsize 12 align 8 when 6 minimum 0 maximum 5 step 1 textfont 1 textsize 12
+ tooltip {Midi Octave} xywh {5 195 55 20} type Simple labelsize 11 align 8 when 6 minimum 0 maximum 5 step 1 textfont 1 textsize 11
code0 {o->value(virkeys->midioct);}
}
}
@@ -1566,37 +1568,37 @@ virkeys->take_focus();}
} {
Fl_Box {} {
label {Welcome to ZynAddSubFX}
- xywh {5 5 425 40} labeltype SHADOW_LABEL labelfont 1 labelsize 33
+ xywh {5 5 425 40} labeltype SHADOW_LABEL labelfont 1 labelsize 26
}
Fl_Box {} {
label {Please choose the interface mode:}
- xywh {10 50 265 25} labelfont 1 labelsize 16
+ xywh {10 50 265 25} labelfont 1 labelsize 13
}
Fl_Button {} {
label Advanced
callback {config.cfg.UserInterfaceMode=1;
masterwindow->show();
selectuiwindow->hide();}
- xywh {10 165 100 35} box PLASTIC_UP_BOX color 229 labelfont 1 labelsize 20
+ xywh {10 165 100 35} box PLASTIC_UP_BOX color 229 labelfont 1 labelsize 16
}
Fl_Box {} {
label {.. if you have used ZynAddSubFX before, or you like to have full controll to all parameters.}
- xywh {110 165 310 35} labelfont 1 labelsize 13 align 144
+ xywh {110 165 310 35} labelfont 1 labelsize 11 align 144
}
Fl_Button {} {
label Beginner
callback {simplemasterwindow->show();
selectuiwindow->hide();
config.cfg.UserInterfaceMode=2;}
- xywh {10 80 100 65} box PLASTIC_UP_BOX color 238 labelfont 1 labelsize 20
+ xywh {10 80 100 65} box PLASTIC_UP_BOX color 238 labelfont 1 labelsize 16
}
Fl_Box {} {
label {..if you are a beginner, you prefer using presets or you prefer to use simpler user interfaces. Most functionality of ZynAddSubFX will be hidden in this mode to make simple the learning/using it.}
- xywh {110 75 320 75} labelfont 1 labelsize 13 align 144
+ xywh {110 75 320 75} labelfont 1 labelsize 11 align 144
}
Fl_Box {} {
label {You can switch the interface modes anytime you want.}
- xywh {30 215 360 25} box BORDER_BOX color 51 labelfont 1 labelsize 13 align 144
+ xywh {30 215 360 25} box BORDER_BOX color 51 labelfont 1 labelsize 11 align 144
}
}
}
@@ -1610,12 +1612,14 @@ config.cfg.UserInterfaceMode=2;}
panellistitem[npart]->refresh();
};} {}
}
- Function {setfilelabel(const char *filename)} {} {
+ Function {setfilelabel(const char *filename)} {open
+ } {
code {if (filename!=NULL) snprintf(&masterwindowlabel[0],100,"%s - ZynAddSubFX",fl_filename_name(filename));
- else snprintf(&masterwindowlabel[0],100,"%s","ZynAddSubFX (c)2002-2005 Nasca O. Paul");
+ else snprintf(&masterwindowlabel[0],100,"%s","ZynAddSubFX (c)2002-2006 Nasca Paul and others");
masterwindowlabel[99]='\\0';
masterwindow->label(&masterwindowlabel[0]);
-simplemasterwindow->label(&masterwindowlabel[0]);} {}
+simplemasterwindow->label(&masterwindowlabel[0]);} {selected
+ }
}
Function {MasterUI(Master *master_,int *exitprogram_)} {} {
code {master=master_;
diff --git a/src/UI/MicrotonalUI.fl b/src/UI/MicrotonalUI.fl
@@ -38,13 +38,13 @@ class MicrotonalUI {} {
callback {microtonal->Pinvertupdown=(int) o->value();
if (microtonal->Pinvertupdown==0) centerinvertcounter->deactivate();
else centerinvertcounter->activate();}
- tooltip {Turn upside-down the note frequencies} xywh {254 13 55 30} down_box DOWN_BOX labelfont 1 labelsize 12 align 148
+ tooltip {Turn upside-down the note frequencies} xywh {254 13 55 30} down_box DOWN_BOX labelfont 1 labelsize 11 align 148
code0 {o->value(microtonal->Pinvertupdown);}
}
Fl_Counter centerinvertcounter {
label Center
callback {microtonal->Pinvertupdowncenter=(int) o->value();}
- xywh {319 13 80 20} labelfont 1 labelsize 12 align 130 minimum 0 maximum 127 step 1 textfont 1
+ xywh {319 13 80 20} labelfont 1 labelsize 11 align 130 minimum 0 maximum 127 step 1 textfont 1
code0 {o->lstep(microtonal->getoctavesize());}
code1 {o->value(microtonal->Pinvertupdowncenter);}
code2 {if (microtonal->Pinvertupdown==0) o->deactivate();}
@@ -57,7 +57,7 @@ if (microtonal->Pinvertupdown==0) centerinvertcounter->deactivate();
Fl_Button applybutton {
label Retune
callback {apply();}
- tooltip {Retune the synth accorging to the inputs from "Tunnings" and "Keyboard Mappings"} xywh {8 413 107 28} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 18
+ tooltip {Retune the synth accorging to the inputs from "Tunnings" and "Keyboard Mappings"} xywh {8 413 107 28} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13
}
Fl_Value_Output octavesizeoutput {
label {nts./oct.}
@@ -68,24 +68,24 @@ if (microtonal->Pinvertupdown==0) centerinvertcounter->deactivate();
Fl_Input nameinput {
label {Name:}
callback {snprintf((char *)microtonal->Pname,MICROTONAL_MAX_NAME_LEN,"%s",o->value());}
- xywh {8 64 285 25} labelfont 1 labelsize 12 align 5
+ xywh {8 64 285 25} labelfont 1 labelsize 11 align 5
code0 {o->insert((char *)microtonal->Pname);}
}
Fl_Input tuningsinput {
label {Tunings:}
- xywh {8 144 182 264} type Multiline labelfont 1 labelsize 12 align 5 when 2
+ xywh {8 144 182 264} type Multiline labelfont 1 labelsize 11 align 5 when 2
code0 {updateTuningsInput();}
}
Fl_Input commentinput {
label {Comment:}
callback {snprintf((char *)microtonal->Pcomment,MICROTONAL_MAX_NAME_LEN,"%s",o->value());}
- xywh {8 104 391 25} labelfont 1 labelsize 12 align 5
+ xywh {8 104 391 25} labelfont 1 labelsize 11 align 5
code0 {o->insert((char *)microtonal->Pcomment);}
}
Fl_Counter {} {
label Shift
callback {microtonal->Pscaleshift=(int) o->value()+64;}
- xywh {313 69 70 20} type Simple labelsize 12 align 1 minimum -63 maximum 64 step 1 textfont 1
+ xywh {313 69 70 20} type Simple labelsize 11 align 1 minimum -63 maximum 64 step 1 textfont 1
code0 {o->value(microtonal->Pscaleshift-64);}
}
Fl_Button {} {
@@ -111,28 +111,28 @@ if (result==0) {
}
Fl_Group keymappinggroup {
label {Keyboard Mapping} open
- xywh {193 144 206 264} box ENGRAVED_BOX labelfont 1 labelsize 12
+ xywh {193 144 206 264} box ENGRAVED_BOX labelfont 1 labelsize 11
} {
Fl_Input mappinginput {
- xywh {250 147 146 258} type Multiline labelfont 1 labelsize 12 align 5 when 2
+ xywh {250 147 146 258} type Multiline labelfont 1 labelsize 11 align 5 when 2
code0 {updateMappingInput();}
}
Fl_Counter firstnotecounter {
label {First note}
callback {microtonal->Pfirstkey=(int) o->value();}
- tooltip {First MIDI note number} xywh {199 195 42 18} type Simple labelsize 10 align 5 minimum 0 maximum 127 step 1 textfont 1 textsize 12
+ tooltip {First MIDI note number} xywh {199 195 42 18} type Simple labelsize 10 align 5 minimum 0 maximum 127 step 1 textfont 1 textsize 11
code0 {o->value(microtonal->Pfirstkey);}
}
Fl_Counter lastnotecounter {
label {Last note}
callback {microtonal->Plastkey=(int) o->value();}
- tooltip {Last MIDI note number} xywh {199 225 42 18} type Simple labelsize 10 align 5 minimum 0 maximum 127 step 1 value 127 textfont 1 textsize 12
+ tooltip {Last MIDI note number} xywh {199 225 42 18} type Simple labelsize 10 align 5 minimum 0 maximum 127 step 1 value 127 textfont 1 textsize 11
code0 {o->value(microtonal->Plastkey);}
}
Fl_Counter middlenotecounter {
label {Midle note}
callback {microtonal->Pmiddlenote=(int) o->value();}
- tooltip {Midle note (where scale degree 0 is mapped to)} xywh {199 267 42 18} type Simple labelsize 10 align 5 minimum 0 maximum 127 step 1 value 60 textfont 1 textsize 12
+ tooltip {Midle note (where scale degree 0 is mapped to)} xywh {199 267 42 18} type Simple labelsize 10 align 5 minimum 0 maximum 127 step 1 value 60 textfont 1 textsize 11
code0 {o->value(microtonal->Pmiddlenote);}
}
Fl_Value_Output mapsizeoutput {
@@ -188,14 +188,14 @@ if (microtonal->getnotefreq(microtonal->PAnote,0)<0.0) o->textcolor(FL_RED);
else o->textcolor(FL_BLACK);
o->redraw();}
- tooltip {The "A" note (the reference note for which freq. ("A" freq) is given)} xywh {173 17 65 20} labelfont 1 labelsize 10 align 129 minimum 0 maximum 127 step 1 value 69 textfont 1 textsize 11
+ tooltip {The "A" note (the reference note for which freq. ("A" freq) is given)} xywh {173 17 65 20} labelfont 1 labelsize 10 align 129 minimum 0 maximum 127 step 1 value 69 textfont 1 textsize 10
code0 {o->lstep(12);}
code1 {o->value(microtonal->PAnote);}
}
Fl_Value_Input afreqinput {
label {"A" Freq.}
callback {microtonal->PAfreq=o->value();}
- tooltip {The freq. of "A" note (default=440.0)} xywh {118 17 45 20} labelfont 1 labelsize 10 align 1 minimum 1 maximum 20000 step 0.001 value 440 textfont 1 textsize 11
+ tooltip {The freq. of "A" note (default=440.0)} xywh {118 17 45 20} labelfont 1 labelsize 10 align 1 minimum 1 maximum 20000 step 0.001 value 440 textfont 1 textsize 10
code0 {o->value(microtonal->PAfreq);}
}
}
@@ -209,7 +209,7 @@ o->redraw();}
callback {microtonal->Penabled=(int) o->value();
if (microtonal->Penabled==0) microtonalgroup->deactivate();
else microtonalgroup->activate();}
- xywh {3 3 102 45} box PLASTIC_UP_BOX down_box DOWN_BOX labelfont 1 labelsize 12 align 148
+ xywh {3 3 102 45} box PLASTIC_UP_BOX down_box DOWN_BOX labelfont 1 labelsize 11 align 148
code0 {o->value(microtonal->Penabled);}
}
}
diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl
@@ -451,63 +451,63 @@ redrawoscil();
if ((oscil->Pcurrentbasefunc==0)||(oscil->Pcurrentbasefunc==127)) basefuncmodulation->deactivate();
else basefuncmodulation->activate();}
- xywh {370 285 90 15} down_box BORDER_BOX labelsize 10 align 5 textsize 12
+ xywh {370 285 90 15} down_box BORDER_BOX labelsize 10 align 5 textsize 11
} {
menuitem {} {
label Sine
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Triangle
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Pulse
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Saw
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Power
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Gauss
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Diode
- xywh {60 60 100 20} labelfont 1 labelsize 12
+ xywh {60 60 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label AbsSine
- xywh {70 70 100 20} labelfont 1 labelsize 12
+ xywh {70 70 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label PulseSine
- xywh {80 80 100 20} labelfont 1 labelsize 12
+ xywh {80 80 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label StrchSine
- xywh {90 90 100 20} labelfont 1 labelsize 12
+ xywh {90 90 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Chirp
- xywh {100 100 100 20} labelfont 1 labelsize 12
+ xywh {100 100 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label AbsStrSine
- xywh {102 102 100 20} labelfont 1 labelsize 12
+ xywh {102 102 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Chebyshev
- xywh {112 112 100 20} labelfont 1 labelsize 12
+ xywh {112 112 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Sqr
- xywh {122 122 100 20} labelfont 1 labelsize 12
+ xywh {122 122 100 20} labelfont 1 labelsize 11
}
}
Fl_Box {} {
@@ -521,7 +521,7 @@ if ((oscil->Pcurrentbasefunc==0)||(oscil->Pcurrentbasefunc==127)) basefuncmodula
} {}
Fl_Value_Output bfparval {
label {Par.}
- xywh {490 285 25 15} labelsize 13 minimum -63 maximum 63 step 1
+ xywh {490 285 25 15} labelsize 12 minimum -63 maximum 63 step 1
}
Fl_Group basefuncmodulation {
xywh {550 276 169 25} box ENGRAVED_BOX
@@ -580,27 +580,27 @@ redrawoscil();}
basefuncdisplaygroup->redraw();
redrawoscil();}
- xywh {70 280 65 20} down_box BORDER_BOX labelsize 12 textsize 12
+ xywh {70 280 65 20} down_box BORDER_BOX labelsize 11 textsize 11
} {
menuitem {} {
label Linear
- xywh {0 0 100 20} labelfont 1 labelsize 12
+ xywh {0 0 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-40dB}
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-60dB}
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-80dB}
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-100dB}
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
}
Fl_Button {} {
@@ -637,7 +637,7 @@ pthread_mutex_unlock(&master->mutex);
basefuncdisplaygroup->redraw();
redrawoscil();}
- tooltip {Use this Oscillator as base function} xywh {5 313 85 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ tooltip {Use this Oscillator as base function} xywh {5 313 85 20} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label Close
@@ -669,7 +669,7 @@ pthread_mutex_lock(&master->mutex);
pthread_mutex_unlock(&master->mutex);
redrawoscil();}
- xywh {670 505 55 15} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {670 505 55 15} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Group {} {
xywh {135 308 150 30} box ENGRAVED_BOX
@@ -750,7 +750,7 @@ redrawoscil();}
class WidgetPDial
}
Fl_Value_Output wsparval {
- xywh {228 316 25 15} labelsize 13 minimum -63 maximum 63 step 1
+ xywh {228 316 25 15} labelsize 12 minimum -63 maximum 63 step 1
}
}
Fl_Light_Button autoclearbutton {
@@ -1026,17 +1026,17 @@ pthread_mutex_unlock(&master->mutex);
redrawoscil();
refresh();}
- xywh {670 525 55 15} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {670 525 55 15} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Button {} {
label C
callback {presetsui->copy(oscil);}
- xywh {670 545 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {670 545 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(oscil,this);}
- xywh {700 545 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {700 545 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Scroll _this_has_to_be_the_last {
xywh {5 340 660 250} type HORIZONTAL box ENGRAVED_BOX
diff --git a/src/UI/PADnoteUI.fl b/src/UI/PADnoteUI.fl
@@ -244,7 +244,7 @@ make_window();} {}
callback {pars->Php.base.par1=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {20 75 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {20 75 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.base.par1);}
class WidgetPDial
}
@@ -274,7 +274,7 @@ cbwidget->do_callback();}
callback {pars->Php.freqmult=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {55 75 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {55 75 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.freqmult);}
class WidgetPDial
}
@@ -283,7 +283,7 @@ cbwidget->do_callback();}
callback {pars->Php.modulator.par1=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {15 115 20 20} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {15 115 20 20} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.modulator.par1);}
class WidgetPDial
}
@@ -292,7 +292,7 @@ cbwidget->do_callback();}
callback {pars->Php.modulator.freq=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {40 115 20 20} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {40 115 20 20} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.modulator.freq);}
class WidgetPDial
}
@@ -354,7 +354,7 @@ cbwidget->do_callback();}
callback {pars->Php.amp.par1=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {15 235 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {15 235 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.amp.par1);}
class WidgetPDial
}
@@ -363,7 +363,7 @@ cbwidget->do_callback();}
callback {pars->Php.amp.par2=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {55 235 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {55 235 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.amp.par2);}
class WidgetPDial
}
@@ -401,7 +401,7 @@ cbwidget->do_callback();}
callback {pars->Php.width=(int) o->value();
hprofile->redraw();
cbwidget->do_callback();}
- xywh {65 115 20 20} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ xywh {65 115 20 20} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->Php.width);}
class WidgetPDial
}
@@ -415,7 +415,7 @@ cbwidget->do_callback();}
label Change
callback {if (oscui!=NULL) delete (oscui);
oscui=new OscilEditor(pars->oscilgen,osc,cbwidget,applybutton,master);}
- xywh {375 270 60 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {375 270 60 20} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Box cbwidget {
label {Harmonic Content}
@@ -435,7 +435,7 @@ resui->setcbwidget(cbwidget,applybutton);}
label BandWidth
callback {bwcents->value(pars->setPbandwidth((int) o->value()));
cbwidget->do_callback();}
- xywh {15 295 35 35} box ROUND_UP_BOX labelsize 11 maximum 1000 step 1
+ xywh {15 295 35 35} box ROUND_UP_BOX labelsize 10 maximum 1000 step 1
code0 {o->value(pars->Pbandwidth);}
code1 {if (pars->Pmode!=0) o->deactivate();}
class WidgetPDial
@@ -454,36 +454,36 @@ cbwidget->do_callback();}
callback {pars->Phrpos.type=o->value();
overtonepos->redraw();
cbwidget->do_callback();}
- xywh {325 310 80 20} down_box BORDER_BOX labelsize 10 align 5 textsize 12
+ xywh {325 310 80 20} down_box BORDER_BOX labelsize 10 align 5 textsize 11
code0 {o->value(pars->Phrpos.type);}
} {
menuitem {} {
label Harmonic
- xywh {70 70 100 20} labelfont 1 labelsize 12
+ xywh {70 70 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label ShiftU
- xywh {80 80 100 20} labelfont 1 labelsize 12
+ xywh {80 80 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label ShiftL
- xywh {90 90 100 20} labelfont 1 labelsize 12
+ xywh {90 90 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label PowerU
- xywh {90 90 100 20} labelfont 1 labelsize 12
+ xywh {90 90 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label PowerL
- xywh {100 100 100 20} labelfont 1 labelsize 12
+ xywh {100 100 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Sine
- xywh {110 110 100 20} labelfont 1 labelsize 12
+ xywh {110 110 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Power
- xywh {120 120 100 20} labelfont 1 labelsize 12
+ xywh {120 120 100 20} labelfont 1 labelsize 11
}
}
Fl_Dial hrpospar1 {
@@ -491,7 +491,7 @@ cbwidget->do_callback();}
callback {pars->Phrpos.par1=(int) o->value();
overtonepos->redraw();
cbwidget->do_callback();}
- xywh {425 310 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 255 step 1
+ xywh {425 310 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 255 step 1
code0 {o->value(pars->Phrpos.par1);}
class WidgetPDial
}
@@ -500,7 +500,7 @@ cbwidget->do_callback();}
callback {pars->Phrpos.par2=(int) o->value();
overtonepos->redraw();
cbwidget->do_callback();}
- xywh {460 310 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 255 step 1
+ xywh {460 310 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 255 step 1
code0 {o->value(pars->Phrpos.par2);}
class WidgetPDial
}
@@ -509,7 +509,7 @@ cbwidget->do_callback();}
callback {pars->Phrpos.par3=(int) o->value();
overtonepos->redraw();
cbwidget->do_callback();}
- xywh {495 310 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 255 step 1
+ xywh {495 310 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 255 step 1
code0 {o->value(pars->Phrpos.par3);}
class WidgetPDial
}
@@ -518,41 +518,41 @@ cbwidget->do_callback();}
label {Bandwidth Scale}
callback {pars->Pbwscale=(int) o->value();
cbwidget->do_callback();}
- xywh {120 305 80 20} down_box BORDER_BOX labelsize 10 align 5 textsize 12
+ xywh {120 305 80 20} down_box BORDER_BOX labelsize 10 align 5 textsize 11
code0 {o->value(pars->Pbwscale);}
code1 {if (pars->Pmode!=0) o->deactivate();}
} {
menuitem {} {
label Normal
- xywh {95 95 100 20} labelfont 1 labelsize 12
+ xywh {95 95 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label EqualHz
- xywh {105 105 100 20} labelfont 1 labelsize 12
+ xywh {105 105 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Quater
- xywh {115 115 100 20} labelfont 1 labelsize 12
+ xywh {115 115 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Half
- xywh {125 125 100 20} labelfont 1 labelsize 12
+ xywh {125 125 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {75%}
- xywh {135 135 100 20} labelfont 1 labelsize 12
+ xywh {135 135 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {150%}
- xywh {145 145 100 20} labelfont 1 labelsize 12
+ xywh {145 145 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Double
- xywh {145 145 100 20} labelfont 1 labelsize 12
+ xywh {145 145 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {Inv.Half}
- xywh {155 155 100 20} labelfont 1 labelsize 12
+ xywh {155 155 100 20} labelfont 1 labelsize 11
}
}
Fl_Group overtonepos {
@@ -564,119 +564,119 @@ cbwidget->do_callback();}
label {Sample Size}
callback {pars->Pquality.samplesize=(int) o->value();
cbwidget->do_callback();}
- xywh {375 190 115 20} down_box BORDER_BOX labelsize 10 align 5 textsize 12
+ xywh {375 190 115 20} down_box BORDER_BOX labelsize 10 align 5 textsize 11
code0 {o->value(pars->Pquality.samplesize);}
} {
menuitem {} {
label {16k (Tiny)}
- xywh {155 155 100 20} labelfont 1 labelsize 12
+ xywh {155 155 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 32k
- xywh {165 165 100 20} labelfont 1 labelsize 12
+ xywh {165 165 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {64k (Small)}
- xywh {175 175 100 20} labelfont 1 labelsize 12
+ xywh {175 175 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 128k
- xywh {185 185 100 20} labelfont 1 labelsize 12
+ xywh {185 185 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {256k (Normal)}
- xywh {205 205 100 20} labelfont 1 labelsize 12
+ xywh {205 205 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 512k
- xywh {200 200 100 20} labelfont 1 labelsize 12
+ xywh {200 200 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {1M (Big)}
- xywh {205 205 100 20} labelfont 1 labelsize 12
+ xywh {205 205 100 20} labelfont 1 labelsize 11
}
}
Fl_Choice qsmpoct {
label {smp/oct}
callback {pars->Pquality.smpoct=(int) o->value();
cbwidget->do_callback();}
- xywh {430 155 45 20} down_box BORDER_BOX labelsize 12 align 5 textsize 12
+ xywh {430 155 45 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11
code0 {o->value(pars->Pquality.smpoct);}
} {
menuitem {} {
label {0.5}
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 1
- xywh {0 0 100 20} labelfont 1 labelsize 12
+ xywh {0 0 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 2
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 3
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 4
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 6
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 12
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
}
Fl_Choice qoct {
label {no.oct}
callback {pars->Pquality.oct=(int) o->value();
cbwidget->do_callback();}
- xywh {480 155 45 20} down_box BORDER_BOX labelsize 12 align 5 textsize 12
+ xywh {480 155 45 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11
code0 {o->value(pars->Pquality.oct);}
} {
menuitem {} {
label 1
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 2
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 3
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 4
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 5
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 6
- xywh {60 60 100 20} labelfont 1 labelsize 12
+ xywh {60 60 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 7
- xywh {70 70 100 20} labelfont 1 labelsize 12
+ xywh {70 70 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label 8
- xywh {80 80 100 20} labelfont 1 labelsize 12
+ xywh {80 80 100 20} labelfont 1 labelsize 11
}
}
Fl_Choice qbasenote {
label base
callback {pars->Pquality.basenote=(int) o->value();
cbwidget->do_callback();}
- xywh {375 155 50 20} down_box BORDER_BOX labelsize 12 align 5 textsize 12
+ xywh {375 155 50 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11
code0 {o->value(pars->Pquality.basenote);}
} {
menuitem {} {
@@ -747,20 +747,20 @@ if (pars->Pmode==0){
};
cbwidget->do_callback();}
- xywh {220 305 90 20} down_box BORDER_BOX labelfont 1 labelsize 10 labelcolor 0 align 5 textsize 12
+ xywh {220 305 90 20} down_box BORDER_BOX labelfont 1 labelsize 10 labelcolor 0 align 5 textsize 11
code0 {o->value(pars->Pmode);}
} {
menuitem {} {
label Bandwidth
- xywh {105 105 100 20} labelfont 1 labelsize 12
+ xywh {105 105 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label Discrete
- xywh {125 125 100 20} labelfont 1 labelsize 12 labelcolor 0
+ xywh {125 125 100 20} labelfont 1 labelsize 11 labelcolor 0
}
menuitem {} {
label Continous
- xywh {115 115 100 20} labelfont 1 labelsize 12 labelcolor 0
+ xywh {115 115 100 20} labelfont 1 labelsize 11 labelcolor 0
}
}
}
@@ -770,7 +770,7 @@ cbwidget->do_callback();}
} {
Fl_Group {} {
label FREQUENCY
- xywh {5 275 525 115} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {5 275 525 115} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Group freqenv {
label {PADSynth - Frequency Envelope} open
@@ -784,7 +784,7 @@ cbwidget->do_callback();}
if (k<0) k+=16;
pars->PCoarseDetune = k*1024+
pars->PCoarseDetune%1024;}
- tooltip Octave xywh {470 295 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 12
+ tooltip Octave xywh {470 295 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 11
code0 {int k=pars->PCoarseDetune/1024;}
code1 {if (k>=8) k-=16;}
code2 {o->value(k);}
@@ -795,7 +795,7 @@ pars->PCoarseDetune = k*1024+
if (k<0) k+=1024;
pars->PCoarseDetune = k+
(pars->PCoarseDetune/1024)*1024;}
- tooltip {Coarse Detune} xywh {455 365 60 20} labelsize 10 align 5 minimum -64 maximum 63 step 1 textfont 1 textsize 12
+ tooltip {Coarse Detune} xywh {455 365 60 20} labelsize 10 align 5 minimum -64 maximum 63 step 1 textfont 1 textsize 11
code0 {int k=pars->PCoarseDetune%1024;}
code1 {if (k>=512) k-=1024;}
code2 {o->value(k);}
@@ -833,7 +833,7 @@ detunevalueoutput->do_callback();} open
pars->Pfixedfreq=x;
if (x==0) fixedfreqetdial->deactivate();
else fixedfreqetdial->activate();}
- tooltip {set the base frequency to 440Hz} xywh {365 295 50 15} down_box DOWN_BOX labelfont 1 labelsize 11
+ tooltip {set the base frequency to 440Hz} xywh {365 295 50 15} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->Pfixedfreq);}
}
Fl_Dial fixedfreqetdial {
@@ -847,52 +847,52 @@ if (x==0) fixedfreqetdial->deactivate();
}
Fl_Group {} {
label AMPLITUDE
- xywh {5 25 240 250} box THIN_UP_FRAME labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {5 25 240 250} box THIN_UP_FRAME labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Value_Slider volume {
label Vol
callback {pars->PVolume=(int)o->value();}
- tooltip Volume xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip Volume xywh {10 50 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PVolume);}
}
Fl_Value_Slider vsns {
label {V.Sns}
callback {pars->PAmpVelocityScaleFunction=(int) o->value();}
- tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 70 160 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 70 160 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PAmpVelocityScaleFunction);}
}
Fl_Dial pan {
label Pan
callback {pars->PPanning=(int) o->value();}
- tooltip {Panning (leftmost is Random)} xywh {210 45 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Panning (leftmost is Random)} xywh {210 45 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->PPanning);}
class WidgetPDial
}
Fl_Dial pstr {
label {P.Str.}
callback {pars->PPunchStrength=(int) o->value();}
- tooltip {Punch Strength} xywh {125 247 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Strength} xywh {125 247 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->PPunchStrength);}
class WidgetPDial
}
Fl_Dial pt {
label {P.t.}
callback {pars->PPunchTime=(int) o->value();}
- tooltip {Punch Time (duration)} xywh {155 247 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Time (duration)} xywh {155 247 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->PPunchTime);}
class WidgetPDial
}
Fl_Dial pstc {
label {P.Stc.}
callback {pars->PPunchStretch=(int) o->value();}
- tooltip {Punch Stretch} xywh {185 247 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Stretch} xywh {185 247 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->PPunchStretch);}
class WidgetPDial
}
Fl_Dial pvel {
label {P.Vel.}
callback {pars->PPunchVelocitySensing=(int) o->value();}
- tooltip {Punch Velocity Sensing} xywh {215 247 25 25} box ROUND_UP_BOX labelsize 11 align 1 maximum 127 step 1
+ tooltip {Punch Velocity Sensing} xywh {215 247 25 25} box ROUND_UP_BOX labelsize 10 align 1 maximum 127 step 1
code0 {o->value(pars->PPunchVelocitySensing);}
class WidgetPDial
}
@@ -918,7 +918,7 @@ hprofile->redraw();}
}
Fl_Group {} {
label FILTER
- xywh {245 25 285 250} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {245 25 285 250} box THIN_UP_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
} {
Fl_Group filterenv {
label {PADSynth - Filter Envelope} open
@@ -953,23 +953,23 @@ if (resui!=NULL) {
resui->applybutton->color(FL_GRAY);
resui->applybutton->redraw();
};}
- xywh {45 405 185 40} box THIN_UP_BOX labelfont 1 labelsize 23
+ xywh {45 405 185 40} box THIN_UP_BOX labelfont 1 labelsize 16
code0 {o->color(FL_RED);}
}
Fl_Button {} {
label Close
callback {padnotewindow->hide();}
- xywh {320 405 175 40} box THIN_UP_BOX labelsize 20
+ xywh {320 405 175 40} box THIN_UP_BOX labelsize 17
}
Fl_Button {} {
label C
callback {presetsui->copy(pars);}
- xywh {240 430 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {240 430 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(pars,this);}
- xywh {270 430 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {270 430 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
}
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0104
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -130,20 +130,20 @@ maxkcounter->do_callback();}
Fl_Button adeditbutton {
label edit
callback {partui->showparameters(n,0);}
- xywh {420 0 40 15} box THIN_UP_BOX labelsize 12
+ xywh {420 0 40 15} box THIN_UP_BOX labelsize 11
code0 {if (part->kit[n].Padenabled==0) o->deactivate();}
code1 {if (n==0) o->hide();}
}
Fl_Button subeditbutton {
label edit
callback {partui->showparameters(n,1);}
- xywh {490 0 40 15} box THIN_UP_BOX labelsize 12
+ xywh {490 0 40 15} box THIN_UP_BOX labelsize 11
code0 {if (part->kit[n].Psubenabled==0) o->deactivate();}
code1 {if (n==0) o->hide();}
}
Fl_Check_Button mutedcheck {
callback {part->kit[n].Pmuted=(int)o->value();}
- private xywh {60 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 4
+ private xywh {60 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 4
code0 {o->value(part->kit[n].Pmuted);}
}
Fl_Counter maxkcounter {
@@ -155,14 +155,14 @@ maxkcounter->do_callback();}
label {Bass Drum}
callback {const char *tmp=fl_input("Kit item name:",(const char *)part->kit[n].Pname);
if (tmp!=NULL) snprintf((char *)part->kit[n].Pname,PART_MAX_NAME_LEN,"%s",tmp);}
- xywh {90 0 130 15} box THIN_DOWN_BOX down_box FLAT_BOX labelfont 1 labelsize 11 align 20
+ xywh {90 0 130 15} box THIN_DOWN_BOX down_box FLAT_BOX labelfont 1 labelsize 10 align 20
code0 {o->label((char *)part->kit[n].Pname);}
}
Fl_Check_Button adcheck {
callback {part->kit[n].Padenabled=(int)o->value();
if (part->kit[n].Padenabled!=0) adeditbutton->activate();
else adeditbutton->deactivate();}
- private xywh {400 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 4
+ private xywh {400 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 4
code0 {o->value(part->kit[n].Padenabled);}
code1 {if (n==0) o->hide();}
}
@@ -170,7 +170,7 @@ if (part->kit[n].Padenabled!=0) adeditbutton->activate();
callback {part->kit[n].Psubenabled=(int)o->value();
if (part->kit[n].Psubenabled!=0) subeditbutton->activate();
else subeditbutton->deactivate();}
- private xywh {470 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 4
+ private xywh {470 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 4
code0 {o->value(part->kit[n].Psubenabled);}
code1 {if (n==0) o->hide();}
}
@@ -184,7 +184,7 @@ if (part->kit[n].Psubenabled!=0) subeditbutton->activate();
Fl_Button padeditbutton {
label edit
callback {partui->showparameters(n,2);}
- xywh {560 0 40 15} box THIN_UP_BOX labelsize 12
+ xywh {560 0 40 15} box THIN_UP_BOX labelsize 11
code0 {if (part->kit[n].Ppadenabled==0) o->deactivate();}
code1 {if (n==0) o->hide();}
}
@@ -192,7 +192,7 @@ if (part->kit[n].Psubenabled!=0) subeditbutton->activate();
callback {part->kit[n].Ppadenabled=(int)o->value();
if (part->kit[n].Ppadenabled!=0) padeditbutton->activate();
else padeditbutton->deactivate();}
- private xywh {540 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 12 align 4
+ private xywh {540 0 20 15} down_box DOWN_BOX labelfont 1 labelsize 11 align 4
code0 {o->value(part->kit[n].Ppadenabled);}
code1 {if (n==0) o->hide();}
}
@@ -211,7 +211,7 @@ else partkititemgroup->activate();
o->redraw();
partui->showparameters(n,-1);//use to delete the ui, if it is not to item 0
} else o->value(1);}
- private xywh {30 0 20 15} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 4
+ private xywh {30 0 20 15} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 4
code0 {snprintf(label,10,"%d",n+1);o->label(strdup(label));}
code1 {o->value(part->kit[n].Penabled);}
code2 {if (n==0) o->deactivate();}
@@ -274,13 +274,13 @@ end();} {}
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
- class Fl_Group
+ private xywh {424 178 385 180} type Double
+ class Fl_Group visible
} {
Fl_Group partgroupui {
xywh {0 0 385 180}
@@ -289,14 +289,14 @@ class PartUI {: {public Fl_Group,PartUI_}
Fl_Dial {} {
label Pan
callback {part->setPpanning((int) o->value());}
- xywh {50 40 25 25} box ROUND_UP_BOX labelsize 12 maximum 127 step 1
+ xywh {50 40 25 25} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
code0 {o->value(part->Ppanning);}
class WidgetPDial
}
Fl_Counter {} {
label KeyShift
callback {part->Pkeyshift=(int) o->value()+64;}
- xywh {195 45 90 20} labelsize 12 align 1 minimum -64 maximum 64 step 1
+ xywh {195 45 90 20} labelsize 11 align 1 minimum -64 maximum 64 step 1
code0 {o->lstep(12);}
code1 {o->value(part->Pkeyshift-64);}
}
@@ -318,8 +318,8 @@ if (event==FL_RIGHT_MOUSE){
} else {
if (event==FL_LEFT_MOUSE) bankui->show();
else instrumenteditwindow->show();
-};} selected
- tooltip {left mousebutton - to choose/save/.. from/to bank or right mousebutton to change the name or middle button to change the instrument information} xywh {195 5 185 20} box THIN_DOWN_BOX down_box FLAT_BOX labelfont 1 labelsize 12 align 84
+};}
+ tooltip {left mousebutton - to choose/save/.. from/to bank or right mousebutton to change the name or middle button to change the instrument information} xywh {195 5 185 20} box THIN_DOWN_BOX down_box FLAT_BOX labelfont 1 labelsize 11 align 84
code0 {o->label((char *)part->Pname);}
}
Fl_Box {} {
@@ -329,7 +329,7 @@ if (event==FL_RIGHT_MOUSE){
Fl_Check_Button {} {
label NoteOn
callback {part->Pnoteon=(int) o->value();}
- tooltip {set if the part receives NoteOn messages} xywh {0 155 65 20} down_box DOWN_BOX labelfont 1 labelsize 12
+ tooltip {set if the part receives NoteOn messages} xywh {10 155 65 20} down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(part->Pnoteon);}
}
Fl_Counter minkcounter {
@@ -352,7 +352,7 @@ if (part->Pminkey>part->Pmaxkey) o->textcolor(FL_RED);
Fl_Dial {} {
label Volume
callback {part->setPvolume((int) o->value());}
- tooltip {Part Volume} xywh {10 35 30 30} box ROUND_UP_BOX labelsize 12 maximum 127 step 1
+ tooltip {Part Volume} xywh {10 35 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
code0 {o->value(part->Pvolume);}
class WidgetPDial
}
@@ -373,24 +373,18 @@ if (part->Pminkey>part->Pmaxkey) o->textcolor(FL_RED);
Fl_Button {} {
label Controllers
callback {ctlwindow->show();}
- xywh {295 90 85 30} box PLASTIC_UP_BOX labelfont 1 labelsize 12
- }
- Fl_Check_Button {} {
- label Poly
- callback {part->Ppolymode=(int) o->value();}
- tooltip {Part mode (mono/poly)} xywh {65 155 45 20} down_box DOWN_BOX labelfont 1 labelsize 12
- code0 {o->value(part->Ppolymode);}
+ xywh {295 90 85 30} box PLASTIC_UP_BOX labelfont 1 labelsize 11
}
Fl_Check_Button {} {
label Portamento
- callback {part->ctl.portamento.portamento=(int) o->value();}
- tooltip {Enable/Disable the portamento} xywh {115 155 85 20} down_box DOWN_BOX labelfont 1 labelsize 12
+ callback {part->ctl.portamento.portamento=(int) o->value();} selected
+ tooltip {Enable/Disable the portamento} xywh {95 155 88 20} down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(part->ctl.portamento.portamento);}
}
Fl_Button {} {
label {Edit instrument}
callback {instrumenteditwindow->show();}
- xywh {15 105 130 30} box PLASTIC_UP_BOX color 230 labelfont 1 labelsize 17
+ xywh {15 90 130 30} box PLASTIC_UP_BOX color 230 labelfont 1 labelsize 13
}
Fl_Button {} {
label m
@@ -426,7 +420,28 @@ maxkcounter->do_callback();}
callback {int val=0;
val=atoi(o->text());
part->setkeylimit(val);} open
- tooltip {Key Limit} xywh {210 155 50 20} down_box BORDER_BOX labelsize 10 align 8 textfont 1 textsize 10
+ tooltip {Key Limit} xywh {215 155 50 20} down_box BORDER_BOX labelsize 10 align 8 textfont 1 textsize 10
+ } {}
+ Fl_Choice {} {
+ label {Mode :}
+ callback {if ((int) o->value()==0){ /* Poly (implies no legato) */
+ part->Ppolymode=1;
+ part->Plegatomode=0;
+} else {
+ if ((int) o->value()==1){ /* Mono (implies no legato) */
+ part->Ppolymode=0;
+ part->Plegatomode=0;
+ } else {
+ if ((int) o->value()==2){ /* Legato (implies mono) */
+ part->Ppolymode=0;
+ part->Plegatomode=1;
+ };
+ };
+};} open
+ tooltip {Poly, Mono or Legato mode} xywh {80 130 64 18} down_box BORDER_BOX labelfont 1 labelsize 11 textfont 1 textsize 10
+ code0 {o->add("Poly"); o->add("Mono"); o->add("Legato");}
+ code1 {if (part->Ppolymode!=0) o->value(0); else o->value(1);}
+ code2 {if (part->Ppolymode==0 && part->Plegatomode!=0) o->value(2);}
} {}
}
Fl_Check_Button {} {
@@ -436,7 +451,7 @@ master->partonoff(npart,(int) o->value());
pthread_mutex_unlock(&master->mutex);
if (part->Penabled==0) partgroupui->deactivate();
else partgroupui->activate();}
- xywh {90 5 75 20} down_box DOWN_BOX labelfont 1 labelsize 12
+ xywh {90 5 75 20} down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(part->Penabled);}
}
}
@@ -624,44 +639,44 @@ sendtochoice->value(x);}
part->partefx[ninseff]->changeeffect((int) o->value());
pthread_mutex_unlock(part->mutex);
inseffectui->refresh(part->partefx[ninseff]);}
- xywh {155 110 70 15} down_box BORDER_BOX labelsize 11 align 6
+ xywh {155 110 70 15} down_box BORDER_BOX labelsize 10 align 6
code0 {o->value(part->partefx[ninseff]->geteffect());}
} {
- menuitem {} {
+ MenuItem {} {
label {No Effect}
- xywh {35 35 100 20} labelfont 1 labelsize 11
+ xywh {35 35 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Reverb
- xywh {45 45 100 20} labelfont 1 labelsize 11
+ xywh {45 45 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Echo
- xywh {55 55 100 20} labelfont 1 labelsize 11
+ xywh {55 55 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Chorus
- xywh {65 65 100 20} labelfont 1 labelsize 11
+ xywh {65 65 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Phaser
- xywh {70 70 100 20} labelfont 1 labelsize 11
+ xywh {70 70 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label AlienWah
- xywh {80 80 100 20} labelfont 1 labelsize 11
+ xywh {80 80 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label Distortion
- xywh {90 90 100 20} labelfont 1 labelsize 11
+ xywh {90 90 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label EQ
- xywh {100 100 100 20} labelfont 1 labelsize 11
+ xywh {100 100 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label DynFilter
- xywh {110 110 100 20} labelfont 1 labelsize 11
+ xywh {110 110 100 20} labelfont 1 labelsize 10
}
}
Fl_Group inseffectuigroup {
@@ -684,40 +699,40 @@ inseffectui->refresh(part->partefx[ninseff]);}
part->Pefxroute[ninseff]=x;
if (x==2) part->partefx[ninseff]->setdryonly(true);
else part->partefx[ninseff]->setdryonly(false);}
- xywh {235 110 80 15} down_box BORDER_BOX labelsize 11 align 6
+ xywh {235 110 80 15} down_box BORDER_BOX labelsize 10 align 6
code0 {int x=part->Pefxroute[ninseff]; if (x==127) x=1;}
code1 {o->value(x);}
} {
- menuitem {} {
+ MenuItem {} {
label {Next Effect}
- xywh {45 45 100 20} labelfont 1 labelsize 11
+ xywh {45 45 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label {Part Out}
- xywh {55 55 100 20} labelfont 1 labelsize 11
+ xywh {55 55 100 20} labelfont 1 labelsize 10
}
- menuitem {} {
+ MenuItem {} {
label {Dry Out}
- xywh {65 65 100 20} labelfont 1 labelsize 11
+ xywh {65 65 100 20} labelfont 1 labelsize 10
}
}
Fl_Check_Button bypasseff {
label bypass
callback {part->Pefxbypass[ninseff]=(((int)o->value())!=0);}
- tooltip {if the effect is not used (is bypassed)} xywh {90 110 60 15} down_box DOWN_BOX labelsize 12
+ tooltip {if the effect is not used (is bypassed)} xywh {90 110 60 15} down_box DOWN_BOX labelsize 11
code0 {int x=part->Pefxbypass[ninseff];o->value(x);}
}
Fl_Button {} {
label C
callback {presetsui->copy(part->partefx[ninseff]);}
- xywh {90 127 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {90 127 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {pthread_mutex_lock(&master->mutex);
presetsui->paste(part->partefx[ninseff],inseffectui);
pthread_mutex_unlock(&master->mutex);}
- xywh {120 127 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {120 127 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
Fl_Window instrumentkitlist {
@@ -740,27 +755,27 @@ pthread_mutex_unlock(&master->mutex);}
}
Fl_Box {} {
label {No.}
- xywh {5 0 25 15} labelfont 1 labelsize 12 align 18
+ xywh {5 0 25 15} labelfont 1 labelsize 11 align 18
}
Fl_Box {} {
label {M.}
- xywh {55 0 25 15} labelfont 1 labelsize 12 align 18
+ xywh {55 0 25 15} labelfont 1 labelsize 11 align 18
}
Fl_Box {} {
label {Min.k}
- xywh {235 0 40 15} labelfont 1 labelsize 12 align 18
+ xywh {235 0 40 15} labelfont 1 labelsize 11 align 18
}
Fl_Box {} {
label {Max.k}
- xywh {345 0 40 15} labelfont 1 labelsize 12 align 18
+ xywh {345 0 40 15} labelfont 1 labelsize 11 align 18
}
Fl_Box {} {
label ADsynth
- xywh {405 0 50 15} labelfont 1 labelsize 12 align 18
+ xywh {405 0 50 15} labelfont 1 labelsize 11 align 18
}
Fl_Box {} {
label SUBsynth
- xywh {470 0 60 15} labelfont 1 labelsize 12 align 18
+ xywh {470 0 60 15} labelfont 1 labelsize 11 align 18
}
Fl_Choice {} {
label Mode
@@ -770,35 +785,35 @@ if (part->Pkitmode==0) {
} else {
kitlist->activate();
};}
- xywh {35 350 70 15} down_box BORDER_BOX labelsize 12 textfont 1 textsize 12
+ xywh {35 350 70 15} down_box BORDER_BOX labelsize 11 textfont 1 textsize 11
code0 {o->value(part->Pkitmode);}
} {
- menuitem {} {
+ MenuItem {} {
label OFF
- xywh {0 0 100 20} labelfont 1 labelsize 12
+ xywh {0 0 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label MULTI
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label SINGLE
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
}
Fl_Check_Button {} {
label {Drum mode}
callback {part->Pdrummode=(int) o->value();}
- xywh {285 350 70 15} down_box DOWN_BOX labelsize 11
+ xywh {285 350 70 15} down_box DOWN_BOX labelsize 10
code0 {o->value(part->Pdrummode);}
}
Fl_Box {} {
label {FX.r.}
- xywh {620 0 30 15} labelfont 1 labelsize 12 align 18
+ xywh {620 0 30 15} labelfont 1 labelsize 11 align 18
}
Fl_Box {} {
label PADsynth
- xywh {540 0 60 15} labelfont 1 labelsize 12 align 18
+ xywh {540 0 60 15} labelfont 1 labelsize 11 align 18
}
}
Fl_Window instrumenteditwindow {
@@ -815,7 +830,7 @@ if (part->Pkitmode==0) {
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
+ xywh {215 280 80 35} box PLASTIC_UP_BOX color 222 selection_color 220 labelfont 1 labelsize 13 align 128
code0 {if (part->kit[0].Ppadenabled==0) o->deactivate();}
}
Fl_Check_Button padsynenabledcheck {
@@ -824,7 +839,7 @@ if (part->Pkitmode==0) {
part->kit[0].Ppadenabled=x;
if (x==0) padeditbutton->deactivate();
else padeditbutton->activate();}
- 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
+ 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 11
code1 {o->value(part->kit[0].Ppadenabled);}
}
}
@@ -838,13 +853,13 @@ if (x==0) padeditbutton->deactivate();
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
+ 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 11
code1 {o->value(part->kit[0].Padenabled);}
}
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
+ xywh {15 281 80 34} box PLASTIC_UP_BOX color 222 selection_color 220 labelfont 1 labelsize 13 align 128
code0 {if (part->kit[0].Padenabled==0) o->deactivate();}
}
}
@@ -858,13 +873,13 @@ if (x==0) adeditbutton->deactivate();
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
+ 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 11
code1 {o->value(part->kit[0].Psubenabled);}
}
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
+ xywh {115 280 80 35} box PLASTIC_UP_BOX color 222 selection_color 220 labelfont 1 labelsize 13 align 128
code0 {if (part->kit[0].Psubenabled==0) o->deactivate();}
}
}
@@ -876,7 +891,7 @@ if (x==0) subeditbutton->deactivate();
Fl_Button {} {
label Effects
callback {partfx->show();}
- xywh {310 290 80 35} box PLASTIC_UP_BOX color 230 labelfont 1 labelsize 16
+ xywh {310 290 80 35} box PLASTIC_UP_BOX color 230 labelfont 1 labelsize 13
}
}
Fl_Group {} {
@@ -892,83 +907,83 @@ if (x==0) subeditbutton->deactivate();
Fl_Input {} {
label Comments
callback {snprintf((char *)part->info.Pcomments,MAX_INFO_TEXT_SIZE,"%s",o->value());}
- xywh {5 125 385 90} type Multiline color 26 labelsize 12 align 5
+ xywh {5 125 385 90} type Multiline color 26 labelsize 11 align 5
code0 {o->maximum_size(MAX_INFO_TEXT_SIZE);}
code1 {o->value((char *) &part->info.Pcomments);}
}
Fl_Choice {} {
label {Type:}
callback {part->info.Ptype=o->value();}
- xywh {5 25 155 20} down_box BORDER_BOX labelfont 1 labelsize 12 align 5 textsize 11
+ xywh {5 25 155 20} down_box BORDER_BOX labelfont 1 labelsize 11 align 5 textsize 10
code0 {o->value(part->info.Ptype);}
} {
- menuitem {} {
+ MenuItem {} {
label {--------------------------}
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Piano
- xywh {10 10 100 20} labelfont 1 labelsize 12
+ xywh {10 10 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label {Chromatic Percussion}
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Organ
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Guitar
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Bass
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label {Solo Strings}
- xywh {60 60 100 20} labelfont 1 labelsize 12
+ xywh {60 60 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Ensemble
- xywh {70 70 100 20} labelfont 1 labelsize 12
+ xywh {70 70 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Brass
- xywh {80 80 100 20} labelfont 1 labelsize 12
+ xywh {80 80 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Reed
- xywh {90 90 100 20} labelfont 1 labelsize 12
+ xywh {90 90 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Pipe
- xywh {100 100 100 20} labelfont 1 labelsize 12
+ xywh {100 100 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label {Synth Lead}
- xywh {110 110 100 20} labelfont 1 labelsize 12
+ xywh {110 110 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label {Synth Pad}
- xywh {120 120 100 20} labelfont 1 labelsize 12
+ xywh {120 120 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label {Synth Effects}
- xywh {130 130 100 20} labelfont 1 labelsize 12
+ xywh {130 130 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Ethnic
- xywh {140 140 100 20} labelfont 1 labelsize 12
+ xywh {140 140 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label Percussive
- xywh {150 150 100 20} labelfont 1 labelsize 12
+ xywh {150 150 100 20} labelfont 1 labelsize 11
}
- menuitem {} {
+ MenuItem {} {
label {Sound Effects}
- xywh {160 160 100 20} labelfont 1 labelsize 12
+ xywh {160 160 100 20} labelfont 1 labelsize 11
}
}
}
diff --git a/src/UI/PresetsUI.fl b/src/UI/PresetsUI.fl
@@ -67,10 +67,10 @@ copywin->hide();}
}
Fl_Box {} {
label {Type:}
- xywh {10 5 40 15} labelsize 12 align 20
+ xywh {10 5 40 15} labelsize 11 align 20
}
Fl_Box copytypetext {
- xywh {50 5 205 15} box FLAT_BOX color 238 labelfont 1 labelsize 12 align 20
+ xywh {50 5 205 15} box FLAT_BOX color 238 labelfont 1 labelsize 11 align 20
}
Fl_Input presetname {
callback {const char *tmp=o->value();
@@ -120,11 +120,11 @@ pui->refresh();}
xywh {160 385 80 35} box THIN_UP_BOX align 192
}
Fl_Box pastetypetext {
- xywh {55 5 200 15} box FLAT_BOX color 238 labelfont 1 labelsize 12 align 20
+ xywh {55 5 200 15} box FLAT_BOX color 238 labelfont 1 labelsize 11 align 20
}
Fl_Box {} {
label {Type:}
- xywh {15 5 40 15} labelsize 12 align 20
+ xywh {15 5 40 15} labelsize 11 align 20
}
Fl_Button deletepbutton {
label Delete
diff --git a/src/UI/ResonanceUI.fl b/src/UI/ResonanceUI.fl
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0106
+version 1.0107
header_name {.h}
code_name {.cc}
decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {}
@@ -169,8 +169,7 @@ if (event==FL_RELEASE) {
};
};
-return(1);} {selected
- }
+return(1);} {}
}
Function {setcbwidget(Fl_Widget *cbwidget,Fl_Widget *applybutton)} {} {
code {this->cbwidget=cbwidget;
@@ -185,21 +184,22 @@ this->applybutton=applybutton;} {}
decl {Fl_Widget *cbwidget,*applybutton;} {}
}
-class ResonanceUI {: PresetsUI_
+class ResonanceUI {open : PresetsUI_
} {
- Function {make_window()} {} {
+ Function {make_window()} {open
+ } {
Fl_Window resonancewindow {
- label Resonance
- xywh {45 259 780 305} type Double visible
+ label Resonance selected
+ xywh {120 70 780 305} type Double hide
} {
Fl_Value_Output khzvalue {
label kHz
- xywh {415 264 45 18} align 8 minimum 0.001 maximum 48 step 0.01 textfont 1
+ xywh {415 264 45 18} labelsize 12 align 8 minimum 0.001 maximum 48 step 0.01 textfont 1 textsize 12
code0 {//this widget must be before the calling widgets}
}
Fl_Value_Output dbvalue {
label dB
- xywh {415 282 45 18} align 8 minimum -150 maximum 150 step 0.1 textfont 1
+ xywh {415 282 45 18} labelsize 12 align 8 minimum -150 maximum 150 step 0.1 textfont 1 textsize 12
code0 {//this widget must be before the calling widgets}
}
Fl_Group {} {
@@ -219,14 +219,14 @@ class ResonanceUI {: PresetsUI_
respar->setpoint(i,64);
resonancewindow->redraw();
redrawPADnoteApply();}
- tooltip {Clear the resonance function} xywh {491 264 66 15} box THIN_UP_BOX labelfont 1
+ tooltip {Clear the resonance function} xywh {491 264 66 15} box THIN_UP_BOX labelfont 1 labelsize 12
}
Fl_Button {} {
label Smooth
callback {respar->smooth();
resonancewindow->redraw();
redrawPADnoteApply();}
- tooltip {Smooth the resonance function} xywh {491 282 66 18} box THIN_UP_BOX labelfont 1
+ tooltip {Smooth the resonance function} xywh {491 282 66 18} box THIN_UP_BOX labelfont 1 labelsize 12
}
Fl_Check_Button enabled {
label Enable
@@ -244,7 +244,7 @@ redrawPADnoteApply();}
Fl_Value_Output maxdbvo {
label {Max.}
callback {o->value(respar->PmaxdB);}
- tooltip {The Maximum amplitude (dB)} xywh {126 264 24 18} minimum 1 maximum 127 step 1 value 30 textfont 1
+ tooltip {The Maximum amplitude (dB)} xywh {126 264 24 18} labelsize 12 minimum 1 maximum 127 step 1 value 30 textfont 1 textsize 12
code0 {o->value(respar->PmaxdB);}
}
Fl_Box {} {
@@ -254,13 +254,13 @@ redrawPADnoteApply();}
Fl_Value_Output centerfreqvo {
label {C.f.}
callback {o->value(respar->getcenterfreq()/1000.0);}
- tooltip {Center Frequency (kHz)} xywh {210 264 33 18} when 3 minimum 1 maximum 10 step 0.01 value 1 textfont 1
+ tooltip {Center Frequency (kHz)} xywh {210 264 33 18} labelsize 12 when 3 minimum 1 maximum 10 step 0.01 value 1 textfont 1 textsize 12
code0 {o->value(respar->getcenterfreq()/1000.0);}
}
Fl_Value_Output octavesfreqvo {
label {Oct.}
callback {o->value(respar->getoctavesfreq());}
- tooltip {No. of octaves} xywh {210 282 33 18} when 3 minimum 1 maximum 127 step 1 value 30 textfont 1
+ tooltip {No. of octaves} xywh {210 282 33 18} labelsize 12 when 3 minimum 1 maximum 127 step 1 value 30 textfont 1 textsize 12
code0 {o->value(respar->getoctavesfreq());}
}
Fl_Button {} {
@@ -317,19 +317,19 @@ redrawPADnoteApply();}
octavesfreqvo->do_callback();
rg->redraw();
redrawPADnoteApply();}
- xywh {280 265 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ xywh {280 265 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(respar->Poctavesfreq);}
class WidgetPDial
}
Fl_Button {} {
label C
callback {presetsui->copy(respar);}
- xywh {625 275 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {625 275 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(respar,this);}
- xywh {655 275 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {655 275 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button applybutton {
label Apply
@@ -340,7 +340,7 @@ if (cbapplywidget!=NULL) {
cbapplywidget->color(FL_GRAY);
cbapplywidget->redraw();
};}
- xywh {690 265 85 15} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {690 265 85 15} box THIN_UP_BOX labelfont 1 labelsize 11
}
}
}
diff --git a/src/UI/SUBnoteUI.fl b/src/UI/SUBnoteUI.fl
@@ -122,7 +122,7 @@ class SUBnoteUI {: {public PresetsUI_}
Fl_Button {} {
label Close
callback {SUBparameters->hide();}
- xywh {625 365 105 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ xywh {625 365 105 20} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Group {} {
label AMPLITUDE
@@ -131,19 +131,19 @@ class SUBnoteUI {: {public PresetsUI_}
Fl_Value_Slider vol {
label Vol
callback {pars->PVolume=(int)o->value();}
- tooltip Volume xywh {10 25 140 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip Volume xywh {10 25 140 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PVolume);}
}
Fl_Value_Slider vsns {
label {V.Sns}
callback {pars->PAmpVelocityScaleFunction=(int) o->value();}
- tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 45 140 15} type {Horz Knob} box FLAT_BOX labelsize 12 align 8 maximum 127 step 1
+ tooltip {Velocity Sensing Function (rightmost to disable)} xywh {10 45 140 15} type {Horz Knob} box FLAT_BOX labelsize 11 align 8 maximum 127 step 1
code0 {o->value(pars->PAmpVelocityScaleFunction);}
}
Fl_Dial pan {
label Pan
callback {pars->PPanning=(int) o->value();}
- tooltip {Panning (leftmost is Random)} xywh {185 20 30 30} box ROUND_UP_BOX labelsize 11 maximum 127 step 1
+ tooltip {Panning (leftmost is Random)} xywh {185 20 30 30} box ROUND_UP_BOX labelsize 10 maximum 127 step 1
code0 {o->value(pars->PPanning);}
class WidgetPDial
}
@@ -166,47 +166,47 @@ class SUBnoteUI {: {public PresetsUI_}
Fl_Choice magtype {
label {Mag.Type}
callback {pars->Phmagtype=(int) o->value();}
- xywh {585 340 65 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 textsize 12
+ xywh {585 340 65 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 textsize 11
code0 {o->value(pars->Phmagtype);}
} {
menuitem {} {
label Linear
- xywh {20 20 100 20} labelfont 1 labelsize 12
+ xywh {20 20 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-40dB}
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-60dB}
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-80dB}
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {-100dB}
- xywh {60 60 100 20} labelfont 1 labelsize 12
+ xywh {60 60 100 20} labelfont 1 labelsize 11
}
}
Fl_Choice start {
label Start
callback {pars->Pstart=(int) o->value();} open
- xywh {670 340 50 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 textsize 12
+ xywh {670 340 50 15} down_box BORDER_BOX labelfont 1 labelsize 10 align 1 textsize 11
code0 {o->value(pars->Pstart);}
} {
menuitem {} {
label Zero
- xywh {30 30 100 20} labelfont 1 labelsize 12
+ xywh {30 30 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label RND
- xywh {40 40 100 20} labelfont 1 labelsize 12
+ xywh {40 40 100 20} labelfont 1 labelsize 11
}
menuitem {} {
label {Max.}
- xywh {50 50 100 20} labelfont 1 labelsize 12
+ xywh {50 50 100 20} labelfont 1 labelsize 11
}
}
}
@@ -237,7 +237,7 @@ freqsettingsui->redraw();}
if (k<0) k+=16;
pars->PCoarseDetune = k*1024+
pars->PCoarseDetune%1024;}
- tooltip Octave xywh {670 50 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 12
+ tooltip Octave xywh {670 50 45 15} type Simple labelsize 10 align 1 minimum -8 maximum 7 step 1 textfont 1 textsize 11
code0 {int k=pars->PCoarseDetune/1024;if (k>=8) k-=16;}
code2 {o->value(k);}
}
@@ -247,7 +247,7 @@ pars->PCoarseDetune = k*1024+
if (k<0) k+=1024;
pars->PCoarseDetune = k+
(pars->PCoarseDetune/1024)*1024;}
- tooltip {Coarse Detune} xywh {655 115 60 20} labelsize 11 align 1 minimum -64 maximum 63 step 1 textfont 1 textsize 12
+ tooltip {Coarse Detune} xywh {655 115 60 20} labelsize 10 align 1 minimum -64 maximum 63 step 1 textfont 1 textsize 11
code0 {int k=pars->PCoarseDetune%1024;if (k>=512) k-=1024;}
code2 {o->value(k);}
code3 {o->lstep(10);}
@@ -270,7 +270,7 @@ detunevalueoutput->do_callback();}
pars->Pfixedfreq=x;
if (x==0) fixedfreqetdial->deactivate();
else fixedfreqetdial->activate();}
- tooltip {set the base frequency to 440Hz} xywh {555 45 50 15} down_box DOWN_BOX labelfont 1 labelsize 11
+ tooltip {set the base frequency to 440Hz} xywh {555 45 50 15} down_box DOWN_BOX labelfont 1 labelsize 10
code0 {o->value(pars->Pfixedfreq);}
}
Fl_Dial fixedfreqetdial {
@@ -307,7 +307,7 @@ detunevalueoutput->do_callback();} open
pars->Phmag[0]=127;
h[0]->mag->value(0);
SUBparameters->redraw();}
- tooltip {Clear the harmonics} xywh {445 365 70 20} box THIN_UP_BOX labelfont 1 labelsize 12
+ tooltip {Clear the harmonics} xywh {445 365 70 20} box THIN_UP_BOX labelfont 1 labelsize 11
}
Fl_Group bandwidthsettingsui {
label BANDWIDTH
@@ -345,7 +345,7 @@ bandwidthsettingsui->redraw();}
}
Fl_Group globalfiltergroup {
label FILTER
- xywh {440 140 290 185} box THIN_UP_FRAME labeltype EMBOSSED_LABEL labelfont 1 labelsize 16 align 17
+ xywh {440 140 290 185} box THIN_UP_FRAME labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 17
code0 {if (pars->PGlobalFilterEnabled==0) o->deactivate();}
} {
Fl_Group filterenv {
@@ -368,18 +368,18 @@ if (o->value()==0) globalfiltergroup->deactivate();
else globalfiltergroup->activate();
o->show();
globalfiltergroup->redraw();}
- xywh {445 145 85 20} down_box DOWN_BOX labelfont 1 labelsize 12
+ xywh {445 145 85 20} down_box DOWN_BOX labelfont 1 labelsize 11
code0 {o->value(pars->PGlobalFilterEnabled);}
}
Fl_Button {} {
label C
callback {presetsui->copy(pars);}
- xywh {540 370 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {540 370 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
Fl_Button {} {
label P
callback {presetsui->paste(pars,this);}
- xywh {570 370 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 12 labelcolor 7
+ xywh {570 370 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
}
}
}
diff --git a/src/UI/SeqUI.fl b/src/UI/SeqUI.fl
@@ -31,7 +31,7 @@ class SeqUI {} {
stopbutton_play->activate();
master->seq.startplay();}
- tooltip {Start Playing} xywh {130 30 30 30} box DIAMOND_UP_BOX color 79 labelfont 1 labelsize 16 align 2
+ tooltip {Start Playing} xywh {130 30 30 30} box DIAMOND_UP_BOX color 79 labelfont 1 labelsize 13 align 2
}
Fl_Button stopbutton_play {
label Stop
@@ -39,7 +39,7 @@ master->seq.startplay();}
playbutton->activate();
master->seq.stopplay();}
- tooltip {Stop Playing} xywh {175 29 30 31} box THIN_UP_BOX color 4 labelfont 1 labelsize 16 align 2 deactivate
+ tooltip {Stop Playing} xywh {175 29 30 31} box THIN_UP_BOX color 4 labelfont 1 labelsize 13 align 2 deactivate
}
}
Fl_Button {} {
@@ -55,7 +55,7 @@ master->seq.stopplay();}
}
Fl_Box {} {
label {This is not finished} selected
- xywh {25 155 225 90} labelfont 1 labelsize 30 align 128
+ xywh {25 155 225 90} labelfont 1 labelsize 22 align 128
}
}
}
diff --git a/src/UI/VirKeyboard.fl b/src/UI/VirKeyboard.fl
@@ -259,7 +259,7 @@ virkeys->take_focus();}
callback {relaseallkeys();
virkeys->midioct=(int) o->value();
virkeys->take_focus();}
- tooltip {Midi Octave} xywh {255 100 55 20} type Simple labelsize 12 align 4 when 6 minimum 0 maximum 5 step 1 textfont 1 textsize 12
+ tooltip {Midi Octave} xywh {255 100 55 20} type Simple labelsize 11 align 4 when 6 minimum 0 maximum 5 step 1 textfont 1 textsize 11
code0 {o->value(virkeys->midioct);}
}
Fl_Button {} {
diff --git a/src/main.C b/src/main.C
@@ -351,7 +351,7 @@ int main(int argc, char *argv[]){
#ifdef JACKAUDIOOUT
usejackit=true;//use jack by default
#endif
- fprintf(stderr,"%s","\nZynAddSubFX - Copyright (c) 2002-2005 Nasca Octavian Paul\n");
+ fprintf(stderr,"%s","\nZynAddSubFX - Copyright (c) 2002-2005 Nasca Octavian Paul and others\n");
fprintf(stderr,"Compiled: %s %s\n",__DATE__,__TIME__);
fprintf(stderr,"%s","This program is free software (GNU GPL v.2) and \n it comes with ABSOLUTELY NO WARRANTY.\n\n");
#ifdef OS_LINUX
