# HG changeset patch # User Chris Cannam # Date 1369845178 -3600 # Node ID e330ac62703b2c7332249f4cade8a300d077a7b4 # Parent f3784641245f052cb42bf5b0b709b2c28f014f88# Parent b432db0b25292a6d46fbc756b6196eb6be1022fb Merge diff -r f3784641245f -r e330ac62703b yetilab/stream/audiofile.yeti --- 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;