From acb66816c83b2d8ce35bca015f2721d6aef5ad40 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 11 Sep 2012 16:02:16 +0200
Subject: [residual] SMSResidual fix: don't call Frame.clear as it now clears
 the audio buffer as well as peak/partial data.

Remove some dead code.
---
 simpl/residual.pxd     |  1 -
 simpl/residual.pyx     |  4 ----
 src/simpl/residual.cpp | 17 +++++++++--------
 src/simpl/residual.h   |  3 ---
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/simpl/residual.pxd b/simpl/residual.pxd
index e5e39a5..7fa1a70 100644
--- a/simpl/residual.pxd
+++ b/simpl/residual.pxd
@@ -31,4 +31,3 @@ cdef extern from "../src/simpl/residual.h" namespace "simpl":
         c_SMSResidual()
         int num_stochastic_coeffs()
         void num_stochastic_coeffs(int new_num_stochastic_coeffs)
-        # int stochastic_type()
diff --git a/simpl/residual.pyx b/simpl/residual.pyx
index 4f27deb..48f8eee 100644
--- a/simpl/residual.pyx
+++ b/simpl/residual.pyx
@@ -84,7 +84,3 @@ cdef class SMSResidual(Residual):
     property num_stochastic_coeffs:
         def __get__(self): return (<c_SMSResidual*>self.thisptr).num_stochastic_coeffs()
         def __set__(self, int i): (<c_SMSResidual*>self.thisptr).num_stochastic_coeffs(i)
-
-    # property stochastic_type:
-    #     def __get__(self): return (<c_SMSResidual*>self.thisptr).stochastic_type()
-    #     def __set__(self, int i): (<c_SMSResidual*>self.thisptr).stochastic_type(i)
diff --git a/src/simpl/residual.cpp b/src/simpl/residual.cpp
index 6d2c4c7..b74c1a6 100644
--- a/src/simpl/residual.cpp
+++ b/src/simpl/residual.cpp
@@ -129,15 +129,11 @@ void SMSResidual::num_stochastic_coeffs(int new_num_stochastic_coeffs) {
     sms_initResidual(&_residual_params);
 }
 
-// int SMSResidual::stochastic_type() {
-//     return _residual_params.
-// }
-
-// void SMSResidual::stochastic_type(int new_stochastic_type) {
-// }
-
 void SMSResidual::residual_frame(Frame* frame) {
-    frame->clear();
+    frame->clear_peaks();
+    frame->clear_partials();
+    frame->clear_synth();
+
     _pd.find_peaks_in_frame(frame);
     _pt.update_partials(frame);
     _synth.synth_frame(frame);
@@ -157,4 +153,9 @@ void SMSResidual::synth_frame(Frame* frame) {
     sms_approxResidual(_hop_size, frame->residual(),
                        _hop_size, frame->synth_residual(),
                        &_residual_params);
+
+    // SMS stochastic component is currently a bit loud so scaled here
+    for(int i = 0; i < frame->synth_size(); i++) {
+        frame->synth_residual()[i] *= 0.2;
+    }
 }
diff --git a/src/simpl/residual.h b/src/simpl/residual.h
index d3b7b59..8bdd316 100644
--- a/src/simpl/residual.h
+++ b/src/simpl/residual.h
@@ -67,9 +67,6 @@ class SMSResidual : public Residual {
         int num_stochastic_coeffs();
         void num_stochastic_coeffs(int new_num_stochastic_coeffs);
 
-        // int stochastic_type();
-        // void stochastic_type(int new_stochastic_type);
-
         void residual_frame(Frame* frame);
         void synth_frame(Frame* frame);
 };
-- 
cgit v1.2.3