parent
a57360d261
commit
98cd1d1ead
5 changed files with 18 additions and 29 deletions
|
@ -90,8 +90,7 @@
|
||||||
<MODULEPATH id="juce_audio_utils" path="modules"/>
|
<MODULEPATH id="juce_audio_utils" path="modules"/>
|
||||||
</MODULEPATHS>
|
</MODULEPATHS>
|
||||||
</XCODE_MAC>
|
</XCODE_MAC>
|
||||||
<LINUX_MAKE targetFolder="Builds/LinuxMakefile" smallIcon="nnY63W" bigIcon="nnY63W"
|
<LINUX_MAKE targetFolder="Builds/LinuxMakefile" smallIcon="nnY63W" bigIcon="nnY63W">
|
||||||
vstLegacyFolder="modules/vstsdk2.4">
|
|
||||||
<CONFIGURATIONS>
|
<CONFIGURATIONS>
|
||||||
<CONFIGURATION name="Release64" libraryPath="/usr/X11R6/lib/" isDebug="0" optimisation="3"
|
<CONFIGURATION name="Release64" libraryPath="/usr/X11R6/lib/" isDebug="0" optimisation="3"
|
||||||
targetName="Obxd64"/>
|
targetName="Obxd64"/>
|
||||||
|
@ -140,8 +139,8 @@
|
||||||
<VS2019 targetFolder="Builds/VisualStudio2019" smallIcon="nnY63W" bigIcon="nnY63W">
|
<VS2019 targetFolder="Builds/VisualStudio2019" smallIcon="nnY63W" bigIcon="nnY63W">
|
||||||
<CONFIGURATIONS>
|
<CONFIGURATIONS>
|
||||||
<CONFIGURATION isDebug="1" name="Debug" useRuntimeLibDLL="0"/>
|
<CONFIGURATION isDebug="1" name="Debug" useRuntimeLibDLL="0"/>
|
||||||
<CONFIGURATION isDebug="0" name="Release32" useRuntimeLibDLL="0" winArchitecture="Win32"/>
|
<CONFIGURATION isDebug="0" name="Release32" useRuntimeLibDLL="0"/>
|
||||||
<CONFIGURATION isDebug="0" name="Release64" useRuntimeLibDLL="0"/>
|
<CONFIGURATION isDebug="0" name="Release64" useRuntimeLibDLL="0" winArchitecture="Win32"/>
|
||||||
</CONFIGURATIONS>
|
</CONFIGURATIONS>
|
||||||
<MODULEPATHS>
|
<MODULEPATHS>
|
||||||
<MODULEPATH id="juce_opengl"/>
|
<MODULEPATH id="juce_opengl"/>
|
||||||
|
|
|
@ -48,8 +48,9 @@ public:
|
||||||
bool vibratoEnabled;
|
bool vibratoEnabled;
|
||||||
|
|
||||||
float Volume;
|
float Volume;
|
||||||
const static int MAX_VOICES=8;
|
const static int MAX_VOICES = 32;
|
||||||
float pannings[MAX_VOICES];
|
const static int MAX_PANNINGS = 8;
|
||||||
|
float pannings[MAX_PANNINGS];
|
||||||
ObxdVoice voices[MAX_VOICES];
|
ObxdVoice voices[MAX_VOICES];
|
||||||
bool uni;
|
bool uni;
|
||||||
bool Oversample;
|
bool Oversample;
|
||||||
|
@ -79,7 +80,7 @@ public:
|
||||||
// pannings = new float[MAX_VOICES];
|
// pannings = new float[MAX_VOICES];
|
||||||
totalvc = MAX_VOICES;
|
totalvc = MAX_VOICES;
|
||||||
vq = VoiceQueue(MAX_VOICES,voices);
|
vq = VoiceQueue(MAX_VOICES,voices);
|
||||||
for(int i = 0 ; i < MAX_VOICES;++i)
|
for(int i = 0 ; i < MAX_PANNINGS;++i)
|
||||||
{
|
{
|
||||||
pannings[i]= 0.5;
|
pannings[i]= 0.5;
|
||||||
}
|
}
|
||||||
|
@ -362,11 +363,12 @@ public:
|
||||||
float x1 = processSynthVoice(voices[i],lfovalue,viblfo);
|
float x1 = processSynthVoice(voices[i],lfovalue,viblfo);
|
||||||
if(Oversample)
|
if(Oversample)
|
||||||
{
|
{
|
||||||
float x2 = processSynthVoice(voices[i],lfovalue2,viblfo2); vlo+=x2*(1-pannings[i]);
|
float x2 = processSynthVoice(voices[i],lfovalue2,viblfo2);
|
||||||
vro+=x2*(pannings[i]);
|
vlo+=x2*(1-pannings[i % MAX_PANNINGS]);
|
||||||
|
vro+=x2*(pannings[i % MAX_PANNINGS]);
|
||||||
}
|
}
|
||||||
vl+=x1*(1-pannings[i]);
|
vl+=x1*(1-pannings[i % MAX_PANNINGS]);
|
||||||
vr+=x1*(pannings[i]);
|
vr+=x1*(pannings[i % MAX_PANNINGS]);
|
||||||
}
|
}
|
||||||
if(Oversample)
|
if(Oversample)
|
||||||
{
|
{
|
||||||
|
|
|
@ -166,7 +166,7 @@ public:
|
||||||
}
|
}
|
||||||
void setVoiceCount(float param)
|
void setVoiceCount(float param)
|
||||||
{
|
{
|
||||||
synth.setVoiceCount(roundToInt((param*7) +1));
|
synth.setVoiceCount(roundToInt((param*(synth.MAX_VOICES-1)) +1));
|
||||||
}
|
}
|
||||||
void procPitchWheelAmount(float param)
|
void procPitchWheelAmount(float param)
|
||||||
{
|
{
|
||||||
|
@ -184,7 +184,7 @@ public:
|
||||||
}
|
}
|
||||||
void processPan(float param,int idx)
|
void processPan(float param,int idx)
|
||||||
{
|
{
|
||||||
synth.pannings[idx-1] = param;
|
synth.pannings[(idx-1) % synth.MAX_PANNINGS] = param;
|
||||||
}
|
}
|
||||||
void processTune(float param)
|
void processTune(float param)
|
||||||
{
|
{
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 5.8 KiB |
|
@ -287,14 +287,8 @@ void ObxdAudioProcessorEditor::rebuildComponents()
|
||||||
envelopeDetuneKnob = addTinyKnob(1353,300,ownerFilter,ENVDER,"Env",0.2);
|
envelopeDetuneKnob = addTinyKnob(1353,300,ownerFilter,ENVDER,"Env",0.2);
|
||||||
|
|
||||||
voiceSwitch = addNormalButtonList(124,338,17,ownerFilter,VOICE_COUNT,"VoiceCount",ImageCache::getFromMemory(BinaryData::voices_png,BinaryData::voices_pngSize));
|
voiceSwitch = addNormalButtonList(124,338,17,ownerFilter,VOICE_COUNT,"VoiceCount",ImageCache::getFromMemory(BinaryData::voices_png,BinaryData::voices_pngSize));
|
||||||
voiceSwitch ->addChoise("1");
|
for (int i=1; i <= 32; i++)
|
||||||
voiceSwitch ->addChoise("2");
|
voiceSwitch ->addChoise(String(i));
|
||||||
voiceSwitch ->addChoise("3");
|
|
||||||
voiceSwitch ->addChoise("4");
|
|
||||||
voiceSwitch ->addChoise("5");
|
|
||||||
voiceSwitch ->addChoise("6");
|
|
||||||
voiceSwitch ->addChoise("7");
|
|
||||||
voiceSwitch ->addChoise("8");
|
|
||||||
voiceSwitch ->setValue(ownerFilter->getParameter(VOICE_COUNT),dontSendNotification);
|
voiceSwitch ->setValue(ownerFilter->getParameter(VOICE_COUNT),dontSendNotification);
|
||||||
|
|
||||||
legatoSwitch = addNormalButtonList(25,338,65,ownerFilter,LEGATOMODE,"Legato",ImageCache::getFromMemory(BinaryData::legato_png,BinaryData::legato_pngSize));
|
legatoSwitch = addNormalButtonList(25,338,65,ownerFilter,LEGATOMODE,"Legato",ImageCache::getFromMemory(BinaryData::legato_png,BinaryData::legato_pngSize));
|
||||||
|
@ -400,14 +394,8 @@ void ObxdAudioProcessorEditor::rebuildComponents()
|
||||||
bendLfoRateKnob = addNormalKnobClassic(364,345,ownerFilter,BENDLFORATE,"ModRate",0.4);
|
bendLfoRateKnob = addNormalKnobClassic(364,345,ownerFilter,BENDLFORATE,"ModRate",0.4);
|
||||||
|
|
||||||
voiceSwitch = addNormalButtonListClassic(172,321,38,ownerFilter,VOICE_COUNT,"VoiceCount",ImageCache::getFromFile(skinFolder.getChildFile("voices.png")));
|
voiceSwitch = addNormalButtonListClassic(172,321,38,ownerFilter,VOICE_COUNT,"VoiceCount",ImageCache::getFromFile(skinFolder.getChildFile("voices.png")));
|
||||||
voiceSwitch ->addChoise("1");
|
for (int i=1; i <= 32; i++)
|
||||||
voiceSwitch ->addChoise("2");
|
voiceSwitch->addChoise(String(i));
|
||||||
voiceSwitch ->addChoise("3");
|
|
||||||
voiceSwitch ->addChoise("4");
|
|
||||||
voiceSwitch ->addChoise("5");
|
|
||||||
voiceSwitch ->addChoise("6");
|
|
||||||
voiceSwitch ->addChoise("7");
|
|
||||||
voiceSwitch ->addChoise("8");
|
|
||||||
voiceSwitch ->setValue(ownerFilter->getParameter(VOICE_COUNT),dontSendNotification);
|
voiceSwitch ->setValue(ownerFilter->getParameter(VOICE_COUNT),dontSendNotification);
|
||||||
|
|
||||||
legatoSwitch = addNormalButtonListClassic(65,321,95,ownerFilter,LEGATOMODE,"Legato",ImageCache::getFromFile(skinFolder.getChildFile("legato.png")));
|
legatoSwitch = addNormalButtonListClassic(65,321,95,ownerFilter,LEGATOMODE,"Legato",ImageCache::getFromFile(skinFolder.getChildFile("legato.png")));
|
||||||
|
|
Loading…
Reference in a new issue