jens/JaySynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- LFO: added Sync modes Frequency, Phase and Frequency + Phase

Browse Source 
- added GUI Parameter MIDISYNC_MODE and MIDISYNC_BERATDIV
- wired MIDISYNC params down to global LFO

git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@726 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2020-08-15 12:32:16 +00:00
parent 7b731dd270
commit 0f8abfd428
9 changed files with 278 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/JaySynthAudioProcessorEditor.cpp
+104 -14
View File
@@ -1896,6 +1896,39 @@ JaySynthAudioProcessorEditor::JaySynthAudioProcessorEditor (JaySynthAudioProcess
m_labelDebug->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
addAndMakeVisible (m_btn_midiClockLed = new ButtonLED (L"MidiClock"));
addAndMakeVisible (m_label_lfo0_midisync_factor = new Label ("LFO 1 Midi Sync. Factor",
TRANS("value")));
m_label_lfo0_midisync_factor->setTooltip (TRANS("LFO 1 Midi Sync. Factor"));
m_label_lfo0_midisync_factor->setFont (Font (14.00f, Font::plain));
m_label_lfo0_midisync_factor->setJustificationType (Justification::centred);
m_label_lfo0_midisync_factor->setEditable (true, true, false);
m_label_lfo0_midisync_factor->setColour (Label::outlineColourId, Colour (0x00000000));
m_label_lfo0_midisync_factor->setColour (TextEditor::textColourId, Colours::azure);
m_label_lfo0_midisync_factor->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
m_label_lfo0_midisync_factor->setColour (TextEditor::highlightColourId, Colour (0x00f7f7f7));
m_label_lfo0_midisync_factor->addListener (this);
addAndMakeVisible (m_slider_lfo0_midisync_divisor = new Slider ("LFO 1 Midi Sync Divisor"));
m_slider_lfo0_midisync_divisor->setTooltip (TRANS("LFO 1 Midi Sync Divisor"));
m_slider_lfo0_midisync_divisor->setRange (0, 1, 0);
m_slider_lfo0_midisync_divisor->setSliderStyle (Slider::RotaryVerticalDrag);
m_slider_lfo0_midisync_divisor->setTextBoxStyle (Slider::NoTextBox, false, 80, 20);
m_slider_lfo0_midisync_divisor->setColour (Slider::rotarySliderFillColourId, Colour (0x7fffffff));
m_slider_lfo0_midisync_divisor->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66ffffff));
m_slider_lfo0_midisync_divisor->addListener (this);
addAndMakeVisible (m_comboBox_lfo0_midisync_mode = new ComboBox ("LFO 1 Midi Sync Mode"));
m_comboBox_lfo0_midisync_mode->setTooltip (TRANS("LFO 1 Midi Sync Mode"));
m_comboBox_lfo0_midisync_mode->setEditableText (false);
m_comboBox_lfo0_midisync_mode->setJustificationType (Justification::centred);
m_comboBox_lfo0_midisync_mode->setTextWhenNothingSelected (String::empty);
m_comboBox_lfo0_midisync_mode->setTextWhenNoChoicesAvailable (TRANS("(no choices)"));
m_comboBox_lfo0_midisync_mode->addItem (TRANS("Off"), 1);
m_comboBox_lfo0_midisync_mode->addItem (TRANS("F"), 2);
m_comboBox_lfo0_midisync_mode->addItem (TRANS("P"), 3);
m_comboBox_lfo0_midisync_mode->addItem (TRANS("F + P"), 4);
m_comboBox_lfo0_midisync_mode->addListener (this);
//[UserPreSize]
//[/UserPreSize]
@@ -2183,6 +2216,10 @@ JaySynthAudioProcessorEditor::JaySynthAudioProcessorEditor (JaySynthAudioProcess
m_slider_lfo1_symmetry->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_1_SYMMETRY));
m_slider_lfo2_symmetry->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_2_SYMMETRY));
m_slider_lfo3_symmetry->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_3_SYMMETRY));
m_slider_lfo0_midisync_divisor->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_0_MIDISYNC_BEATDIV));
// m_slider_lfo1_midisync_divisor->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_1_MIDISYNC_BEATDIV));
// m_slider_lfo2_midisync_divisor->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_2_MIDISYNC_BEATDIV));
// m_slider_lfo3_midisync_divisor->setComponentID(String("SLIDER ") + String(SYNTH_PARAM_LFO_3_MIDISYNC_BEATDIV));
// --------------------------------------------------------------------
// Labels
@@ -2279,6 +2316,10 @@ JaySynthAudioProcessorEditor::JaySynthAudioProcessorEditor (JaySynthAudioProcess
m_label_lfo1_symmetry->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_1_SYMMETRY));
m_label_lfo2_symmetry->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_2_SYMMETRY));
m_label_lfo3_symmetry->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_3_SYMMETRY));
m_label_lfo0_midisync_factor->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_0_MIDISYNC_BEATDIV));
// m_label_lfo1_midisync_factor->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_1_MIDISYNC_BEATDIV));
// m_label_lfo2_midisync_factor->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_2_MIDISYNC_BEATDIV));
// m_label_lfo3_midisync_factor->setComponentID(String("LABEL ") + String(SYNTH_PARAM_LFO_3_MIDISYNC_BEATDIV));
// --------------------------------------------------------------------
// Comboboxes
@@ -2313,6 +2354,11 @@ JaySynthAudioProcessorEditor::JaySynthAudioProcessorEditor (JaySynthAudioProcess
m_comboBox_lfo3_shape->setComponentID(String("COMBOBOX ") + String(SYNTH_PARAM_LFO_3_SHAPE));
m_comboBox_vcf_order->setComponentID(String("COMBOBOX ") + String(SYNTH_PARAM_VCF_ORDER));
m_comboBox_lfo0_midisync_mode->setComponentID(String("COMBOBOX ") + String(SYNTH_PARAM_LFO_0_MIDISYNC_MODE));
// m_comboBox_lfo1_midisync_mode->setComponentID(String("COMBOBOX ") + String(SYNTH_PARAM_LFO_1_MIDISYNC_MODE));
// m_comboBox_lfo2_midisync_mode->setComponentID(String("COMBOBOX ") + String(SYNTH_PARAM_LFO_2_MIDISYNC_MODE));
// m_comboBox_lfo3_midisync_mode->setComponentID(String("COMBOBOX ") + String(SYNTH_PARAM_LFO_3_MIDISYNC_MODE));
// --------------------------------------------------------------------
getProcessor()->addActionListener(this);
@@ -2571,6 +2617,9 @@ JaySynthAudioProcessorEditor::~JaySynthAudioProcessorEditor()
m_label_num_voices_playing = nullptr;
m_labelDebug = nullptr;
m_btn_midiClockLed = nullptr;
m_label_lfo0_midisync_factor = nullptr;
m_slider_lfo0_midisync_divisor = nullptr;
m_comboBox_lfo0_midisync_mode = nullptr;
//[Destructor]. You can add your own custom destruction code here..
@@ -2843,7 +2892,7 @@ void JaySynthAudioProcessorEditor::paint (Graphics& g)
g.setColour (Colours::black);
g.setFont (Font (10.00f, Font::plain));
g.drawText (TRANS("Smooth"),
386, 120, 44, 16,
386, 256, 44, 16,
Justification::centred, true);
g.setColour (Colours::black);
@@ -3215,7 +3264,7 @@ void JaySynthAudioProcessorEditor::paint (Graphics& g)
g.setColour (Colours::black);
g.setFont (Font (10.00f, Font::plain));
g.drawText (TRANS("Symmetry"),
362, 256, 48, 16,
338, 256, 48, 16,
Justification::centred, true);
g.setColour (Colours::black);
@@ -3380,6 +3429,12 @@ void JaySynthAudioProcessorEditor::paint (Graphics& g)
966, 394, 100, 18,
Justification::centredRight, true);
g.setColour (Colours::black);
g.setFont (Font (10.00f, Font::plain));
g.drawText (TRANS("Divisor"),
386, 119, 48, 16,
Justification::centred, true);
//[UserPaint] Add your own custom painting code here..
//[/UserPaint]
}
@@ -3437,7 +3492,7 @@ void JaySynthAudioProcessorEditor::resized()
m_label_lfo1_speed->setBounds (452, 70, 52, 20);
m_comboBox_osc0_shape->setBounds (244, 68, 64, 16);
m_comboBox_osc1_shape->setBounds (244, 382, 64, 16);
m_comboBox_lfo0_shape->setBounds (354, 38, 64, 16);
m_comboBox_lfo0_shape->setBounds (355, 38, 64, 16);
m_comboBox_lfo1_shape->setBounds (470, 38, 64, 16);
m_slider_lfo2_speed->setBounds (346, 402, 36, 36);
m_slider_lfo3_speed->setBounds (460, 402, 36, 36);
@@ -3459,8 +3514,8 @@ void JaySynthAudioProcessorEditor::resized()
m_comboBox_vcf_type->setBounds (880, 74, 68, 16);
m_slider_lfo1_smooth->setBounds (506, 88, 36, 36);
m_label_lfo1_smooth->setBounds (498, 70, 52, 20);
m_slider_lfo0_smooth->setBounds (392, 88, 36, 36);
m_label_lfo0_smooth->setBounds (384, 70, 52, 20);
m_slider_lfo0_smooth->setBounds (392, 224, 36, 36);
m_label_lfo0_smooth->setBounds (384, 206, 52, 20);
m_slider_lfo2_smooth->setBounds (392, 402, 36, 36);
m_label_lfo2_smooth->setBounds (384, 384, 52, 20);
m_slider_lfo3_smooth->setBounds (506, 402, 36, 36);
@@ -3561,8 +3616,8 @@ void JaySynthAudioProcessorEditor::resized()
m_label_lfo3_attack->setBounds (498, 452, 52, 20);
m_button_lfo0_restart_enable->setBounds (356, 278, 16, 16);
m_button_lfo0_individual_enable->setBounds (402, 278, 16, 16);
m_slider_lfo0_symmetry->setBounds (370, 224, 36, 36);
m_label_lfo0_symmetry->setBounds (362, 206, 52, 20);
m_slider_lfo0_symmetry->setBounds (346, 224, 36, 36);
m_label_lfo0_symmetry->setBounds (338, 206, 52, 20);
m_slider_lfo1_symmetry->setBounds (484, 224, 36, 36);
m_label_lfo1_symmetry->setBounds (476, 206, 52, 20);
m_button_lfo1_restart_enable->setBounds (468, 277, 16, 16);
@@ -3596,6 +3651,9 @@ void JaySynthAudioProcessorEditor::resized()
m_label_num_voices_playing->setBounds (1060, 598, 42, 18);
m_labelDebug->setBounds (966, 274, 150, 24);
m_btn_midiClockLed->setBounds (1058, 272, 32, 32);
m_label_lfo0_midisync_factor->setBounds (384, 70, 52, 20);
m_slider_lfo0_midisync_divisor->setBounds (392, 88, 36, 36);
m_comboBox_lfo0_midisync_mode->setBounds (393, 12, 47, 16);
//[UserResized] Add your own custom resize handling here..
//[/UserResized]
}
@@ -4000,6 +4058,11 @@ void JaySynthAudioProcessorEditor::sliderValueChanged (Slider* sliderThatWasMove
//[UserSliderCode_m_slider_vcf_q_amt1] -- add your slider handling code here..
//[/UserSliderCode_m_slider_vcf_q_amt1]
}
else if (sliderThatWasMoved == m_slider_lfo0_midisync_divisor)
{
//[UserSliderCode_m_slider_lfo0_midisync_divisor] -- add your slider handling code here..
//[/UserSliderCode_m_slider_lfo0_midisync_divisor]
}
//[UsersliderValueChanged_Post]
//[/UsersliderValueChanged_Post]
@@ -4465,6 +4528,11 @@ void JaySynthAudioProcessorEditor::labelTextChanged (Label* labelThatHasChanged)
//[UserLabelCode_m_label_num_voices_playing] -- add your label text handling code here..
//[/UserLabelCode_m_label_num_voices_playing]
}
else if (labelThatHasChanged == m_label_lfo0_midisync_factor)
{
//[UserLabelCode_m_label_lfo0_midisync_factor] -- add your label text handling code here..
//[/UserLabelCode_m_label_lfo0_midisync_factor]
}
//[UserlabelTextChanged_Post]
//[/UserlabelTextChanged_Post]
@@ -4761,6 +4829,11 @@ void JaySynthAudioProcessorEditor::comboBoxChanged (ComboBox* comboBoxThatHasCha
//[UserComboBoxCode_m_comboBox_vcf_q_src1] -- add your combo box handling code here..
//[/UserComboBoxCode_m_comboBox_vcf_q_src1]
}
else if (comboBoxThatHasChanged == m_comboBox_lfo0_midisync_mode)
{
//[UserComboBoxCode_m_comboBox_lfo0_midisync_mode] -- add your combo box handling code here..
//[/UserComboBoxCode_m_comboBox_lfo0_midisync_mode]
}
//[UsercomboBoxChanged_Post]
//[/UsercomboBoxChanged_Post]
@@ -5335,7 +5408,7 @@ BEGIN_JUCER_METADATA
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="878 54 72 16" fill="solid: ff000000" hasStroke="0" text="VCF type"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="386 120 44 16" fill="solid: ff000000" hasStroke="0" text="Smooth"
<TEXT pos="386 256 44 16" fill="solid: ff000000" hasStroke="0" text="Smooth"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="160 154 70 16" fill="solid: ff000000" hasStroke="0" text="PWM amt. 1"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
@@ -5459,7 +5532,7 @@ BEGIN_JUCER_METADATA
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="384 502 48 16" fill="solid: ff000000" hasStroke="0" text="Attack"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="362 256 48 16" fill="solid: ff000000" hasStroke="0" text="Symmetry"
<TEXT pos="338 256 48 16" fill="solid: ff000000" hasStroke="0" text="Symmetry"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="500 290 44 16" fill="solid: ff000000" hasStroke="0" text="Polyphon"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
@@ -5515,6 +5588,8 @@ BEGIN_JUCER_METADATA
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
<TEXT pos="966 394 100 18" fill="solid: ffffffff" hasStroke="0" text="Max. Polyphony :"
fontname="Default font" fontsize="11" bold="0" italic="0" justification="34"/>
<TEXT pos="386 119 48 16" fill="solid: ff000000" hasStroke="0" text="Divisor"
fontname="Default font" fontsize="10" bold="0" italic="0" justification="36"/>
</BACKGROUND>
<LABEL name="Colon" id="49ecaccc9d2b3ddd" memberName="m_label_colon"
virtualName="" explicitFocusOrder="0" pos="220 660 24 28" textCol="ffffffff"
@@ -5770,7 +5845,7 @@ BEGIN_JUCER_METADATA
editable="0" layout="36" items="Saw&#10;Pulse&#10;Tri&#10;Sine&#10;Impulse"
textWhenNonSelected="" textWhenNoItems="(no choices)"/>
<COMBOBOX name="LFO 1 shape" id="4b842eb425ff0d67" memberName="m_comboBox_lfo0_shape"
virtualName="" explicitFocusOrder="0" pos="354 38 64 16" tooltip="LFO 1 shape"
virtualName="" explicitFocusOrder="0" pos="355 38 64 16" tooltip="LFO 1 shape"
editable="0" layout="36" items="Sine&#10;Cosine&#10;Saw&#10;Square&#10;Tri&#10;S&amp;H 1&#10;S&amp;H 2&#10;1-Sine&#10;1-Cosine&#10;1-Saw&#10;1-Square&#10;1-Tri"
textWhenNonSelected="" textWhenNoItems="(no choices)"/>
<COMBOBOX name="LFO 2 shape" id="f3beb17b618b89c7" memberName="m_comboBox_lfo1_shape"
@@ -5865,12 +5940,12 @@ BEGIN_JUCER_METADATA
focusDiscardsChanges="0" fontname="Default font" fontsize="14"
bold="0" italic="0" justification="36"/>
<SLIDER name="LFO 1 smooth" id="fb6d892c7346c915" memberName="m_slider_lfo0_smooth"
virtualName="" explicitFocusOrder="0" pos="392 88 36 36" tooltip="LFO 1 smooth [%]"
virtualName="" explicitFocusOrder="0" pos="392 224 36 36" tooltip="LFO 1 smooth [%]"
rotarysliderfill="7fffffff" rotaryslideroutline="66ffffff" min="0"
max="1" int="0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<LABEL name="LFO 1 smooth" id="4a0362e95d693bc2" memberName="m_label_lfo0_smooth"
virtualName="" explicitFocusOrder="0" pos="384 70 52 20" edTextCol="ff000000"
virtualName="" explicitFocusOrder="0" pos="384 206 52 20" edTextCol="ff000000"
edBkgCol="0" labelText="value" editableSingleClick="1" editableDoubleClick="1"
focusDiscardsChanges="0" fontname="Default font" fontsize="14"
bold="0" italic="0" justification="36"/>
@@ -6328,12 +6403,12 @@ BEGIN_JUCER_METADATA
txtcol="ffffffff" buttonText="" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
<SLIDER name="LFO 1 Symmetry" id="908862f0a9f4df90" memberName="m_slider_lfo0_symmetry"
virtualName="" explicitFocusOrder="0" pos="370 224 36 36" tooltip="LFO 1 Symmetry [%]"
virtualName="" explicitFocusOrder="0" pos="346 224 36 36" tooltip="LFO 1 Symmetry [%]"
rotarysliderfill="7fffffff" rotaryslideroutline="66ffffff" min="0"
max="1" int="0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<LABEL name="LFO 1 Symmetry" id="bb8547fe5f39b0b6" memberName="m_label_lfo0_symmetry"
virtualName="" explicitFocusOrder="0" pos="362 206 52 20" outlineCol="0"
virtualName="" explicitFocusOrder="0" pos="338 206 52 20" outlineCol="0"
edTextCol="fff0ffff" edBkgCol="0" hiliteCol="f7f7f7" labelText="value"
editableSingleClick="1" editableDoubleClick="1" focusDiscardsChanges="0"
fontname="Default font" fontsize="14" bold="0" italic="0" justification="36"/>
@@ -6494,6 +6569,21 @@ BEGIN_JUCER_METADATA
<JUCERCOMP name="MidiClock" id="5a40cdd54b6e8060" memberName="m_btn_midiClockLed"
virtualName="" explicitFocusOrder="0" pos="1058 272 32 32" sourceFile="ButtonLED.cpp"
constructorParams="L&quot;MidiClock&quot;"/>
<LABEL name="LFO 1 Midi Sync. Factor" id="5e64aafc6664225a" memberName="m_label_lfo0_midisync_factor"
virtualName="" explicitFocusOrder="0" pos="384 70 52 20" tooltip="LFO 1 Midi Sync. Factor"
outlineCol="0" edTextCol="fff0ffff" edBkgCol="0" hiliteCol="f7f7f7"
labelText="value" editableSingleClick="1" editableDoubleClick="1"
focusDiscardsChanges="0" fontname="Default font" fontsize="14"
bold="0" italic="0" justification="36"/>
<SLIDER name="LFO 1 Midi Sync Divisor" id="aa98192fcd0b651c" memberName="m_slider_lfo0_midisync_divisor"
virtualName="" explicitFocusOrder="0" pos="392 88 36 36" tooltip="LFO 1 Midi Sync Divisor"
rotarysliderfill="7fffffff" rotaryslideroutline="66ffffff" min="0"
max="1" int="0" style="RotaryVerticalDrag" textBoxPos="NoTextBox"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<COMBOBOX name="LFO 1 Midi Sync Mode" id="4d7c3239958eae23" memberName="m_comboBox_lfo0_midisync_mode"
virtualName="" explicitFocusOrder="0" pos="393 12 47 16" tooltip="LFO 1 Midi Sync Mode"
editable="0" layout="36" items="Off&#10;F&#10;P&#10;F + P" textWhenNonSelected=""
textWhenNoItems="(no choices)"/>
</JUCER_COMPONENT>
END_JUCER_METADATA