diff data/model/AggregateWaveModel.cpp @ 1100:5cbf71022679 simple-fft-model

Smooth signal flow through from file to fft model

--- a/data/model/AggregateWaveModel.cpp	Mon Jun 15 15:35:57 2015 +0100
+++ b/data/model/AggregateWaveModel.cpp	Mon Jun 15 16:02:58 2015 +0100
@@ -111,8 +111,8 @@
 
         auto here = m_components[c].model->getData(m_components[c].channel,
                                                    start, count);
-        if (here.size() > longest) {
-            longest = here.size();
+        if (sv_frame_t(here.size()) > longest) {
+            longest = sv_frame_t(here.size());
         }
         for (sv_frame_t i = 0; in_range_for(here, i); ++i) {
             result[i] += here[i];
@@ -133,7 +133,9 @@
 
     for (int c = fromchannel; c <= tochannel; ++c) {
         auto here = getData(c, start, count);
-        if (here.size() < min) min = here.size();
+        if (sv_frame_t(here.size()) < min) {
+            min = sv_frame_t(here.size());
+        }
         result.push_back(here);
     }