diff options
| -rw-r--r-- | muse/ChangeLog | 4 | ||||
| -rw-r--r-- | muse/synti/deicsonze/TODO | 7 | ||||
| -rw-r--r-- | muse/synti/deicsonze/deicsonze.cpp | 113 | ||||
| -rw-r--r-- | muse/synti/deicsonze/deicsonze.h | 27 | ||||
| -rw-r--r-- | muse/synti/deicsonze/deicsonzegui.cpp | 1 | ||||
| -rw-r--r-- | muse/synti/deicsonze/deicsonzegui.ui | 332 | ||||
| -rw-r--r-- | muse/synti/deicsonze/deicsonzeplugin.cpp | 19 | ||||
| -rw-r--r-- | muse/synti/deicsonze/deicsonzepreset.h | 2 |
8 files changed, 309 insertions, 196 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog index dc332931..dd698c7e 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,3 +1,7 @@ +06.12 (ng) deicsonze + - fix pitchbend + - fix some logarithm volume issues + - fix sustain pedal 04.12 (ng) - fix deicsonze FX plugin bugs - add AbstractSlider::setMinLogValue(), AbstractSlider::setMaxLogValue() diff --git a/muse/synti/deicsonze/TODO b/muse/synti/deicsonze/TODO index 34a75f67..06bb119d 100644 --- a/muse/synti/deicsonze/TODO +++ b/muse/synti/deicsonze/TODO @@ -1,7 +1,5 @@ -- Pitch Bend CTRL -- Modulation CTRL -- LFO Delay (bug) -- Rate Scaling +- Fix LFO Delay bug and modulation CTRL +- Eg Rate Scaling - Foot Control, Modulation Wheel, Breath Control, After Touch - analogue reverb - Change presetName subcategoryName category with SysEx @@ -12,3 +10,4 @@ - Pan per voices - Load BUMP preset - calibrate portamento and pitch envelope to fit real DX11 +- make deicsonze loadable as standalone by mus diff --git a/muse/synti/deicsonze/deicsonze.cpp b/muse/synti/deicsonze/deicsonze.cpp index 7ae25453..05b388cd 100644 --- a/muse/synti/deicsonze/deicsonze.cpp +++ b/muse/synti/deicsonze/deicsonze.cpp @@ -157,6 +157,17 @@ DeicsOnze::DeicsOnze() : Mess(2) { (const unsigned char*)dataMasterVol, 2); _gui->writeEvent(evSysexMasterVol); + //update return fx + unsigned char *dataReverbRet = new unsigned char[2]; + dataReverbRet[0]=SYSEX_REVERBRETURN; + dataReverbRet[1]=(unsigned char)getReverbReturn(); + MidiEvent evReverbRet(0,ME_SYSEX,(const unsigned char*)dataReverbRet, 2); + _gui->writeEvent(evReverbRet); + unsigned char *dataChorusRet = new unsigned char[2]; + dataChorusRet[0]=SYSEX_CHORUSRETURN; + dataChorusRet[1]=(unsigned char)getChorusReturn(); + MidiEvent evChorusRet(0,ME_SYSEX,(const unsigned char*)dataChorusRet, 2); + _gui->writeEvent(evChorusRet); //update font size unsigned char *dataFontSize = new unsigned char[2]; dataFontSize[0]=SYSEX_FONTSIZE; @@ -495,9 +506,9 @@ void DeicsOnze::initGlobal() { _global.quality = high; _global.fontSize = 9; _global.isChorusActivated = false; - _global.chorusReturn = 128.0/(float)MAXFXRETURN; + _global.chorusReturn = level2amp(INITFXRETURN); _global.isReverbActivated = false; - _global.reverbReturn = 128.0/(float)MAXFXRETURN; + _global.reverbReturn = level2amp(INITFXRETURN); initChannels(); } @@ -648,7 +659,7 @@ void DeicsOnze::setNbrVoices(int c, int nv) { // setMasterVol //---------------------------------------------------------------- void DeicsOnze::setMasterVol(int mv) { - _global.masterVolume=(double)mv/(double)MAXMASTERVOLUME; + _global.masterVolume=level2amp(mv); //watch out that MAXMASTERVOLUME==255 } //---------------------------------------------------------------- // setChannelEnable @@ -666,11 +677,11 @@ void DeicsOnze::setChannelVol(int c, int v) { void DeicsOnze::applyChannelAmp(int c) { _global.channel[c].ampLeft = - ((double)_global.channel[c].volume/(double)MAXCHANNELVOLUME) + level2amp(_global.channel[c].volume) * ((double)(MAXCHANNELPAN - _global.channel[c].pan) /(double)(2*MAXCHANNELPAN)); _global.channel[c].ampRight = - ((double)_global.channel[c].volume/(double)MAXCHANNELVOLUME) + level2amp(_global.channel[c].volume) * ((double)(MAXCHANNELPAN + _global.channel[c].pan) /(double)(2*MAXCHANNELPAN)); } @@ -715,27 +726,27 @@ void DeicsOnze::setChannelRelease(int c, int r) { // setChannelReverb //---------------------------------------------------------------- void DeicsOnze::setChannelReverb(int c, int r) { - _global.channel[c].reverbAmount = (float)r/127.0; + _global.channel[c].reverbAmount = (float)lowlevel2amp(r); } //---------------------------------------------------------------- // setChannelChorus //---------------------------------------------------------------- void DeicsOnze::setChannelChorus(int c, int val) { - _global.channel[c].chorusAmount = (float)val/127.0; + _global.channel[c].chorusAmount = (float)lowlevel2amp(val); } //---------------------------------------------------------------- // setChorusReturn //---------------------------------------------------------------- void DeicsOnze::setChorusReturn(int val) { - _global.chorusReturn = 2.0*(float)val/(float)MAXFXRETURN; + _global.chorusReturn = 2.0*(float)level2amp(val); //beware MAXFXRETURN==255 } //---------------------------------------------------------------- // setReverbReturn //---------------------------------------------------------------- void DeicsOnze::setReverbReturn(int val) { - _global.reverbReturn = 2.0*(float)val/(float)MAXFXRETURN; + _global.reverbReturn = 2.0*(float)level2amp(val); //beware MAXFXRETURN==255 } //---------------------------------------------------------------- @@ -748,7 +759,7 @@ int DeicsOnze::getNbrVoices(int c) const { // getMasterVol //---------------------------------------------------------------- int DeicsOnze::getMasterVol(void) const { - return((int)(_global.masterVolume*(double)MAXMASTERVOLUME)); + return(amp2level(_global.masterVolume)); } //---------------------------------------------------------------- // getChannelEnable @@ -805,25 +816,25 @@ int DeicsOnze::getChannelRelease(int c) const { // getChannelReverb //---------------------------------------------------------------- int DeicsOnze::getChannelReverb(int c) const { - return((int)(_global.channel[c].reverbAmount*127.0)); + return(amp2lowlevel(_global.channel[c].reverbAmount)); } //---------------------------------------------------------------- // getChannelChorus //---------------------------------------------------------------- int DeicsOnze::getChannelChorus(int c) const { - return((int)(_global.channel[c].chorusAmount*127.0)); + return(amp2lowlevel(_global.channel[c].chorusAmount)); } //---------------------------------------------------------------- // getChorusReturn //---------------------------------------------------------------- int DeicsOnze::getChorusReturn() const { - return((int)(_global.chorusReturn*(float)MAXFXRETURN/2.0)); + return(amp2level(_global.chorusReturn/2.0)); } //---------------------------------------------------------------- -// getReturnReturn +// getReverbReturn //---------------------------------------------------------------- int DeicsOnze::getReverbReturn() const { - return((int)(_global.reverbReturn*(float)MAXFXRETURN/2.0)); + return(amp2level(_global.chorusReturn/2.0)); } //---------------------------------------------------------------- @@ -1635,6 +1646,62 @@ inline double outLevel2Amp(int ol) { } //--------------------------------------------------------- +// lowlevel2amp, +// 127->0dB->1.0, 0->-27dB->0 +//--------------------------------------------------------- +inline double lowlevel2amp(int l) { + double a, b, c, db; + if(l==0) return 0.0; + else { + a = 27.0/127.0; + b = -27.0; + db = a*l+b; + c = -log(2)/3; + return exp(-c*db); + } +} + +//--------------------------------------------------------- +// level2amp, +// 255->0dB->1.0, 0->-27dB->0 +//--------------------------------------------------------- +inline double level2amp(int l) { + double a, b, c, db; + if(l==0) return 0.0; + else { + a = 27.0/255.0; + b = -27.0; + db = a*l+b; + c = -log(2.0)/3.0; + return exp(-c*db); + } +} + +//--------------------------------------------------------- +// amp2level +// 1.0->0dB->255, 0->-27dB->0 +//--------------------------------------------------------- +inline int amp2level(double amp){ + double a, b, c; + a = 255.0/27.0; + b = 255.0; + c = log(2.0)/3.0; + return (int)(a*(log(amp)/c)+b); +} + +//--------------------------------------------------------- +// amp2lowlevel +// 1.0->0dB->127, 0->-27dB->0 +//--------------------------------------------------------- +inline int amp2lowlevel(double amp){ + double a, b, c; + a = 127.0/27.0; + b = 127.0; + c = log(2.0)/3.0; + return (int)(a*(log(amp)/c)+b); +} + +//--------------------------------------------------------- // velo2RAmp, AmpR between 0.0 and 1.0 // return an amplitude ratio with respect to _preset->sensitivity.keyVelocity //--------------------------------------------------------- @@ -1801,7 +1868,7 @@ void DeicsOnze::programSelect(int c, int hbank, int lbank, int prog) { // setModulation //--------------------------------------------------------- void DeicsOnze::setModulation(int c, int val) { - _preset[c]->modulation = (unsigned char) val; + _global.channel[c].modulation = (unsigned char) val; } //--------------------------------------------------------- // setPitchBendCoef @@ -2171,13 +2238,11 @@ void DeicsOnze::getInitData(int* length, const unsigned char** data) { MAXSTRLENGTHFXLABEL); //save FX parameters //reverb - printf("SAVE REVERB\n"); for(int i = 0; i < _pluginIReverb->plugin()->parameter(); i++) { float val = (float)getReverbParam(i); memcpy(&buffer[NUM_CONFIGLENGTH + sizeof(float)*i], &val, sizeof(float)); } //chorus - printf("SAVE CHORUS\n"); for(int i = 0; i < _pluginIChorus->plugin()->parameter(); i++) { float val = (float)getChorusParam(i); memcpy(&buffer[NUM_CONFIGLENGTH @@ -2366,7 +2431,6 @@ void DeicsOnze::parseInitData(int length, const unsigned char* data) { _gui->writeEvent(evReverbRet); initPluginReverb(plugins.find((const char*)&data[NUM_REVERB_LIB], (const char*)&data[NUM_REVERB_LABEL])); - printf("LOAD REVERB\n"); for(int i = 0; i < _pluginIReverb->plugin()->parameter(); i++) { float val; memcpy(&val, &data[NUM_CONFIGLENGTH + sizeof(float)*i], sizeof(float)); @@ -3145,11 +3209,13 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) { } } break; case CTRL_MODULATION: - printf("TODO : CONTROLE MODULATION %d\n", val); setModulation(ch, val); + if(!fromGui) { + MidiEvent ev(0, ch, ME_CONTROLLER, CTRL_MODULATION, val); + _gui->writeEvent(ev); + } break; case CTRL_PITCH: - printf("CONTROLE PITCH %d\n", val); setPitchBendCoef(ch, val); break; case CTRL_PANPOT: @@ -3321,7 +3387,7 @@ bool DeicsOnze::playNote(int ch, int pitch, int velo) { if(_global.channel[ch].isEnable) { if(velo==0) {//Note off p2V=pitchOn2Voice(ch, pitch); - printf("Note Off : pitchOn2Voice = %d\n", p2V); + //printf("Note Off : pitchOn2Voice = %d\n", p2V); if(p2V<_global.channel[ch].nbrVoices) { if(_global.channel[ch].sustain) _global.channel[ch].voices[p2V].isSustained = true; @@ -3381,7 +3447,7 @@ bool DeicsOnze::playNote(int ch, int pitch, int velo) { { nO2V=noteOff2Voice(ch); newVoice=((nO2V==MAXNBRVOICES)?minVolu2Voice(ch):nO2V); - printf("Note On : ch = %d, v = %d, p = %d\n", ch, newVoice, pitch); + //printf("Note On : ch = %d, v = %d, p = %d\n", ch, newVoice, pitch); //---------- //portamento @@ -3513,6 +3579,7 @@ bool DeicsOnze::playNote(int ch, int pitch, int velo) { //some initializations //-------------------- _global.channel[ch].voices[newVoice].keyOn = true; + _global.channel[ch].voices[newVoice].isSustained = false; _global.channel[ch].voices[newVoice].isOn = true; _global.channel[ch].voices[newVoice].pitch = pitch; _global.channel[ch].isLastNote = true; diff --git a/muse/synti/deicsonze/deicsonze.h b/muse/synti/deicsonze/deicsonze.h index 646eb930..37a6d5af 100644 --- a/muse/synti/deicsonze/deicsonze.h +++ b/muse/synti/deicsonze/deicsonze.h @@ -102,7 +102,7 @@ #define SYSEX_MASTERVOL 4 #define MASTERVOLSTR "MasterVolume" #define MAXMASTERVOLUME 255 -#define INITMASTERVOL 96 +#define INITMASTERVOL 192 #define SYSEX_QUALITY 5 #define QUALITYSTR "Quality" #define HIGHSTR "High" @@ -141,6 +141,7 @@ #define SYSEX_CHORUSRETURN 80 #define SYSEX_REVERBRETURN 81 #define MAXFXRETURN 255 +#define INITFXRETURN 192 #define SYSEX_SELECTREVERB 82 #define SYSEX_SELECTCHORUS 83 #define SYSEX_BUILDGUIREVERB 84 @@ -208,6 +209,30 @@ class DeicsOnzePlugin; inline double outLevel2Amp(int ol); //--------------------------------------------------------- +// level2amp, +// 255->0dB->1.0, 0->-27dB->0 +//--------------------------------------------------------- +inline double level2amp(int l); + +//--------------------------------------------------------- +// amp2level +// 1.0->0dB->255, 0->-27dB->0 +//--------------------------------------------------------- +inline int amp2level(double amp); + +//--------------------------------------------------------- +// amp2lowlevel +// 1.0->0dB->127, 0->-27dB->0 +//--------------------------------------------------------- +inline int amp2lowlevel(double amp); + +//--------------------------------------------------------- +// lowlevel2amp, +// 127->0dB->1.0, 0->-27dB->0 +//--------------------------------------------------------- +inline double lowlevel2amp(int l); + +//--------------------------------------------------------- // envAR2s // return the time in second of the ATTACK duration //--------------------------------------------------------- diff --git a/muse/synti/deicsonze/deicsonzegui.cpp b/muse/synti/deicsonze/deicsonzegui.cpp index 0abafb4c..14076fb4 100644 --- a/muse/synti/deicsonze/deicsonzegui.cpp +++ b/muse/synti/deicsonze/deicsonzegui.cpp @@ -1405,6 +1405,7 @@ void DeicsOnzeGui::processEvent(const MidiEvent& ev) { case CTRL_RELEASE_TIME: updateRelease(val); break; case CTRL_CHORUS_SEND: updateChannelChorus(val); break; case CTRL_REVERB_SEND: updateChannelReverb(val); break; + case CTRL_MODULATION: updateModulation(val); break; case CTRL_PROGRAM : int hbank = (val & 0xff0000) >> 16; int lbank = (val & 0xff00) >> 8; diff --git a/muse/synti/deicsonze/deicsonzegui.ui b/muse/synti/deicsonze/deicsonzegui.ui index 7f350d30..14fab8b0 100644 --- a/muse/synti/deicsonze/deicsonzegui.ui +++ b/muse/synti/deicsonze/deicsonzegui.ui @@ -7000,7 +7000,7 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin </size> </property> <property name="value" > - <double>-9.591195299377981</double> + <double>-9.319760856591806</double> </property> <property name="minValue" > <double>0.000000000000000</double> @@ -7024,15 +7024,15 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <layoutdefault spacing="6" margin="11" /> <customwidgets> <customwidget> - <class>Awl::Knob</class> - <extends>QWidget</extends> - <header>awl/knob.h</header> - </customwidget> - <customwidget> <class>Awl::VolKnob</class> <extends>Awl::Knob</extends> <header>awl/volknob.h</header> </customwidget> + <customwidget> + <class>Awl::Knob</class> + <extends>QWidget</extends> + <header>awl/knob.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>deicsOnzeTabWidget</tabstop> @@ -7164,12 +7164,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>445</x> + <y>170</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>606</x> + <y>173</y> </hint> </hints> </connection> @@ -7180,12 +7180,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>606</x> + <y>173</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>445</x> + <y>170</y> </hint> </hints> </connection> @@ -7196,12 +7196,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>252</x> + <y>270</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>273</y> </hint> </hints> </connection> @@ -7212,12 +7212,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>273</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>252</x> + <y>270</y> </hint> </hints> </connection> @@ -7228,12 +7228,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>252</x> + <y>301</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>304</y> </hint> </hints> </connection> @@ -7244,12 +7244,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>304</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>252</x> + <y>301</y> </hint> </hints> </connection> @@ -7260,12 +7260,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>335</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>332</y> </hint> </hints> </connection> @@ -7276,12 +7276,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>366</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>363</y> </hint> </hints> </connection> @@ -7292,12 +7292,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>394</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>397</y> </hint> </hints> </connection> @@ -7308,12 +7308,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>397</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>394</y> </hint> </hints> </connection> @@ -7324,12 +7324,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>425</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>428</y> </hint> </hints> </connection> @@ -7340,12 +7340,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>428</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>425</y> </hint> </hints> </connection> @@ -7356,12 +7356,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>110</x> - <y>109</y> + <x>194</x> + <y>332</y> </hint> <hint type="destinationlabel" > - <x>110</x> - <y>109</y> + <x>304</x> + <y>335</y> </hint> </hints> </connection> @@ -8317,11 +8317,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8333,11 +8333,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8349,11 +8349,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8365,11 +8365,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8381,11 +8381,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8397,11 +8397,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8412,12 +8412,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>229</x> - <y>208</y> + <x>240</x> + <y>207</y> </hint> <hint type="destinationlabel" > - <x>596</x> - <y>211</y> + <x>607</x> + <y>210</y> </hint> </hints> </connection> @@ -8428,12 +8428,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>596</x> - <y>211</y> + <x>607</x> + <y>210</y> </hint> <hint type="destinationlabel" > - <x>229</x> - <y>208</y> + <x>240</x> + <y>207</y> </hint> </hints> </connection> @@ -8509,11 +8509,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8525,11 +8525,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8541,11 +8541,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8557,11 +8557,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8573,11 +8573,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8589,11 +8589,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8605,11 +8605,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8621,11 +8621,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8637,11 +8637,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8653,11 +8653,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8669,11 +8669,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8685,11 +8685,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8701,11 +8701,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8717,11 +8717,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8733,11 +8733,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8749,11 +8749,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8765,11 +8765,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8781,11 +8781,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8797,11 +8797,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8813,11 +8813,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8829,11 +8829,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8845,11 +8845,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8861,11 +8861,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8877,11 +8877,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8893,11 +8893,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8909,11 +8909,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8925,11 +8925,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8941,11 +8941,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8957,11 +8957,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -8973,11 +8973,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -9005,11 +9005,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -9021,11 +9021,11 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <hints> <hint type="sourcelabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> <hint type="destinationlabel" > <x>110</x> - <y>116</y> + <y>115</y> </hint> </hints> </connection> @@ -9036,12 +9036,12 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>544</x> - <y>142</y> + <x>110</x> + <y>115</y> </hint> <hint type="destinationlabel" > - <x>581</x> - <y>135</y> + <x>110</x> + <y>115</y> </hint> </hints> </connection> @@ -9052,12 +9052,44 @@ Wave form 8 = <i>if <b>t</b>&#060 pi then sin(2*<b>t</b>)*sin <slot>setValue(int)</slot> <hints> <hint type="sourcelabel" > - <x>575</x> - <y>149</y> + <x>110</x> + <y>115</y> + </hint> + <hint type="destinationlabel" > + <x>110</x> + <y>115</y> + </hint> + </hints> + </connection> + <connection> + <sender>transposeSlider</sender> + <signal>valueChanged(int)</signal> + <receiver>transposeSpinBox</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel" > + <x>203</x> + <y>163</y> + </hint> + <hint type="destinationlabel" > + <x>287</x> + <y>171</y> + </hint> + </hints> + </connection> + <connection> + <sender>transposeSpinBox</sender> + <signal>valueChanged(int)</signal> + <receiver>transposeSlider</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel" > + <x>270</x> + <y>156</y> </hint> <hint type="destinationlabel" > - <x>495</x> - <y>148</y> + <x>169</x> + <y>157</y> </hint> </hints> </connection> diff --git a/muse/synti/deicsonze/deicsonzeplugin.cpp b/muse/synti/deicsonze/deicsonzeplugin.cpp index e8a453fe..2823bd75 100644 --- a/muse/synti/deicsonze/deicsonzeplugin.cpp +++ b/muse/synti/deicsonze/deicsonzeplugin.cpp @@ -86,25 +86,17 @@ void DeicsOnze::initPluginChorus(Plugin* pluginChorus) { } void DeicsOnze::setReverbParam(int index, double val) { - printf("SET REVERB PARAM index = %d, val = %f\n", index, val); _pluginIReverb->controller(index)->setCurVal((float)val); - getReverbParam(index); } void DeicsOnze::setChorusParam(int index, double val) { - printf("SET CHORUS PARAM index = %d, val = %f\n", index, val); _pluginIChorus->controller(index)->setCurVal((float)val); - getChorusParam(index); } double DeicsOnze::getReverbParam(int index) { - printf("GET REVERB PARAM index = %d, val = %f\n", - index, _pluginIReverb->controller(index)->curVal().f); return _pluginIReverb->controller(index)->curVal().f; } double DeicsOnze::getChorusParam(int index) { - printf("GET CHORUS PARAM index = %d, val = %f\n", - index, _pluginIChorus->controller(index)->curVal().f); return _pluginIChorus->controller(index)->curVal().f; } @@ -193,7 +185,6 @@ void DeicsOnzeGui::addPluginSlider(int index, QString text, bool isLog, } void DeicsOnzeGui::buildGuiReverb() { - printf("BUILD\n"); PluginI* plugI = _deicsOnze->_pluginIReverb; QString name = plugI->name(); name.resize(name.size()-2); @@ -220,8 +211,7 @@ void DeicsOnzeGui::buildGuiReverb() { double min, max, val; plugI->range(i, &min, &max); val = _deicsOnze->getReverbParam(i); - printf("BUILD REVERB %d, %f\n", i, val); - if(plugI->isBool(i)) + if(plugI->isBool(i)) addPluginCheckBox(i, plugI->getParameterName(i), val > 0.0, _reverbSuperWidget, grid, true); else if(plugI->isInt(i)) { @@ -286,7 +276,6 @@ void DeicsOnzeGui::buildGuiChorus() { //of the parameter because it sends a double and does not //change any thing void DeicsOnzeGui::setReverbCheckBox(double v, int i) { - printf("setReverbCheckBox(%f, %d)\n", v, i); float f = (float)v; unsigned char* message = new unsigned char[2+sizeof(float)]; message[0]=SYSEX_REVERBPARAM; @@ -302,8 +291,7 @@ void DeicsOnzeGui::setReverbCheckBox(double v, int i) { //of the parameter because it sends a double and does not //change any thing void DeicsOnzeGui::setChorusCheckBox(double v, int i) { - printf("setChorusCheckBox(%f, %d)\n", v, i); - float f = (float)v; + float f = (float)v; unsigned char* message = new unsigned char[2+sizeof(float)]; message[0]=SYSEX_CHORUSPARAM; if(i<256) { @@ -333,7 +321,6 @@ void DeicsOnzeGui::setChorusFloatEntry(double v, int i) { setChorusCheckBox(v, i); //because this send the SYSEX } void DeicsOnzeGui::setChorusSlider(double v, int i) { - printf("setChorusSlider(%f, %i)\n", v, i); if(_deicsOnze->_pluginIChorus->isInt(i)) v = rint(v); updateChorusSlider(v, i); updateChorusFloatEntry(v, i); @@ -356,7 +343,6 @@ void DeicsOnzeGui::updateReverbFloatEntry(double v, int i) { } } void DeicsOnzeGui::updateChorusSlider(double v, int i) { - printf("updateChorusSlider(%f, %i)\n", v, i); if(i < (int)_reverbSliderVector.size() && _reverbSliderVector[i]) { _chorusSliderVector[i]->blockSignals(true); _chorusSliderVector[i]->setValue(v); @@ -364,7 +350,6 @@ void DeicsOnzeGui::updateChorusSlider(double v, int i) { } } void DeicsOnzeGui::updateChorusFloatEntry(double v, int i) { - printf("updateChorusFloatEntry(%f, %i)\n", v, i); if(i < (int)_chorusFloatEntryVector.size() && _chorusFloatEntryVector[i]) { _chorusFloatEntryVector[i]->blockSignals(true); _chorusFloatEntryVector[i]->setValue(v); diff --git a/muse/synti/deicsonze/deicsonzepreset.h b/muse/synti/deicsonze/deicsonzepreset.h index 5039ddf7..a5391e33 100644 --- a/muse/synti/deicsonze/deicsonzepreset.h +++ b/muse/synti/deicsonze/deicsonzepreset.h @@ -466,7 +466,7 @@ class Preset { Function function; //int globalDetune; //-31 to 31 //now to the channel std::string name; - unsigned char modulation; //0 to 127 + //unsigned char modulation; //0 to 127 int prog; //0 to 127 //Methods void printPreset(); |