Make sure inherited overloaded methods are available.

Make Synthesis reset method public.

4 files changed, 30 insertions, 3 deletions

diff --git a/src/simpl/partial_tracking.h b/src/simpl/partial_tracking.h
index 8606cb0..b41bc9a 100644
--- a/src/simpl/partial_tracking.h
+++ b/src/simpl/partial_tracking.h
@@ -76,6 +76,7 @@ class MQPartialTracking : public PartialTracking {
         MQPartialTracking();
         ~MQPartialTracking();
         void reset();
+        using PartialTracking::max_partials;
         void max_partials(int new_max_partials);
         Peaks update_partials(Frame* frame);
 };
@@ -97,6 +98,7 @@ class SMSPartialTracking : public PartialTracking {
         SMSPartialTracking();
         ~SMSPartialTracking();
         void reset();
+        using PartialTracking::max_partials;
         void max_partials(int new_max_partials);
         bool realtime();
         void realtime(bool is_realtime);
@@ -131,6 +133,7 @@ class SndObjPartialTracking : public PartialTracking {
         SndObjPartialTracking();
         ~SndObjPartialTracking();
         void reset();
+        using PartialTracking::max_partials;
         void max_partials(int new_max_partials);
         Peaks update_partials(Frame* frame);
 };
@@ -160,6 +163,7 @@ class LorisPartialTracking : public PartialTracking {
         LorisPartialTracking();
         ~LorisPartialTracking();
         void reset();
+        using PartialTracking::max_partials;
         void max_partials(int new_max_partials);
         Peaks update_partials(Frame* frame);
 };
diff --git a/src/simpl/peak_detection.h b/src/simpl/peak_detection.h
index 983340a..22af561 100644
--- a/src/simpl/peak_detection.h
+++ b/src/simpl/peak_detection.h
@@ -96,8 +96,11 @@ class MQPeakDetection : public PeakDetection {
     public:
         MQPeakDetection();
         ~MQPeakDetection();
+        using PeakDetection::frame_size;
         void frame_size(int new_frame_size);
+        using PeakDetection::hop_size;
         void hop_size(int new_hop_size);
+        using PeakDetection::max_peaks;
         void max_peaks(int new_max_peaks);
         Peaks find_peaks_in_frame(Frame* frame);
 };
@@ -115,8 +118,11 @@ class SMSPeakDetection : public PeakDetection {
         SMSPeakDetection();
         ~SMSPeakDetection();
         int next_frame_size();
+        using PeakDetection::frame_size;
         void frame_size(int new_frame_size);
+        using PeakDetection::hop_size;
         void hop_size(int new_hop_size);
+        using PeakDetection::max_peaks;
         void max_peaks(int new_max_peaks);
         int realtime();
         void realtime(int new_realtime);
@@ -140,8 +146,11 @@ class SndObjPeakDetection : public PeakDetection {
     public:
         SndObjPeakDetection();
         ~SndObjPeakDetection();
+        using PeakDetection::frame_size;
         void frame_size(int new_frame_size);
+        using PeakDetection::hop_size;
         void hop_size(int new_hop_size);
+        using PeakDetection::max_peaks;
         void max_peaks(int new_max_peaks);
         Peaks find_peaks_in_frame(Frame* frame);
 };
@@ -177,8 +186,11 @@ class LorisPeakDetection : public PeakDetection {
     public:
         LorisPeakDetection();
         ~LorisPeakDetection();
+        using PeakDetection::frame_size;
         void frame_size(int new_frame_size);
+        using PeakDetection::hop_size;
         void hop_size(int new_hop_size);
+        using PeakDetection::max_peaks;
         void max_peaks(int new_max_peaks);
         Peaks find_peaks_in_frame(Frame* frame);
 };
diff --git a/src/simpl/synthesis.cpp b/src/simpl/synthesis.cpp
index c5d3570..d4f7b7e 100644
--- a/src/simpl/synthesis.cpp
+++ b/src/simpl/synthesis.cpp
@@ -14,6 +14,9 @@ Synthesis::Synthesis() {
     _sampling_rate = 44100;
 }
 
+void Synthesis::reset() {
+}
+
 int Synthesis::frame_size() {
     return _frame_size;
 }
diff --git a/src/simpl/synthesis.h b/src/simpl/synthesis.h
index 64f6f7b..aca1780 100644
--- a/src/simpl/synthesis.h
+++ b/src/simpl/synthesis.h
@@ -38,6 +38,7 @@ class Synthesis {
 
     public:
         Synthesis();
+        virtual void reset();
         int frame_size();
         virtual void frame_size(int new_frame_size);
         int hop_size();
@@ -60,12 +61,13 @@ class MQSynthesis : public Synthesis {
         sample* _prev_amps;
         sample* _prev_freqs;
         sample* _prev_phases;
-        void reset();
         sample hz_to_radians(sample f);
 
     public:
         MQSynthesis();
         ~MQSynthesis();
+        void reset();
+        using Synthesis::max_partials;
         void max_partials(int new_max_partials);
         void synth_frame(Frame* frame);
 };
@@ -82,7 +84,9 @@ class SMSSynthesis : public Synthesis {
     public:
         SMSSynthesis();
         ~SMSSynthesis();
+        using Synthesis::hop_size;
         void hop_size(int new_hop_size);
+        using Synthesis::max_partials;
         void max_partials(int new_max_partials);
         int num_stochastic_coeffs();
         int stochastic_type();
@@ -111,13 +115,16 @@ class SndObjSynthesis : public Synthesis {
         SimplSndObjAnalysisWrapper* _analysis;
         HarmTable* _table;
         SimplAdSyn* _synth;
-        void reset();
 
     public:
         SndObjSynthesis();
         ~SndObjSynthesis();
+        void reset();
+        using Synthesis::frame_size;
         void frame_size(int new_frame_size);
+        using Synthesis::hop_size;
         void hop_size(int new_hop_size);
+        using Synthesis::max_partials;
         void max_partials(int new_max_partials);
         void synth_frame(Frame* frame);
 };
@@ -130,11 +137,12 @@ class LorisSynthesis : public Synthesis {
     private:
         std::vector<Loris::Oscillator> _oscs;
         sample _bandwidth;
-        void reset();
 
     public:
         LorisSynthesis();
         ~LorisSynthesis();
+        void reset();
+        using Synthesis::max_partials;
         void max_partials(int new_max_partials);
         sample bandwidth();
         void bandwidth(sample new_bandwidth);