From ea3968e516642df3a436c5eda0b72b95e41d3383 Mon Sep 17 00:00:00 2001
From: Hannes Matuschek <hmatuschek@gmail.com>
Date: Mon, 29 Sep 2014 16:07:28 +0200
Subject: [PATCH] Fixed interpol subsampler.

---
 src/gui/spectrum.cc |  2 +-
 src/subsample.hh    | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/gui/spectrum.cc b/src/gui/spectrum.cc
index 03c1361..7eec3ba 100644
--- a/src/gui/spectrum.cc
+++ b/src/gui/spectrum.cc
@@ -43,7 +43,7 @@ Spectrum::config(const Config &src_cfg) {
       << " Data type: " << _input_type << std::endl
       << " sample-rate: " << _sample_rate << std::endl
       << " FFT size: " << _fft_size << std::endl
-      << " # sample drops: " << _N_samples << std::endl
+      << " # sample drops: " << _N_samples-1 << std::endl
       << " # averages: " << _Ntrafo << std::endl
       << " refresh rate: " << _sample_rate/(_N_samples*_Ntrafo) << "Hz";
   Logger::get().log(msg);
diff --git a/src/subsample.hh b/src/subsample.hh
index 1814e7e..7941865 100644
--- a/src/subsample.hh
+++ b/src/subsample.hh
@@ -234,6 +234,14 @@ public:
     for (size_t i=0; i<16; i++) { _dl[i] = 0; }
     _mu = 0;
 
+    LogMessage msg(LOG_DEBUG);
+    msg << "Configure InpolSubSampler node:" << std::endl
+        << " by: " << _frac << std::endl
+        << " type: " << src_cfg.type() << std::endl
+        << " sample-rate: " << src_cfg.sampleRate()
+        << " -> " << src_cfg.sampleRate()/_frac;
+    Logger::get().log(msg);
+
     // Propergate config
     this->setConfig(Config(Traits<oScalar>::scalarId, src_cfg.sampleRate()/_frac, bufSize, 1));
   }
@@ -242,14 +250,16 @@ public:
   virtual void process(const Buffer<iScalar> &buffer, bool allow_overwrite) {
     size_t i=0, o=0;
     while (i<buffer.size()) {
-      // Fill delay line
       // First, fill sampler...
       while ( (_mu > 1) && (i<buffer.size()) ) {
         _dl[_dl_idx] = _dl[_dl_idx+8] = buffer[i]; i++;
         _dl_idx = (_dl_idx + 1) % 8; _mu -= 1;
       }
-      // Interpolate
-      _buffer[o] = interpolate(_dl.sub(_dl_idx,8), _mu); _mu += _frac;
+      while (_mu <= 1) {
+        // Interpolate
+        _buffer[o] = interpolate(_dl.sub(_dl_idx,8), _mu);
+        _mu += _frac; o++;
+      }
     }
     this->send(_buffer.head(o));
   }