changeset 81:2423c40db780

Return structure, configuration etc along with features

--- a/audiofile.yeti	Wed Mar 06 21:06:16 2013 +0000
+++ b/audiofile.yeti	Wed Mar 06 21:59:22 2013 +0000
@@ -91,23 +91,27 @@
     stream#close();
 
 open name is string -> 'a = 
-   (f = new File(name);
-    stream = AudioSystem#getAudioInputStream(f);
-    format = stream#getFormat();
-    len = available' { format, stream }; // at start of stream
-    str.stream {
-        stream,
-        format,
-        len,
-        rate = format#getSampleRate(),
-        channels = format#getChannels(),
-        get position () = len - available' { stream, format },
-        get available () = available' { stream, format },
-        read = read' { stream, format },
-        readInterleaved = readInterleaved' { stream, format },
-        readMono = readMono' { stream, format },
-        close () = close' { stream },
-    } );
+    try
+        f = new File(name);
+        stream = AudioSystem#getAudioInputStream(f);
+        format = stream#getFormat();
+        len = available' { format, stream }; // at start of stream
+        Stream (str.stream {
+            stream,
+            format,
+            len,
+            rate = format#getSampleRate(),
+            channels = format#getChannels(),
+            get position () = len - available' { stream, format },
+            get available () = available' { stream, format },
+            read = read' { stream, format },
+            readInterleaved = readInterleaved' { stream, format },
+            readMono = readMono' { stream, format },
+            close () = close' { stream },
+        });
+    catch Exception e:
+        Error "Failed to open audio file \"\(name)\": \(e)";
+    yrt;
 
 {
     open

--- a/framer.yeti	Wed Mar 06 21:06:16 2013 +0000
+++ b/framer.yeti	Wed Mar 06 21:59:22 2013 +0000
@@ -63,12 +63,21 @@
     frequencyDomainFrames,
 
     framesOfFile parameters filename =
-        frames parameters (af.open filename),
+        case af.open filename of
+        Stream s: Frames (frames parameters s);
+        Error e: Error e;
+        esac,
 
     windowedFramesOfFile parameters filename = 
-        windowedFrames parameters (af.open filename),
+        case af.open filename of
+        Stream s: Frames (windowedFrames parameters s);
+        Error e: Error e;
+        esac,
 
     frequencyDomainFramesOfFile parameters filename = 
-        frequencyDomainFrames parameters (af.open filename),
+        case af.open filename of
+        Stream s: Frames (frequencyDomainFrames parameters s);
+        Error e: Error e;
+        esac,
 }
 

--- a/vamp.yeti	Wed Mar 06 21:06:16 2013 +0000
+++ b/vamp.yeti	Wed Mar 06 21:59:22 2013 +0000
@@ -36,11 +36,9 @@
         list result
     fi;
 
-numberOf n is ~Object -> number =
-   (n unsafely_as ~Integer)#intValue();
-
 featureSet fs is ~Map -> 'a =
-   (s = [:];
+   (numberOf n is ~Object -> number = (n unsafely_as ~Integer)#intValue();
+    s = [:];
     kk = list fs#keySet()#toArray();
     for kk do k: s[numberOf k] := featureList fs#get(k) done;
     s);
@@ -168,8 +166,8 @@
     get hasRdfDescription () = (rdfData != None ()),
     get infoURL () = case rdfData of Some data: data.infoURL; None (): "" esac,
     get parameters () = array (map parameterDescriptor p#getParameterDescriptors()),
-    parameter identifier = p#getParameter(identifier),
-    setParameter identifier value = p#setParameter(identifier, value),
+    parameterValue identifier = p#getParameter(identifier),
+    setParameterValue identifier value = p#setParameter(identifier, value),
     get programs () = array (map string p#getPrograms()),
     get currentProgram () = p#getCurrentProgram(),
     selectProgram pr = p#selectProgram(pr),
@@ -178,7 +176,7 @@
     get preferredStepSize () = p#getPreferredStepSize(),
     get minChannelCount () = p#getMinChannelCount(),
     get maxChannelCount () = p#getMaxChannelCount(),
-    initialise { channels, blocksize, hop } = p#initialise(channels, hop, blocksize),
+    initialise { channels, hop, blockSize } = p#initialise(channels, hop, blockSize),
     reset () = p#reset(),
     get outputs () =
         array case rdfData of
@@ -207,7 +205,7 @@
                 PluginLoader$AdapterFlags#ADAPT_INPUT_DOMAIN +
                 PluginLoader$AdapterFlags#ADAPT_CHANNEL_COUNT))
     catch PluginLoader$LoadFailedException _:
-        Error "Failed to load Vamp plugin with key '\(key)'"
+        Error "Failed to load Vamp plugin with key \(key)"
     yrt;
 
 processed { p, sampleRate, hop } frames count =
@@ -232,28 +230,40 @@
         outputNo = outputNumberByName p output;
         if outputNo >= 0 then
             blockSize = p.preferredBlockSize;
-            hop = p.preferredStepSize;
+            stepSize = p.preferredStepSize;
+            channels = 1;
             params = {
                 p, sampleRate = stream.sampleRate, channels = 1,
-                framesize = blockSize, blocksize = blockSize, hop
+                framesize = blockSize, blockSize, hop = stepSize
             };
             if p.initialise params then
-                OK (converted params outputNo
-                       (processed params (fr.frames params stream) 0));
+                OK {
+                key = key,
+                output = p.outputs[outputNo],
+                parameters = mapIntoHash id p.parameterValue (map (.identifier) p.parameters),
+                config = { channels, blockSize, stepSize,
+                           sampleRate = stream.sampleRate },
+                features = converted params outputNo
+                   (processed params (fr.frames params stream) 0)
+                };
                 // If processing completed successfully, then p is
                 // disposed by processed and stream is closed by the
                 // framer
             else
-                errorReturn "Failed to initialise plugin '\(key)' with parameters \(params)";
+                errorReturn "Failed to initialise plugin \(key) with channels = \(channels), blockSize = \(blockSize), stepSize = \(stepSize)";
             fi;
         else
             outputNames = strJoin ", " (map (.identifier) p.outputs);
-            errorReturn "Plugin '\(key)' has no output named '\(output)' (outputs are \(outputNames))"
+            errorReturn "Plugin \(key) has no output named \(output) (outputs are \(outputNames))"
         fi;
     Error e: Error e;
     esac;
 
-processFile key output filename = process key output (af.open filename);
+processFile key output filename = 
+    case af.open filename of
+    Stream s: process key output s;
+    Error e: Error e;
+    esac;
 
 {
 get pluginPath = getPluginPath,