changeset 501:48ed2e6bf4fd redo_framer

Type stream -> stream_t

--- a/src/may/stream/audiofile.yeti	Wed Nov 20 08:07:45 2013 +0000
+++ b/src/may/stream/audiofile.yeti	Wed Nov 20 08:18:37 2013 +0000
@@ -55,7 +55,7 @@
 close' { aistream is ~AudioInputStream } =
     aistream#close();
 
-openWithReader reader ch name is 'a -> number -> string -> stream =
+openWithReader reader ch name is 'a -> number -> string -> stream_t =
    (f = new File(name);
     aistream = AudioSystem#getAudioInputStream(f);
     format = aistream#getFormat();
@@ -95,7 +95,7 @@
  * : str = audiofile.open "in.wav";
  * : n = audiofile.write str "out.wav";
  */
-write str name is stream -> string -> number =
+write str name is stream_t -> string -> number =
    (var tot = 0;
     case str.available of
     Infinite (): failWith "Cannot write infinite stream to file";
@@ -161,8 +161,8 @@
     openMono,
     write,
 } as {
-    open is string -> stream,
-    openMono is string -> stream,
-    write is stream -> string -> number,
+    open is string -> stream_t,
+    openMono is string -> stream_t,
+    write is stream_t -> string -> number,
 } 
 

--- a/src/may/stream/convolve.yeti	Wed Nov 20 08:07:45 2013 +0000
+++ b/src/may/stream/convolve.yeti	Wed Nov 20 08:18:37 2013 +0000
@@ -147,6 +147,6 @@
     esac);
 
 {
-    convolvedWith is list<Fast boolean | Framesize number> -> mat.matrix_t -> stream -> stream,
+    convolvedWith is list<Fast boolean | Framesize number> -> mat.matrix_t -> stream_t -> stream_t,
 }
 

--- a/src/may/stream/manipulate.yeti	Wed Nov 20 08:07:45 2013 +0000
+++ b/src/may/stream/manipulate.yeti	Wed Nov 20 08:18:37 2013 +0000
@@ -367,20 +367,20 @@
     };
 
 {
-    withDuration is number -> stream -> stream,
-    delayedBy is number -> stream -> stream,
-    extendedBy is number -> stream -> stream,
-    paddedBy is number -> stream -> stream,
-    scaledBy is number -> stream -> stream,
-    inverted is stream -> stream,
-    mixedTo is number -> stream -> stream,
-    sum is list<stream> -> stream = sum',
-    mean is list<stream> -> stream,
-    difference is stream -> stream -> stream,
-    multiplexed is list<stream> -> stream,
-    repeated is stream -> stream,
-    duplicated is number -> stream -> array<stream>,
-    spaced is number -> stream -> stream,
-    picked is number -> stream -> stream,
+    withDuration is number -> stream_t -> stream_t,
+    delayedBy is number -> stream_t -> stream_t,
+    extendedBy is number -> stream_t -> stream_t,
+    paddedBy is number -> stream_t -> stream_t,
+    scaledBy is number -> stream_t -> stream_t,
+    inverted is stream_t -> stream_t,
+    mixedTo is number -> stream_t -> stream_t,
+    sum is list<stream_t> -> stream_t = sum',
+    mean is list<stream_t> -> stream_t,
+    difference is stream_t -> stream_t -> stream_t,
+    multiplexed is list<stream_t> -> stream_t,
+    repeated is stream_t -> stream_t,
+    duplicated is number -> stream_t -> array<stream_t>,
+    spaced is number -> stream_t -> stream_t,
+    picked is number -> stream_t -> stream_t,
 }
 

--- a/src/may/stream/syntheticstream.yeti	Wed Nov 20 08:07:45 2013 +0000
+++ b/src/may/stream/syntheticstream.yeti	Wed Nov 20 08:18:37 2013 +0000
@@ -111,15 +111,15 @@
     };
 
 {
-    generated is number -> (number -> number) -> stream, 
-    precalculated is number -> mat.matrix_t -> stream,
-    precalculatedMono is number -> vec.vector_t -> stream,
-    precalculatedRepeated is number -> mat.matrix_t -> stream,
-    sinusoid is number -> number -> stream, 
-    whiteNoise is number -> stream,
-    pulseTrain is number -> number -> stream,
-    silent is number -> stream,
-    empty is number -> number -> stream,
+    generated is number -> (number -> number) -> stream_t, 
+    precalculated is number -> mat.matrix_t -> stream_t,
+    precalculatedMono is number -> vec.vector_t -> stream_t,
+    precalculatedRepeated is number -> mat.matrix_t -> stream_t,
+    sinusoid is number -> number -> stream_t, 
+    whiteNoise is number -> stream_t,
+    pulseTrain is number -> number -> stream_t,
+    silent is number -> stream_t,
+    empty is number -> number -> stream_t,
 }
 
 

--- a/src/may/stream/type.yeti	Wed Nov 20 08:07:45 2013 +0000
+++ b/src/may/stream/type.yeti	Wed Nov 20 08:18:37 2013 +0000
@@ -3,7 +3,7 @@
 
 mat = load may.matrix;
 
-typedef stream =
+typedef stream_t =
     {
         position is number,
         channels is number,

--- a/src/may/stream/waves.yeti	Wed Nov 20 08:07:45 2013 +0000
+++ b/src/may/stream/waves.yeti	Wed Nov 20 08:18:37 2013 +0000
@@ -65,9 +65,9 @@
 triangle = cached triangle';
 
 {
-    square is number -> number -> stream,
-    saw is number -> number -> stream, 
-    triangle is number -> number -> stream,
+    square is number -> number -> stream_t,
+    saw is number -> number -> stream_t, 
+    triangle is number -> number -> stream_t,
     cycleLengthFor is number -> number -> number,
 }