# HG changeset patch
# User Chris Cannam
# Date 1384893849 0
# Node ID 8fdcf2fec5bdec1bb6115d5afdf8700d702f373f
# Parent  295b66046da32a5324841c28d6b925cec34cc216
Fixes toward framer overhaul

diff -r 295b66046da3 -r 8fdcf2fec5bd src/may/feature/specdiff.yeti
--- a/src/may/feature/specdiff.yeti	Tue Nov 19 19:26:48 2013 +0000
+++ b/src/may/feature/specdiff.yeti	Tue Nov 19 20:44:09 2013 +0000
@@ -2,12 +2,13 @@
 module may.feature.specdiff;
 
 fr = load may.stream.framer;
-cplx = load may.complex;
+ch = load may.stream.channels;
+cm = load may.matrix.complex;
 
 load may.feature.feature;
 
 specdiff frames = 
-    features magdiff (map cplx.magnitudes frames);
+    features magdiff (map ch.mixedDown frames);
 
 specdiffOfFile framesize w filename =
     specdiff
diff -r 295b66046da3 -r 8fdcf2fec5bd src/may/stream/convolve.yeti
--- a/src/may/stream/convolve.yeti	Tue Nov 19 19:26:48 2013 +0000
+++ b/src/may/stream/convolve.yeti	Tue Nov 19 20:44:09 2013 +0000
@@ -23,7 +23,7 @@
     do stream:
         padded = 
            (map (mat.resizedTo { rows = channels, columns = framesize * 2 })
-               (fr.frames { framesize, hop = framesize } stream));
+               (fr.frames framesize [ Hop framesize ] stream));
         map do fr: concat (map forwardTransform (mat.asRows fr)) done padded;
     done);
 
diff -r 295b66046da3 -r 8fdcf2fec5bd src/may/vamp.yeti
--- a/src/may/vamp.yeti	Tue Nov 19 19:26:48 2013 +0000
+++ b/src/may/vamp.yeti	Tue Nov 19 20:44:09 2013 +0000
@@ -265,8 +265,7 @@
         p,
         sampleRate = stream.sampleRate, 
         channels = 1,
-        blockSize, // We refer to blockSize throughout because so does Vamp...
-        framesize = blockSize, // ... but the framer uses framesize
+        blockSize,
         hop = stepSize
     };
     if p.initialise params then
@@ -280,7 +279,7 @@
                 sampleRate = stream.sampleRate
             },
             features = converted params outputNo
-               (processed params (fr.frames params stream) 0)
+               (processed params (fr.frames blockSize [ Hop stepSize ] stream) 0)
         };
         // If processing completed successfully, then p is
         // disposed by processed and stream is closed by the