changeset 101:0c5a4dc04ed9

Remove some unimplemented bits

--- a/test/test_collect.py	Tue Feb 10 10:56:44 2015 +0000
+++ b/test/test_collect.py	Tue Feb 10 12:08:22 2015 +0000
@@ -1,6 +1,7 @@
 
 import vamp
 import numpy as np
+import vamp.frames as fr
 
 plugin_key = "vamp-test-plugin:vamp-test-plugin"
 plugin_key_freq = "vamp-test-plugin:vamp-test-plugin-freq"

--- a/test/test_process.py	Tue Feb 10 10:56:44 2015 +0000
+++ b/test/test_process.py	Tue Feb 10 12:08:22 2015 +0000
@@ -74,7 +74,7 @@
         actual = results[i]["values"][0]
         assert actual == expected
 
-def test_process_summary_frames():
+def test_process_frames_summary():
     buf = input_data(blocksize * 10)
     ff = fr.frames_from_array(buf, blocksize, blocksize)
     results = list(vamp.process_frames(ff, rate, blocksize, plugin_key, "input-summary", {}))
@@ -103,7 +103,7 @@
         actual = results[i]["input-summary"]["values"][0]
         assert actual == expected
 
-def test_process_multi_summary_frames():
+def test_process_frames_multi_summary():
     buf = input_data(blocksize * 10)
     ff = fr.frames_from_array(buf, blocksize, blocksize)
     results = list(vamp.process_frames_multiple_outputs(ff, rate, blocksize, plugin_key, [ "input-summary" ], {}))

--- a/vamp/collect.py	Tue Feb 10 10:56:44 2015 +0000
+++ b/vamp/collect.py	Tue Feb 10 12:08:22 2015 +0000
@@ -141,31 +141,3 @@
     plugin.unload()
     return rv
 
-
-#!!! restore & complete this once process is refactored:
-        
-# def collect_frames(ff, channels, sample_rate, step_size, key, output = "", parameters = {}):
-
-#     plug = vampyhost.load_plugin(key, sample_rate,
-#                                  vampyhost.ADAPT_INPUT_DOMAIN +
-#                                  vampyhost.ADAPT_BUFFER_SIZE +
-#                                  vampyhost.ADAPT_CHANNEL_COUNT)
-
-#     plug.set_parameter_values(parameters)
-
-#     if not plug.initialise(channels, step_size, block_size):
-#         raise "Failed to initialise plugin"
-
-#     if output == "":
-#         output_desc = plugin.get_output(0)
-#         output = output_desc["identifier"]
-#     else:
-#         output_desc = plugin.get_output(output)
-
-#     results = process.process_frames_with_plugin(ff, sample_rate, step_size, plugin, [output])
-
-#     rv = reshape(results, sample_rate, step_size, output_desc)
-
-#     plugin.unload()
-#     return rv
-