Mercurial > hg > vampy-host
changeset 77:aa8491a11530
Naming: Constants -> CONSTANTS
| author | Chris Cannam |
|---|---|
| date | Wed, 21 Jan 2015 12:22:13 +0000 |
| parents | b2afd385586f |
| children | f61ca3c81272 |
| files | native/vampyhost.cpp test/test_plugin_metadata.py test/test_processBlock.py vamp/collect.py vamp/load.py |
| diffstat | 5 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/native/vampyhost.cpp Wed Jan 21 12:13:45 2015 +0000 +++ b/native/vampyhost.cpp Wed Jan 21 12:22:13 2015 +0000 @@ -291,27 +291,27 @@ return; } - if (setint(dict, "OneSamplePerStep", + if (setint(dict, "ONE_SAMPLE_PER_STEP", Plugin::OutputDescriptor::OneSamplePerStep) < 0 || - setint(dict, "FixedSampleRate", + setint(dict, "FIXED_SAMPLE_RATE", Plugin::OutputDescriptor::FixedSampleRate) < 0 || - setint(dict, "VariableSampleRate", + setint(dict, "VARIABLE_SAMPLE_RATE", Plugin::OutputDescriptor::VariableSampleRate) < 0 || - setint(dict, "TimeDomain", + setint(dict, "TIME_DOMAIN", Plugin::TimeDomain) < 0 || - setint(dict, "FrequencyDomain", + setint(dict, "FREQUENCY_DOMAIN", Plugin::FrequencyDomain) < 0 || - setint(dict, "AdaptNone", + setint(dict, "ADAPT_NONE", 0) < 0 || - setint(dict, "AdaptInputDomain", + setint(dict, "ADAPT_INPUT_DOMAIN", PluginLoader::ADAPT_INPUT_DOMAIN) < 0 || - setint(dict, "AdaptChannelCount", + setint(dict, "ADAPT_CHANNEL_COUNT", PluginLoader::ADAPT_CHANNEL_COUNT) < 0 || - setint(dict, "AdaptBufferSize", + setint(dict, "ADAPT_BUFFER_SIZE", PluginLoader::ADAPT_BUFFER_SIZE) < 0 || - setint(dict, "AdaptAllSafe", + setint(dict, "ADAPT_ALL_SAFE", PluginLoader::ADAPT_ALL_SAFE) < 0 || - setint(dict, "AdaptAll", + setint(dict, "ADAPT_ALL", PluginLoader::ADAPT_ALL) < 0) { cerr << "ERROR: initvampyhost: Failed to add enums to module dictionary" << endl; return;
--- a/test/test_plugin_metadata.py Wed Jan 21 12:13:45 2015 +0000 +++ b/test/test_plugin_metadata.py Wed Jan 21 12:22:13 2015 +0000 @@ -11,7 +11,7 @@ def test_plugin_exists(): assert testPluginKey in vh.listPlugins() - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) assert "pluginVersion" in plug.info if plug.info["pluginVersion"] != expectedVersion: print("Test plugin version " + str(plug.info["pluginVersion"]) + " does not match expected version " + str(expectedVersion)) @@ -26,19 +26,19 @@ assert "input-summary" in outputs def test_inputdomain(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) - assert plug.inputDomain == vh.TimeDomain + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) + assert plug.inputDomain == vh.TIME_DOMAIN def test_info(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) assert plug.info["identifier"] == "vamp-test-plugin" def test_parameterdescriptors(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) assert plug.parameters[0]["identifier"] == "produce_output" def test_setparameter(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) assert plug.parameters[0]["identifier"] == "produce_output" assert plug.parameters[0]["defaultValue"] == 1 assert plug.getParameterValue("produce_output") == plug.parameters[0]["defaultValue"]
--- a/test/test_processBlock.py Wed Jan 21 12:13:45 2015 +0000 +++ b/test/test_processBlock.py Wed Jan 21 12:22:13 2015 +0000 @@ -7,7 +7,7 @@ rate = 44100 def test_load_unload(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) plug.unload() try: plug.unload() # should throw but not crash @@ -16,7 +16,7 @@ pass def test_get_set_parameter(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) value = plug.getParameterValue("produce_output") assert(value == 1.0) plug.setParameterValue("produce_output", 0.0) @@ -24,7 +24,7 @@ assert(value == 0.0) def test_process_without_initialise(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) try: plug.processBlock([[1,2,3,4]], vh.RealTime(0, 0)) assert False @@ -32,7 +32,7 @@ pass def test_process_input_format(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) plug.initialise(2, 4, 4) # channels, stepsize, blocksize result = plug.processBlock([[1,2,3,4],[5,6,7,8]], vh.RealTime(0, 0)) result = plug.processBlock([np.array([1,2,3,4]),np.array([5,6,7,8])], vh.RealTime(0, 0)) @@ -57,7 +57,7 @@ pass def test_process_output_1ch(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) plug.initialise(1, 2, 2) try: # Too many channels @@ -71,7 +71,7 @@ assert result[8] == [ { "label" : "", "values" : np.array([4.0]) } ] def test_process_output_2ch(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) plug.initialise(2, 2, 2) try: # Too few channels @@ -91,7 +91,7 @@ assert (result[8][0]["values"] == np.array([4.0,5.0])).all() def test_process_output_3ch(): - plug = vh.loadPlugin(testPluginKey, rate, vh.AdaptNone) + plug = vh.loadPlugin(testPluginKey, rate, vh.ADAPT_NONE) plug.initialise(3, 2, 2) try: # Too few channels
--- a/vamp/collect.py Wed Jan 21 12:13:45 2015 +0000 +++ b/vamp/collect.py Wed Jan 21 12:22:13 2015 +0000 @@ -22,12 +22,12 @@ # n = 0 -# if outputDict.sampleType == vampyhost.OneSamplePerStep: +# if outputDict.sampleType == vampyhost.ONE_SAMPLE_PER_STEP: # for True: # yield vampyhost.frame2RealTime(n * stepSize, sampleRate) # n = n + 1 -# elif outputDict.sampleType == vampyhost.FixedSampleRate: +# elif outputDict.sampleType == vampyhost.FIXED_SAMPLE_RATE: # for True:
--- a/vamp/load.py Wed Jan 21 12:13:45 2015 +0000 +++ b/vamp/load.py Wed Jan 21 12:22:13 2015 +0000 @@ -7,8 +7,8 @@ def loadAndConfigureFor(data, sampleRate, key, parameters): plug = vampyhost.loadPlugin(key, sampleRate, - vampyhost.AdaptInputDomain + - vampyhost.AdaptChannelCount) + vampyhost.ADAPT_INPUT_DOMAIN + + vampyhost.ADAPT_CHANNEL_COUNT) plug.setParameterValues(parameters)