David Minnix -- created interface for audio generators

XiNNiW · Feb 6, 2017 · 15be881 · 15be881
1 parent 76493a0
commit 15be881
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/due-synth-library/include/IAudioGenerator.h b/due-synth-library/include/IAudioGenerator.h
@@ -0,0 +1,19 @@
+/*
+ * IAudioGenerator.h
+ *
+ *  Created on: Feb 6, 2017
+ *      Author: davidminnix
+ */
+
+#ifndef INCLUDE_IAUDIOGENERATOR_H_
+#define INCLUDE_IAUDIOGENERATOR_H_
+
+class IAudioGenerator{
+
+public:
+	IAudioGenerator(){}
+	virtual long nextSample()=0;
+	virtual ~IAudioGenerator(){};
+};
+
+#endif /* INCLUDE_IAUDIOGENERATOR_H_ */
diff --git a/due-synth-library/include/IWavetableOscillator.h b/due-synth-library/include/IWavetableOscillator.h
@@ -1,7 +1,9 @@
 #ifndef INCLUDE_IWAVETABLEOSCILLATOR_H_
 #define INCLUDE_IWAVETABLEOSCILLATOR_H_ 1
 
-class IWavetableOscillator {
+#include <IAudioGenerator.h>
+
+class IWavetableOscillator : virtual public IAudioGenerator {
 
 public:
 	IWavetableOscillator(){};

diff --git a/due-synth-library/include/IWavetableSynth.h b/due-synth-library/include/IWavetableSynth.h
@@ -0,0 +1,13 @@
+
+#ifndef INCLUDE_IWAVETABLESYNTH_H_
+#define INCLUDE_IWAVETABLESYNTH_H_
+
+class IWavetableSynth {
+
+public:
+	IWavetableSynth();
+	virtual ~IWavetableSynth();
+	virtual void playNote(int noteNumber, int velocity);
+};
+
+#endif /* INCLUDE_IWAVETABLESYNTH_H_ */
diff --git a/due-synth-library/include/SineWavetableOscillator.h b/due-synth-library/include/SineWavetableOscillator.h
@@ -3,7 +3,7 @@
 #include "IWavetableOscillator.h"
 
 
-class SineWavetableOscillator: public IWavetableOscillator {
+class SineWavetableOscillator: virtual public IWavetableOscillator {
 
 public:
 	SineWavetableOscillator();

diff --git a/due-synth-runner/.settings/org.eclipse.cdt.core.prefs b/due-synth-runner/.settings/org.eclipse.cdt.core.prefs
@@ -169,10 +169,10 @@ environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.DTS/value=0
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.LOCAL/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.LOCAL/operation=replace
-environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.LOCAL/value=1486377890
+environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.LOCAL/value=1486387814
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.UTC/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.UTC/operation=replace
-environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.UTC/value=1486395890
+environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.UTC/value=1486405814
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.ZONE/delimiter=\:
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.ZONE/operation=replace
 environment/project/it.baeyens.arduino.core.toolChain.release.504661961/A.EXTRA.TIME.ZONE/value=-18000

diff --git a/due-synth-test/src/WavetableSynth_test.cpp b/due-synth-test/src/WavetableSynth_test.cpp
@@ -22,6 +22,5 @@ TEST(TestWavetableSynth, is_calls_next_sample_on_osc_when_called){
 	synth->nextSample();
 	synth->nextSample();
 	synth->nextSample();
-
 }