Mercurial > hg > may

changeset 283:e330ac62703b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 29 May 2013 17:32:58 +0100
parents f3784641245f (current diff) b432db0b2529 (diff)
children 7932bbb7bacb
files
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/yetilab/stream/audiofile.yeti	Wed May 29 17:32:27 2013 +0100
+++ b/yetilab/stream/audiofile.yeti	Wed May 29 17:32:58 2013 +0100
@@ -97,14 +97,15 @@
     aistream = AudioSystem#getAudioInputStream(f);
     format = aistream#getFormat();
     len = available' { format, aistream }; // at start of stream
+    syncd = synchronized aistream;
     {
-        get position () = len - available' { aistream, format },
+        get position () = syncd \(len - available' { aistream, format }),
         get channels () = if ch == 0 then format#getChannels() else ch fi,
         get sampleRate () = format#getSampleRate(),
-        get available () = Known (available' { aistream, format }),
-        get finished? () = not (aistream#available() > 0),
-        read = reader { aistream, format },
-        close () = close' { aistream },
+        get available () = syncd \(Known (available' { aistream, format })),
+        get finished? () = syncd \(not (aistream#available() > 0)),
+        read = syncd \(reader { aistream, format }),
+        close () = syncd \(close' { aistream }),
     });
 
 open = openWithReader read' 0;