2 files changed, 179 insertions, 5 deletions

diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index 9c70403..9d5f7ad 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -428,3 +428,116 @@ Frames PartialTracking::find_partials(Frames frames) {
     _frames = frames;
     return _frames;
 }
+
+
+// ---------------------------------------------------------------------------
+// Synthesis
+// ---------------------------------------------------------------------------
+Synthesis::Synthesis() {
+    _frame_size = 512;
+    _hop_size = 512;
+    _max_partials = 100;
+    _sampling_rate = 44100;
+}
+
+int Synthesis::frame_size() {
+    return _frame_size;
+}
+
+void Synthesis::frame_size(int new_frame_size) {
+    _frame_size = new_frame_size;
+}
+
+int Synthesis::hop_size() {
+    return _hop_size;
+}
+
+void Synthesis::hop_size(int new_hop_size) {
+    _hop_size = new_hop_size;
+}
+
+int Synthesis::max_partials() {
+    return _max_partials;
+}
+
+void Synthesis::max_partials(int new_max_partials) {
+    _max_partials = new_max_partials;
+}
+
+int Synthesis::sampling_rate() {
+    return _sampling_rate;
+}
+
+void Synthesis::sampling_rate(int new_sampling_rate) {
+    _sampling_rate = new_sampling_rate;
+}
+
+void Synthesis::synth_frame(Frame* frame) {
+}
+
+Frames Synthesis::synth(Frames frames) {
+    for(int i = 0; i < frames.size(); i++) {
+        synth_frame(frames[i]);
+    }
+    return frames;
+}
+
+
+// ---------------------------------------------------------------------------
+// Residual
+// ---------------------------------------------------------------------------
+Residual::Residual() {
+    _frame_size = 512;
+    _hop_size = 512;
+    _sampling_rate = 44100;
+}
+
+int Residual::frame_size() {
+    return _frame_size;
+}
+
+void Residual::frame_size(int new_frame_size) {
+    _frame_size = new_frame_size;
+}
+
+int Residual::hop_size() {
+    return _hop_size;
+}
+
+void Residual::hop_size(int new_hop_size) {
+    _hop_size = new_hop_size;
+}
+
+int Residual::sampling_rate() {
+    return _sampling_rate;
+}
+
+void Residual::sampling_rate(int new_sampling_rate) {
+    _sampling_rate = new_sampling_rate;
+}
+
+void Residual::residual_frame(int synth_size, sample* synth,
+                              int original_size, sample* original,
+                              int residual_size, sample* residual) {
+}
+
+void Residual::find_residual(int synth_size, sample* synth,
+                             int original_size, sample* original,
+                             int residual_size, sample* residual) {
+    for(int i = 0; i < synth_size; i += _hop_size) {
+        residual_frame(_hop_size, &synth[i],
+                       _hop_size, &original[i],
+                       _hop_size, &residual[i]);
+    }
+}
+
+void Residual::synth_frame(Frame* frame) {
+}
+
+// Calculate and return a synthesised residual signal
+Frames Residual::synth(Frames frames) {
+    for(int i = 0; i < frames.size(); i++) {
+        synth_frame(frames[i]);
+    }
+    return frames;
+}
diff --git a/src/simpl/base.h b/src/simpl/base.h
index 385e2a9..bdb0d96 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -7,7 +7,7 @@
 
 using namespace std;
 
-namespace simpl 
+namespace simpl
 {
 
 typedef double sample;
@@ -68,10 +68,10 @@ typedef std::vector<Partial*> Partials;
 
 // ---------------------------------------------------------------------------
 // Frame
-// 
+//
 // Represents a frame of audio information.
-// This can be: - raw audio samples 
-//              - an unordered list of sinusoidal peaks 
+// This can be: - raw audio samples
+//              - an unordered list of sinusoidal peaks
 //              - an ordered list of partials
 //              - synthesised audio samples
 //              - residual samples
@@ -129,7 +129,7 @@ typedef std::vector<Frame*> Frames;
 
 // ---------------------------------------------------------------------------
 // PeakDetection
-// 
+//
 // Detect spectral peaks
 // ---------------------------------------------------------------------------
 
@@ -214,6 +214,67 @@ class PartialTracking {
         virtual Frames find_partials(Frames frames);
 };
 
+
+// ---------------------------------------------------------------------------
+// Synthesis
+//
+// Synthesise audio from spectral analysis data
+// ---------------------------------------------------------------------------
+
+class Synthesis {
+    private:
+        int _frame_size;
+        int _hop_size;
+        int _max_partials;
+        int _sampling_rate;
+
+    public:
+        Synthesis();
+        int frame_size();
+        void frame_size(int new_frame_size);
+        int hop_size();
+        void hop_size(int new_hop_size);
+        int max_partials();
+        void max_partials(int new_max_partials);
+        int sampling_rate();
+        void sampling_rate(int new_sampling_rate);
+
+        virtual void synth_frame(Frame* frame);
+        virtual Frames synth(Frames frames);
+};
+
+// ---------------------------------------------------------------------------
+// Residual
+//
+// Calculate a residual signal
+// ---------------------------------------------------------------------------
+
+class Residual {
+    private:
+        int _frame_size;
+        int _hop_size;
+        int _sampling_rate;
+
+    public:
+        Residual();
+        int frame_size();
+        void frame_size(int new_frame_size);
+        int hop_size();
+        void hop_size(int new_hop_size);
+        int sampling_rate();
+        void sampling_rate(int new_sampling_rate);
+
+        virtual void residual_frame(int synth_size, sample* synth,
+                                    int original_size, sample* original,
+                                    int residual_size, sample* residual);
+        virtual void find_residual(int synth_size, sample* synth,
+                                   int original_size, sample* original,
+                                   int residual_size, sample* residual);
+
+        virtual void synth_frame(Frame* frame);
+        virtual Frames synth(Frames frames);
+};
+
 } // end of namespace Simpl
 
 #endif