Reverted SignalGeneratorEditor to original interface

Source/Processors/AudioNode.cpp

@@ -87,6 +87,8 @@ void AudioNode::process(AudioSampleBuffer &buffer,
 	// 	buffer.copyFrom();
 	// } else {
 
+	// currently monitoring channels 2 and 3 ONLY!
+
 	buffer.clear(0,0,buffer.getNumSamples());
 	buffer.clear(1,0,buffer.getNumSamples());
 

Source/Processors/Editors/GenericEditor.cpp

@@ -377,7 +377,7 @@ void GenericEditor::update()
 
 Array<int> GenericEditor::getActiveChannels()
 {
-	Array<int> a;// = channelSelector->getActiveChannels();
+	Array<int> a = channelSelector->getActiveChannels();
 	return a;
 }
 

Source/Processors/Editors/SignalGeneratorEditor.cpp

@@ -43,24 +43,24 @@ SignalGeneratorEditor::SignalGeneratorEditor (GenericProcessor* parentNode)
 		ws->setBounds(15 + (buttonWidth)*i, 30, buttonWidth, buttonHeight);
 		ws->addListener(this);
 		waveformSelectors.add(ws);
-		addChildComponent(ws);
+		addAndMakeVisible(ws);
 	}
 
 	amplitudeSlider = new Slider ("Amplitude Slider");
 	amplitudeSlider->setBounds(10,60,50,60);
-	amplitudeSlider->setRange(0,1000,10);
+	amplitudeSlider->setRange(0,5,0.5);
 	amplitudeSlider->addListener(this);
 	amplitudeSlider->setSliderStyle(Slider::Rotary);
 	amplitudeSlider->setTextBoxStyle(Slider::TextBoxBelow, false, 40, 20);
-	addChildComponent(amplitudeSlider);
+	addAndMakeVisible(amplitudeSlider);
 
 	frequencySlider = new Slider ("Frequency Slider");
 	frequencySlider->setBounds(70,60,50,60);
-	frequencySlider->setRange(1,1000,1);
+	frequencySlider->setRange(10,1000,10);
 	frequencySlider->addListener(this);
 	frequencySlider->setSliderStyle(Slider::Rotary);
 	frequencySlider->setTextBoxStyle(Slider::TextBoxBelow, false, 40, 20);
-	addChildComponent(frequencySlider);
+	addAndMakeVisible(frequencySlider);
 
 	phaseSlider = new Slider ("Phase Slider");
 	phaseSlider->setBounds(130,60,50,60);
@@ -68,7 +68,7 @@ SignalGeneratorEditor::SignalGeneratorEditor (GenericProcessor* parentNode)
 	phaseSlider->addListener(this);
 	phaseSlider->setSliderStyle(Slider::Rotary);
 	phaseSlider->setTextBoxStyle(Slider::TextBoxBelow, false, 40, 20);
-	addChildComponent(phaseSlider);
+	addAndMakeVisible(phaseSlider);
 
 	numChannelsLabel = new Label("Number of Channels","1");
     numChannelsLabel->setEditable(true);
@@ -156,6 +156,35 @@ void SignalGeneratorEditor::buttonEvent (Button* button)
     }
 }
 
+void SignalGeneratorEditor::sliderEvent(Slider* slider)
+{
+
+	int paramIndex;
+
+	if (slider == amplitudeSlider)
+	{
+		paramIndex = 0;
+	} else if (slider == frequencySlider)
+	{
+		paramIndex = 1;
+	} else if (slider == phaseSlider)
+	{
+		paramIndex = 2;
+	}
+
+
+	GenericProcessor* p = getProcessor();
+
+	Array<int> chans = getActiveChannels();
+
+	for (int n = 0; n < chans.size(); n++) {
+
+		p->setCurrentChannel(chans[n]);
+		p->setParameter(paramIndex, slider->getValue());
+
+	}
+
+}
 
 void SignalGeneratorEditor::labelTextChanged (Label* label)
 {

Source/Processors/Editors/SignalGeneratorEditor.h

@@ -36,10 +36,12 @@ class SignalGeneratorEditor : public GenericEditor,
 public:
 	SignalGeneratorEditor (GenericProcessor* parentNode);
 	virtual ~SignalGeneratorEditor();
-	//void sliderValueChanged (Slider* slider);
+    void sliderEvent(Slider* slider);
     void buttonEvent(Button* button);
     void labelTextChanged(Label* label);
 
+    void addParameterEditors() {}
+
 private:	
 
     Label* numChannelsLabel;

Source/Processors/ResamplingNode.cpp

@@ -153,7 +153,7 @@ void ResamplingNode::prepareToPlay (double sampleRate_, int estimatedSamplesPerB
 	updateFilter();
 
 
-	file = fopen("resampling_data", "w");
+	//file = fopen("resampling_data", "w");
 }
 
 void ResamplingNode::updateFilter() {
@@ -175,7 +175,7 @@ void ResamplingNode::updateFilter() {
 
 void ResamplingNode::releaseResources() 
 {	
-	fclose(file);
+	//fclose(file);
 }
 
 void ResamplingNode::process(AudioSampleBuffer &buffer, 

Source/Processors/SignalGenerator.cpp

@@ -29,26 +29,12 @@
 SignalGenerator::SignalGenerator()
 	: GenericProcessor("Signal Generator"),
 
-	  defaultFrequency(200.0),
-	  defaultAmplitude (0.02f),
-	  nOut(4)
+	  defaultFrequency(10.0),
+	  defaultAmplitude (100.0f),
+	  nOut(1)
 	
 {
 
-	// create parameters, to be passed to the GenericEditor
-
-	Array<var> a;
-	a.add(1);
-	a.add(2);
-	a.add(3);
-
-	parameters.add(Parameter("Param 1",a, 0, 0));//true);//a,0);
-
-	parameters.add(Parameter("PARAM",0.0f, 100.0f, 50.0f, 1));
-
-	//parameters.add(Parameter("Param 1",a, 0));//true);//a,0);
-
-	//parameters.add(Parameter("Param 2",true));
 
 }
 
@@ -92,7 +78,7 @@ void SignalGenerator::setParameter (int parameterIndex, float newValue)
 
 	if (currentChannel > -1) {
 		if (parameterIndex == 0) {
-			amplitude.set(currentChannel,newValue);
+			amplitude.set(currentChannel,newValue*100.0f);
 		} else if (parameterIndex == 1) {
 			frequency.set(currentChannel,newValue);
 			phasePerSample.set(currentChannel, double_Pi * 2.0 / (getSampleRate() / frequency[currentChannel]));

Source/Processors/SignalGenerator.h

@@ -49,7 +49,7 @@ public:
 
 	void setParameter (int parameterIndex, float newValue);
 
-	float getSampleRate() {return 22100.0;}
+	float getSampleRate() {return 44100.0;}
 
 	AudioProcessorEditor* createEditor();
 	bool hasEditor() const {return true;}