commit 113d0d10530cdfec8e7bae41e74574f1e3b062e1
parent 14541d6f612979ad713756b8bd93e142de7e8f4c
Author: paulnasca <paulnasca>
Date: Sun, 8 Feb 2004 11:15:24 +0000
xml changes
Diffstat:
13 files changed, 181 insertions(+), 190 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -525,6 +525,6 @@
05 Feb 2004 - Se salveaza toti parametrii in XML
06 Feb 2004 - Adaugat salvarea de instrument in XML
- Adaugat export la bank intr-un director XML si decis ca bank-ul sa fie un director cu mai multe fisiere xml de forma XXXX-nume.xml sau XXXX-nume.xml.gz
-07 Feb 2004 - adaugat functii de initializare si renuntat la masterdefaultbuf si instrumentdefaultbuf (adica salvarea la inceput si incarcarea bufferelor cu instrumentele prestabilite)
- - corectata o mica eroare care facea ca sa se incarce subnotepars la adnotepars (eroarea a aparut azi)
-
-\ No newline at end of file
+07 Feb 2004 - Adaugat functii de initializare si renuntat la masterdefaultbuf si instrumentdefaultbuf (adica salvarea la inceput si incarcarea bufferelor cu instrumentele prestabilite)
+ - Corectata o mica eroare care facea ca sa se incarce subnotepars la adnotepars (eroarea a aparut azi)
+08 Feb 2004 - Modificat putin formatul XML
diff --git a/src/Effects/EffectMgr.C b/src/Effects/EffectMgr.C
@@ -254,7 +254,7 @@ void EffectMgr::add2XML(XMLwrapper *xml){
for (int n=0;n<128;n++){
int par=geteffectpar(n);
if (par==0) continue;
- xml->beginbranch("parno",n);
+ xml->beginbranch("par_no",n);
xml->addpar("par",par);
xml->endbranch();
};
diff --git a/src/Misc/Master.C b/src/Misc/Master.C
@@ -727,8 +727,8 @@ void Master::exportbankasxmldirectory(const char *directory){
void Master::add2XML(XMLwrapper *xml){
xml->addpar("volume",Pvolume);
- xml->addpar("keyshift",Pkeyshift);
- xml->addparbool("NRPNreceive",ctl.NRPN.receive);
+ xml->addpar("key_shift",Pkeyshift);
+ xml->addparbool("nrpn_receive",ctl.NRPN.receive);
xml->beginbranch("MICROTONAL");
microtonal.add2XML(xml);
@@ -755,7 +755,7 @@ void Master::add2XML(XMLwrapper *xml){
for (int tonefx=nefx+1;tonefx<NUM_SYS_EFX;tonefx++){
xml->beginbranch("SENDTO",tonefx);
- xml->addpar("sendvol",Psysefxsend[nefx][tonefx]);
+ xml->addpar("send_vol",Psysefxsend[nefx][tonefx]);
xml->endbranch();
};
diff --git a/src/Misc/Microtonal.C b/src/Misc/Microtonal.C
@@ -567,25 +567,25 @@ void Microtonal::add2XML(XMLwrapper *xml){
xml->addparstr("name",(char *) Pname);
xml->addparstr("comment",(char *) Pcomment);
- xml->addparbool("invertupdown",Pinvertupdown);
- xml->addparbool("invertupdowncenter",Pinvertupdowncenter);
+ xml->addparbool("invert_up_down",Pinvertupdown);
+ xml->addparbool("invert_up_down_center",Pinvertupdowncenter);
xml->addparbool("enabled",Penabled);
- xml->addpar("globalfinedetune",Pglobalfinedetune);
+ xml->addpar("global_fine_detune",Pglobalfinedetune);
- xml->addpar("anote",PAnote);
- xml->addparreal("afreq",PAfreq);
+ xml->addpar("a_note",PAnote);
+ xml->addparreal("a_freq",PAfreq);
if (Penabled==0) return;
xml->beginbranch("SCALE");
- xml->addpar("scaleshift",Pscaleshift);
- xml->addpar("firstkey",Pfirstkey);
- xml->addpar("lastkey",Plastkey);
- xml->addpar("middlenote",Pmiddlenote);
+ xml->addpar("scale_shift",Pscaleshift);
+ xml->addpar("first_key",Pfirstkey);
+ xml->addpar("last_key",Plastkey);
+ xml->addpar("middle_note",Pmiddlenote);
xml->beginbranch("OCTAVE");
- xml->addpar("octavesize",octavesize);
+ xml->addpar("octave_size",octavesize);
for (int i=0;i<octavesize;i++){
xml->beginbranch("DEGREE",i);
if (octave[i].type==1){
@@ -600,8 +600,8 @@ void Microtonal::add2XML(XMLwrapper *xml){
xml->endbranch();
xml->beginbranch("KEYBOARD_MAPPING");
- xml->addpar("mapsize",Pmapsize);
- xml->addpar("mappingenabled",Pmappingenabled);
+ xml->addpar("map_size",Pmapsize);
+ xml->addpar("mapping_enabled",Pmappingenabled);
for (int i=0;i<Pmapsize;i++){
xml->beginbranch("KEYMAP",i);
xml->addpar("degree",Pmapping[i]);
@@ -609,20 +609,6 @@ void Microtonal::add2XML(XMLwrapper *xml){
};
xml->endbranch();
xml->endbranch();
-
- /*
-
- //Mapping ON/OFF
- unsigned char Pmappingenabled;
- //Mapping (keys)
- short int Pmapping[128];
-
- unsigned char Pglobalfinedetune;
-
- // Functions
-
- */
-
};
diff --git a/src/Misc/Part.C b/src/Misc/Part.C
@@ -945,38 +945,38 @@ void Part::saveloadbuf(Buffer *buf,int instrumentonly){
*/
void Part::add2XMLinstrument(XMLwrapper *xml){
- xml->beginbranch("INSTRUMENTINFO");
+ xml->beginbranch("INFO");
xml->addparstr("name",(char *)Pname);
xml->addparstr("author",(char *)info.Pauthor);
xml->addparstr("comments",(char *)info.Pcomments);
xml->addpar("type",info.Ptype);
xml->endbranch();
- xml->addpar("kitmode",Pkitmode);
- xml->addparbool("drummode",Pdrummode);
+ xml->addpar("kit_mode",Pkitmode);
+ xml->addparbool("drum_mode",Pdrummode);
for (int i=0;i<NUM_KIT_ITEMS;i++){
- xml->beginbranch("INSTRUMENTKITITEM",i);
+ xml->beginbranch("INSTRUMENT_KIT_ITEM",i);
xml->addparbool("enabled",kit[i].Penabled);
if (kit[i].Penabled!=0) {
xml->addparstr("name",(char *)kit[i].Pname);
xml->addpar("muted",kit[i].Pmuted);
- xml->addpar("minkey",kit[i].Pminkey);
- xml->addpar("maxkey",kit[i].Pmaxkey);
+ xml->addpar("min_key",kit[i].Pminkey);
+ xml->addpar("max_key",kit[i].Pmaxkey);
- xml->addpar("Psendtoparteefect",kit[i].Psendtoparteffect);
+ xml->addpar("send_to_instrument_effect",kit[i].Psendtoparteffect);
- xml->addpar("adenabled",kit[i].Padenabled);
+ xml->addpar("ad_enabled",kit[i].Padenabled);
if ((kit[i].Padenabled!=0)&&(kit[i].adpars!=NULL)){
- xml->beginbranch("ADNOTEPARAMETERS");
+ xml->beginbranch("ADD_SYNTH_PARAMETERS");
kit[i].adpars->add2XML(xml);
xml->endbranch();
};
- xml->addpar("subenabled",kit[i].Psubenabled);
+ xml->addpar("sub_enabled",kit[i].Psubenabled);
if ((kit[i].Psubenabled!=0)&&(kit[i].subpars!=NULL)){
- xml->beginbranch("SUBNOTEPARAMETERS");
+ xml->beginbranch("SUB_SYNTH_PARAMETERS");
kit[i].subpars->add2XML(xml);
xml->endbranch();
};
@@ -984,7 +984,18 @@ void Part::add2XMLinstrument(XMLwrapper *xml){
};
xml->endbranch();
};
-
+
+ xml->beginbranch("EFFECTS");
+ for (int nefx=0;nefx<NUM_PART_EFX;nefx++){
+ xml->beginbranch("INSTRUMENT_EFFECT",nefx);
+ xml->beginbranch("EFFECT");
+ partefx[nefx]->add2XML(xml);
+ xml->endbranch();
+
+ xml->addpar("route",Pefxroute[nefx]);
+ xml->endbranch();
+ };
+ xml->endbranch();
};
@@ -996,17 +1007,17 @@ void Part::add2XML(XMLwrapper *xml){
xml->addpar("volume",Pvolume);
xml->addpar("panning",Ppanning);
- xml->addpar("minkey",Pminkey);
- xml->addpar("maxkey",Pmaxkey);
- xml->addpar("keyshift",Pkeyshift);
- xml->addpar("rcvchn",Prcvchn);
+ xml->addpar("min_key",Pminkey);
+ xml->addpar("max_key",Pmaxkey);
+ xml->addpar("key_shift",Pkeyshift);
+ xml->addpar("rcv_chn",Prcvchn);
- xml->addpar("velsns",Pvelsns);
- xml->addpar("veloffs",Pveloffs);
+ xml->addpar("velocity_sensing",Pvelsns);
+ xml->addpar("velocity_offset",Pveloffs);
- xml->addparbool("noteon",Pnoteon);
- xml->addparbool("polymode",Ppolymode);
- xml->addpar("keylimit",Pkeylimit);
+ xml->addparbool("note_on",Pnoteon);
+ xml->addparbool("poly_mode",Ppolymode);
+ xml->addpar("key_limit",Pkeylimit);
xml->beginbranch("INSTRUMENT");
add2XMLinstrument(xml);
@@ -1015,16 +1026,6 @@ void Part::add2XML(XMLwrapper *xml){
xml->beginbranch("CONTROLLER");
ctl.add2XML(xml);
xml->endbranch();
-
- for (int nefx=0;nefx<NUM_PART_EFX;nefx++){
- xml->beginbranch("PARTEFFECT",nefx);
- xml->beginbranch("EFFECT");
- partefx[nefx]->add2XML(xml);
- xml->endbranch();
-
- xml->addpar("route",Pefxroute[nefx]);
- xml->endbranch();
- };
};
int Part::saveXML(char *filename){
diff --git a/src/Misc/XMLwrapper.C b/src/Misc/XMLwrapper.C
@@ -73,20 +73,20 @@ int XMLwrapper::saveXMLfile(char *filename,int compression){
void XMLwrapper::addpar(char *name,int val){
- addparams2("param","name",name,"value",int2str(val));
+ addparams2("par","name",name,"value",int2str(val));
};
void XMLwrapper::addparreal(char *name,REALTYPE val){
- addparams2("paramreal","name",name,"value",real2str(val));
+ addparams2("par_real","name",name,"value",real2str(val));
};
void XMLwrapper::addparbool(char *name,int val){
- if (val!=0) addparams2("boolparam","name",name,"value","yes");
- else addparams2("boolparam","name",name,"value","no");
+ if (val!=0) addparams2("par_bool","name",name,"value","yes");
+ else addparams2("par_bool","name",name,"value","no");
};
void XMLwrapper::addparstr(char *name,char *val){
- addparams2("strparam","name",name,"value",val);
+ addparams2("par_string","name",name,"value",val);
};
diff --git a/src/Params/ADnoteParameters.C b/src/Params/ADnoteParameters.C
@@ -530,16 +530,16 @@ void ADnoteParameters::add2XMLvoice(XMLwrapper *xml,int nvoice){
xml->addpar("delay",VoicePar[nvoice].PDelay);
xml->addparbool("resonance",VoicePar[nvoice].Presonance);
- xml->addpar("extoscil",VoicePar[nvoice].Pextoscil);
- xml->addpar("extfmoscil",VoicePar[nvoice].PextFMoscil);
+ xml->addpar("ext_oscil",VoicePar[nvoice].Pextoscil);
+ xml->addpar("ext_fm_oscil",VoicePar[nvoice].PextFMoscil);
- xml->addpar("oscilphase",VoicePar[nvoice].Poscilphase);
- xml->addpar("oscilfmphase",VoicePar[nvoice].PFMoscilphase);
+ xml->addpar("oscil_phase",VoicePar[nvoice].Poscilphase);
+ xml->addpar("oscil_fm_phase",VoicePar[nvoice].PFMoscilphase);
- xml->addparbool("filterenabled",VoicePar[nvoice].PFilterEnabled);
- xml->addparbool("filterbypass",VoicePar[nvoice].Pfilterbypass);
+ xml->addparbool("filter_enabled",VoicePar[nvoice].PFilterEnabled);
+ xml->addparbool("filter_bypass",VoicePar[nvoice].Pfilterbypass);
- xml->addparbool("fmenabled",VoicePar[nvoice].PFMEnabled);
+ xml->addparbool("fm_enabled",VoicePar[nvoice].PFMEnabled);
xml->beginbranch("OSCIL");
VoicePar[nvoice].OscilSmp->add2XML(xml);
@@ -549,16 +549,16 @@ void ADnoteParameters::add2XMLvoice(XMLwrapper *xml,int nvoice){
xml->beginbranch("AMPLITUDE_PARAMETERS");
xml->addpar("panning",VoicePar[nvoice].PPanning);
xml->addpar("volume",VoicePar[nvoice].PVolume);
- xml->addparbool("volumeminus",VoicePar[nvoice].PVolumeminus);
- xml->addpar("velocitysensing",VoicePar[nvoice].PAmpVelocityScaleFunction);
+ xml->addparbool("volume_minus",VoicePar[nvoice].PVolumeminus);
+ xml->addpar("velocity_sensing",VoicePar[nvoice].PAmpVelocityScaleFunction);
- xml->addparbool("ampenvelopeenabled",VoicePar[nvoice].PAmpEnvelopeEnabled);
+ xml->addparbool("amp_envelope_enabled",VoicePar[nvoice].PAmpEnvelopeEnabled);
if (VoicePar[nvoice].PAmpEnvelopeEnabled!=0){
xml->beginbranch("AMPLITUDE_ENVELOPE");
VoicePar[nvoice].AmpEnvelope->add2XML(xml);
xml->endbranch();
};
- xml->addparbool("amplfoenabled",VoicePar[nvoice].PAmpLfoEnabled);
+ xml->addparbool("amp_lfo_enabled",VoicePar[nvoice].PAmpLfoEnabled);
if (VoicePar[nvoice].PAmpLfoEnabled!=0){
xml->beginbranch("AMPLITUDE_LFO");
VoicePar[nvoice].AmpLfo->add2XML(xml);
@@ -567,19 +567,19 @@ void ADnoteParameters::add2XMLvoice(XMLwrapper *xml,int nvoice){
xml->endbranch();
xml->beginbranch("FREQUENCY_PARAMETERS");
- xml->addparbool("fixedfreq",VoicePar[nvoice].Pfixedfreq);
- xml->addpar("fixedfreqet",VoicePar[nvoice].PfixedfreqET);
+ xml->addparbool("fixed_freq",VoicePar[nvoice].Pfixedfreq);
+ xml->addpar("fixed_freq_et",VoicePar[nvoice].PfixedfreqET);
xml->addpar("detune",VoicePar[nvoice].PDetune);
- xml->addpar("coarsedetune",VoicePar[nvoice].PCoarseDetune);
- xml->addpar("detunetype",VoicePar[nvoice].PDetuneType);
+ xml->addpar("coarse_detune",VoicePar[nvoice].PCoarseDetune);
+ xml->addpar("detune_type",VoicePar[nvoice].PDetuneType);
- xml->addparbool("freqenvelopeenabled",VoicePar[nvoice].PFreqEnvelopeEnabled);
+ xml->addparbool("freq_envelope_enabled",VoicePar[nvoice].PFreqEnvelopeEnabled);
if (VoicePar[nvoice].PFreqEnvelopeEnabled!=0){
xml->beginbranch("FREQUENCY_ENVELOPE");
VoicePar[nvoice].FreqEnvelope->add2XML(xml);
xml->endbranch();
};
- xml->addparbool("freqlfoenabled",VoicePar[nvoice].PFreqLfoEnabled);
+ xml->addparbool("freq_lfo_enabled",VoicePar[nvoice].PFreqLfoEnabled);
if (VoicePar[nvoice].PFreqLfoEnabled!=0){
xml->beginbranch("FREQUENCY_LFO");
VoicePar[nvoice].FreqLfo->add2XML(xml);
@@ -594,14 +594,14 @@ void ADnoteParameters::add2XMLvoice(XMLwrapper *xml,int nvoice){
GlobalPar.GlobalFilter->add2XML(xml);
xml->endbranch();
- xml->addparbool("filterenvelopeenabled",VoicePar[nvoice].PFilterEnvelopeEnabled);
+ xml->addparbool("filter_envelope_enabled",VoicePar[nvoice].PFilterEnvelopeEnabled);
if (VoicePar[nvoice].PFilterEnvelopeEnabled!=0){
xml->beginbranch("FILTER_ENVELOPE");
VoicePar[nvoice].FilterEnvelope->add2XML(xml);
xml->endbranch();
};
- xml->addparbool("filterlfoenabled",VoicePar[nvoice].PFilterLfoEnabled);
+ xml->addparbool("filter_lfo_enabled",VoicePar[nvoice].PFilterLfoEnabled);
if (VoicePar[nvoice].PFilterLfoEnabled!=0){
xml->beginbranch("FILTER_LFO");
VoicePar[nvoice].FilterLfo->add2XML(xml);
@@ -612,34 +612,35 @@ void ADnoteParameters::add2XMLvoice(XMLwrapper *xml,int nvoice){
if ((VoicePar[nvoice].PFMEnabled!=0)||(fmoscilused!=0)){
xml->beginbranch("FM_PARAMETERS");
- xml->addpar("inputvoice",VoicePar[nvoice].PFMVoice);
+ xml->addpar("input_voice",VoicePar[nvoice].PFMVoice);
xml->addpar("volume",VoicePar[nvoice].PFMVolume);
- xml->addpar("volumedamp",VoicePar[nvoice].PFMVolumeDamp);
- xml->addpar("velocitysensing",VoicePar[nvoice].PFMVelocityScaleFunction);
+ xml->addpar("volume_damp",VoicePar[nvoice].PFMVolumeDamp);
+ xml->addpar("velocity_sensing",VoicePar[nvoice].PFMVelocityScaleFunction);
- xml->addparbool("ampenvelopeenabled",VoicePar[nvoice].PFMAmpEnvelopeEnabled);
+ xml->addparbool("amp_envelope_enabled",VoicePar[nvoice].PFMAmpEnvelopeEnabled);
if (VoicePar[nvoice].PFMAmpEnvelopeEnabled!=0){
xml->beginbranch("AMPLITUDE_ENVELOPE");
VoicePar[nvoice].FMAmpEnvelope->add2XML(xml);
xml->endbranch();
};
-
- xml->addpar("detune",VoicePar[nvoice].PFMDetune);
- xml->addpar("coarsedetune",VoicePar[nvoice].PFMCoarseDetune);
- xml->addpar("detunetype",VoicePar[nvoice].PFMDetuneType);
-
- xml->addparbool("freqenvelopeenabled",VoicePar[nvoice].PFMFreqEnvelopeEnabled);
- if (VoicePar[nvoice].PFMFreqEnvelopeEnabled!=0){
- xml->beginbranch("FREQUENCY_ENVELOPE");
- VoicePar[nvoice].FMFreqEnvelope->add2XML(xml);
+ xml->beginbranch("MODULATOR");
+ xml->addpar("detune",VoicePar[nvoice].PFMDetune);
+ xml->addpar("coarse_detune",VoicePar[nvoice].PFMCoarseDetune);
+ xml->addpar("detune_type",VoicePar[nvoice].PFMDetuneType);
+
+ xml->addparbool("freq_envelope_enabled",VoicePar[nvoice].PFMFreqEnvelopeEnabled);
+ if (VoicePar[nvoice].PFMFreqEnvelopeEnabled!=0){
+ xml->beginbranch("FREQUENCY_ENVELOPE");
+ VoicePar[nvoice].FMFreqEnvelope->add2XML(xml);
+ xml->endbranch();
+ };
+
+ xml->beginbranch("OSCIL");
+ VoicePar[nvoice].FMSmp->add2XML(xml);
xml->endbranch();
- };
- xml->beginbranch("OSCIL");
- VoicePar[nvoice].FMSmp->add2XML(xml);
xml->endbranch();
-
xml->endbranch();
};
};
@@ -651,11 +652,11 @@ void ADnoteParameters::add2XML(XMLwrapper *xml){
xml->beginbranch("AMPLITUDE_PARAMETERS");
xml->addpar("volume",GlobalPar.PVolume);
xml->addpar("panning",GlobalPar.PPanning);
- xml->addpar("velocitysensing",GlobalPar.PAmpVelocityScaleFunction);
- xml->addpar("punchstrength",GlobalPar.PPunchStrength);
- xml->addpar("punchtime",GlobalPar.PPunchTime);
- xml->addpar("punchstretch",GlobalPar.PPunchStretch);
- xml->addpar("punchvelocitysensing",GlobalPar.PPunchVelocitySensing);
+ xml->addpar("velocity_sensing",GlobalPar.PAmpVelocityScaleFunction);
+ xml->addpar("punch_strength",GlobalPar.PPunchStrength);
+ xml->addpar("punch_time",GlobalPar.PPunchTime);
+ xml->addpar("punch_stretch",GlobalPar.PPunchStretch);
+ xml->addpar("punch_velocity_sensing",GlobalPar.PPunchVelocitySensing);
xml->beginbranch("AMPLITUDE_ENVELOPE");
GlobalPar.AmpEnvelope->add2XML(xml);
@@ -668,8 +669,8 @@ void ADnoteParameters::add2XML(XMLwrapper *xml){
xml->beginbranch("FREQUENCY_PARAMETERS");
xml->addpar("detune",GlobalPar.PDetune);
- xml->addpar("coarsedetune",GlobalPar.PCoarseDetune);
- xml->addpar("detunetype",GlobalPar.PDetuneType);
+ xml->addpar("coarse_detune",GlobalPar.PCoarseDetune);
+ xml->addpar("detune_type",GlobalPar.PDetuneType);
xml->beginbranch("FREQUENCY_ENVELOPE");
GlobalPar.FreqEnvelope->add2XML(xml);
@@ -682,13 +683,13 @@ void ADnoteParameters::add2XML(XMLwrapper *xml){
xml->beginbranch("FILTER_PARAMETERS");
+ xml->addpar("velocity_sensing_amplitude",GlobalPar.PFilterVelocityScale);
+ xml->addpar("velocity_sensing",GlobalPar.PFilterVelocityScaleFunction);
+
xml->beginbranch("FILTER");
GlobalPar.GlobalFilter->add2XML(xml);
xml->endbranch();
- xml->addpar("velocitysensingamplitude",GlobalPar.PFilterVelocityScale);
- xml->addpar("velocitysensing",GlobalPar.PFilterVelocityScaleFunction);
-
xml->beginbranch("FILTER_ENVELOPE");
GlobalPar.FilterEnvelope->add2XML(xml);
xml->endbranch();
diff --git a/src/Params/Controller.C b/src/Params/Controller.C
@@ -313,12 +313,12 @@ void Controller::add2XML(XMLwrapper *xml){
xml->addpar("expression_receive",expression.receive);
xml->addpar("panning_depth",panning.depth);
- xml->addpar("filtercutoff_depth",filtercutoff.depth);
- xml->addpar("filterq_depth",filterq.depth);
+ xml->addpar("filter_cutoff_depth",filtercutoff.depth);
+ xml->addpar("filter_q_depth",filterq.depth);
xml->addpar("bandwidth_depth",bandwidth.depth);
- xml->addpar("modwheel_depth",modwheel.depth);
- xml->addpar("modwheel_exponential",modwheel.exponential);
- xml->addpar("fmamp_receive",fmamp.receive);
+ xml->addpar("mod_wheel_depth",modwheel.depth);
+ xml->addpar("mod_wheel_exponential",modwheel.exponential);
+ xml->addpar("fm_amp_receive",fmamp.receive);
xml->addpar("volume_receive",volume.receive);
xml->addpar("sustain_receive",sustain.receive);
@@ -329,8 +329,8 @@ void Controller::add2XML(XMLwrapper *xml){
xml->addpar("portamento_portamento",portamento.portamento);
xml->addpar("portamento_updowntimestretch",portamento.updowntimestretch);
- xml->addpar("resonancecenter_depth",resonancecenter.depth);
- xml->addpar("resonancebandwidth_depth",resonancebandwidth.depth);
+ xml->addpar("resonance_center_depth",resonancecenter.depth);
+ xml->addpar("resonance_bandwidth_depth",resonancebandwidth.depth);
};
diff --git a/src/Params/EnvelopeParams.C b/src/Params/EnvelopeParams.C
@@ -214,12 +214,12 @@ void EnvelopeParams::saveloadbuf(Buffer *buf){
};
void EnvelopeParams::add2XML(XMLwrapper *xml){
- xml->addparbool("freemode",Pfreemode);
- xml->addpar("envpoints",Penvpoints);
- xml->addpar("envsustain",Penvsustain);
- xml->addpar("envstretch",Penvstretch);
- xml->addparbool("forcedrelease",Pforcedrelease);
- xml->addparbool("linearenvelope",Plinearenvelope);
+ xml->addparbool("free_mode",Pfreemode);
+ xml->addpar("env_points",Penvpoints);
+ xml->addpar("env_sustain",Penvsustain);
+ xml->addpar("env_stretch",Penvstretch);
+ xml->addparbool("forced_release",Pforcedrelease);
+ xml->addparbool("linear_envelope",Plinearenvelope);
xml->addpar("A_dt",PA_dt);
xml->addpar("D_dt",PD_dt);
xml->addpar("R_dt",PR_dt);
@@ -231,8 +231,8 @@ void EnvelopeParams::add2XML(XMLwrapper *xml){
if (Pfreemode!=0){
for (int i=0;i<Penvpoints;i++){
xml->beginbranch("POINT",i);
- if (i!=0) xml->addpar("envdt",Penvdt[i]);
- xml->addpar("envval",Penvval[i]);
+ if (i!=0) xml->addpar("dt",Penvdt[i]);
+ xml->addpar("val",Penvval[i]);
xml->endbranch();
};
};
diff --git a/src/Params/FilterParams.C b/src/Params/FilterParams.C
@@ -313,17 +313,17 @@ void FilterParams::add2XML(XMLwrapper *xml){
xml->addpar("freq",Pfreq);
xml->addpar("q",Pq);
xml->addpar("stages",Pstages);
- xml->addpar("freqtrack",Pfreqtrack);
+ xml->addpar("freq_track",Pfreqtrack);
xml->addpar("gain",Pgain);
//formant filter parameters
if (Pcategory==1){
- xml->beginbranch("FORMANTFILTER");
- xml->addpar("numformants",Pnumformants);
- xml->addpar("formantslowness",Pformantslowness);
- xml->addpar("vowelclearness",Pvowelclearness);
- xml->addpar("centerfreq",Pcenterfreq);
- xml->addpar("octavesfreq",Poctavesfreq);
+ xml->beginbranch("FORMANT_FILTER");
+ xml->addpar("num_formants",Pnumformants);
+ xml->addpar("formant_slowness",Pformantslowness);
+ xml->addpar("vowel_clearness",Pvowelclearness);
+ xml->addpar("center_freq",Pcenterfreq);
+ xml->addpar("octaves_freq",Poctavesfreq);
for (int nvowel=0;nvowel<FF_MAX_VOWELS;nvowel++){
xml->beginbranch("VOWEL",nvowel);
for (int nformant=0;nformant<FF_MAX_FORMANTS;nformant++){
@@ -335,12 +335,12 @@ void FilterParams::add2XML(XMLwrapper *xml){
};
xml->endbranch();
};
- xml->addpar("sequencesize",Psequencesize);
- xml->addpar("sequencestretch",Psequencestretch);
- xml->addparbool("sequencereversed",Psequencereversed);
+ xml->addpar("sequence_size",Psequencesize);
+ xml->addpar("sequence_stretch",Psequencestretch);
+ xml->addparbool("sequence_reversed",Psequencereversed);
for (int nseq=0;nseq<FF_MAX_SEQUENCE;nseq++){
- xml->beginbranch("SEQUENCEPOS",nseq);
- xml->addpar("nvowel",Psequence[nseq].nvowel);
+ xml->beginbranch("SEQUENCE_POS",nseq);
+ xml->addpar("vowel_id",Psequence[nseq].nvowel);
xml->endbranch();
};
xml->endbranch();
diff --git a/src/Params/LFOParams.C b/src/Params/LFOParams.C
@@ -107,10 +107,10 @@ void LFOParams::saveloadbuf(Buffer *buf){
void LFOParams::add2XML(XMLwrapper *xml){
xml->addpar("freq",Pfreq);
xml->addpar("intensity",Pintensity);
- xml->addpar("startphase",Pstartphase);
- xml->addpar("LFOtype",PLFOtype);
- xml->addpar("randomness",Prandomness);
- xml->addpar("freqrand",Pfreqrand);
+ xml->addpar("start_phase",Pstartphase);
+ xml->addpar("lfo_type",PLFOtype);
+ xml->addpar("randomness_amplitude",Prandomness);
+ xml->addpar("randomness_frequency",Pfreqrand);
xml->addpar("delay",Pdelay);
xml->addparbool("continous",Pcontinous);
};
diff --git a/src/Params/SUBnoteParameters.C b/src/Params/SUBnoteParameters.C
@@ -210,50 +210,51 @@ void SUBnoteParameters::saveloadbuf(Buffer *buf){
void SUBnoteParameters::add2XML(XMLwrapper *xml){
- xml->addpar("numstages",Pnumstages);
- xml->addpar("magtype",Phmagtype);
+ xml->addpar("num_stages",Pnumstages);
+ xml->addpar("harmonic_mag_type",Phmagtype);
xml->addpar("start",Pstart);
- for (int i=0;i<MAX_SUB_HARMONICS;i++){
- if (Phmag[i]==0) continue;
-
- xml->beginbranch("HARMONIC",i);
- xml->addpar("mag",Phmag[i]);
- xml->addpar("relbw",Phrelbw[i]);
- xml->endbranch();
- };
-
+ xml->beginbranch("HARMONICS");
+ for (int i=0;i<MAX_SUB_HARMONICS;i++){
+ if (Phmag[i]==0) continue;
+ xml->beginbranch("HARMONIC",i);
+ xml->addpar("mag",Phmag[i]);
+ xml->addpar("relbw",Phrelbw[i]);
+ xml->endbranch();
+ };
+ xml->endbranch();
+
xml->beginbranch("AMPLITUDE_PARAMETERS");
xml->addparbool("stereo",Pstereo);
xml->addpar("volume",PVolume);
xml->addpar("panning",PPanning);
- xml->addpar("velocitysensing",PAmpVelocityScaleFunction);
+ xml->addpar("velocity_sensing",PAmpVelocityScaleFunction);
xml->beginbranch("AMPLITUDE_ENVELOPE");
AmpEnvelope->add2XML(xml);
xml->endbranch();
xml->endbranch();
xml->beginbranch("FREQUENCY_PARAMETERS");
- xml->addparbool("fixedfreq",Pfixedfreq);
- xml->addpar("fixedfreqet",PfixedfreqET);
+ xml->addparbool("fixed_freq",Pfixedfreq);
+ xml->addpar("fixed_freq_et",PfixedfreqET);
xml->addpar("detune",PDetune);
- xml->addpar("coarsedetune",PCoarseDetune);
- xml->addpar("detunetype",PDetuneType);
+ xml->addpar("coarse_detune",PCoarseDetune);
+ xml->addpar("detune_type",PDetuneType);
xml->addpar("bandwidth",Pbandwidth);
- xml->addpar("bwscale",Pbwscale);
+ xml->addpar("bandwidth_scale",Pbwscale);
- xml->addparbool("freqenvelopeenabled",PFreqEnvelopeEnabled);
+ xml->addparbool("freq_envelope_enabled",PFreqEnvelopeEnabled);
if (PFreqEnvelopeEnabled!=0){
xml->beginbranch("FREQUENCY_ENVELOPE");
FreqEnvelope->add2XML(xml);
xml->endbranch();
};
- xml->addparbool("bandwidthenvelopeenabled",PBandWidthEnvelopeEnabled);
+ xml->addparbool("band_width_envelope_enabled",PBandWidthEnvelopeEnabled);
if (PBandWidthEnvelopeEnabled!=0){
- xml->beginbranch("BANCWIDTH_ENVELOPE");
+ xml->beginbranch("BANDWIDTH_ENVELOPE");
BandWidthEnvelope->add2XML(xml);
xml->endbranch();
};
@@ -266,8 +267,8 @@ void SUBnoteParameters::add2XML(XMLwrapper *xml){
GlobalFilter->add2XML(xml);
xml->endbranch();
- xml->addpar("filtervelocitysensing",PGlobalFilterVelocityScaleFunction);
- xml->addpar("filtervelocitysensingamplitude",PGlobalFilterVelocityScale);
+ xml->addpar("filter_velocity_sensing",PGlobalFilterVelocityScaleFunction);
+ xml->addpar("filter_velocity_sensing_amplitude",PGlobalFilterVelocityScale);
xml->beginbranch("FILTER_ENVELOPE");
GlobalFilterEnvelope->add2XML(xml);
diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.C
@@ -819,33 +819,36 @@ void OscilGen::saveloadbuf(Buffer *buf){
void OscilGen::add2XML(XMLwrapper *xml){
- for (int n=0;n<MAX_AD_HARMONICS;n++){
- if ((Phmag[n]==64)&&(Phphase[n]==64)) continue;
- xml->beginbranch("HARMONIC",n);
- xml->addpar("mag",Phmag[n]);
- xml->addpar("phase",Phphase[n]);
- xml->endbranch();
- };
-
- xml->addpar("hmagtype",Phmagtype);
- xml->addpar("normalizemethod",Pnormalizemethod);
+ xml->addpar("harmonic_mag_type",Phmagtype);
+ xml->addpar("normalize_method",Pnormalizemethod);
- xml->addpar("currentbasefunc",Pcurrentbasefunc);
- xml->addpar("basefuncpar",Pbasefuncpar);
+ xml->addpar("base_function",Pcurrentbasefunc);
+ xml->addpar("base_function_par",Pbasefuncpar);
- xml->addpar("waveshaping",Pwaveshaping);
- xml->addpar("waveshapingfunction",Pwaveshapingfunction);
+ xml->addpar("wave_shaping",Pwaveshaping);
+ xml->addpar("wave_shaping_function",Pwaveshapingfunction);
- xml->addpar("filtertype",Pfiltertype);
- xml->addpar("filterpar",Pfilterpar);
- xml->addpar("filterbeforews",Pfilterbeforews);
+ xml->addpar("filter_type",Pfiltertype);
+ xml->addpar("filter_par",Pfilterpar);
+ xml->addpar("filter_before_wave_shaping",Pfilterbeforews);
- xml->addpar("satype",Psatype);
- xml->addpar("sapar",Psapar);
+ xml->addpar("spectrum_adjust_type",Psatype);
+ xml->addpar("spectrum_adjust_par",Psapar);
xml->addpar("rand",Prand);
- xml->addpar("amprandtype",Pamprandtype);
- xml->addpar("amprandpower",Pamprandpower);
+ xml->addpar("amp_rand_type",Pamprandtype);
+ xml->addpar("amp_rand_power",Pamprandpower);
+
+ xml->beginbranch("HARMONICS");
+ for (int n=0;n<MAX_AD_HARMONICS;n++){
+ if ((Phmag[n]==64)&&(Phphase[n]==64)) continue;
+ xml->beginbranch("HARMONIC",n);
+ xml->addpar("mag",Phmag[n]);
+ xml->addpar("phase",Phphase[n]);
+ xml->endbranch();
+ };
+ xml->endbranch();
+
};
