Mercurial > hg > may

changeset 219:ff97765b1d1b matrix_opaque_immutable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More block -> vector
author Chris Cannam
date Sat, 11 May 2013 12:07:21 +0100
parents a7f4eb1cdd72
children 937f908cae52
files yetilab/feature/features.yeti yetilab/stream/audiofile.yeti yetilab/stream/playback.yeti
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/yetilab/feature/features.yeti	Sat May 11 12:04:05 2013 +0100
+++ b/yetilab/feature/features.yeti	Sat May 11 12:07:21 2013 +0100
@@ -6,7 +6,7 @@
 fr = load yetilab.stream.framer;
 
 magdiff frame1 frame2 =
-    sum (map2 do a b: abs(a - b) done (vec.data frame1) (block.data frame2));
+    sum (map2 do a b: abs(a - b) done (vec.list frame1) (vec.list frame2));
 
 emptyFrameFor frames =
     vec.zeros
--- a/yetilab/stream/audiofile.yeti	Sat May 11 12:04:05 2013 +0100
+++ b/yetilab/stream/audiofile.yeti	Sat May 11 12:07:21 2013 +0100
@@ -66,7 +66,7 @@
         n = int(bytesRead / bytesPerSample);
         doubles = new double[n];
         decode { format } bytes doubles n;
-        vec.block doubles;
+        vec.vector doubles;
     fi;
    );
 
--- a/yetilab/stream/playback.yeti	Sat May 11 12:04:05 2013 +0100
+++ b/yetilab/stream/playback.yeti	Sat May 11 12:07:21 2013 +0100
@@ -13,7 +13,7 @@
 
 playBlock line b is ~SourceDataLine -> 'a -> () =
    (len = vec.length b;
-    samples = vec.data b;
+    samples = vec.primitive b;
     nb = len * 2;
     bytes = new byte[nb];
     bb = ByteBuffer#wrap(bytes, 0, nb);