# HG changeset patch # User Chris Cannam # Date 1421229505 0 # Node ID c444be7637c07da56679e87a08e872244c855326 # Parent a0243984805b7833b580745247d967a42d335df6 Adapter flags; tidy diff -r a0243984805b -r c444be7637c0 test/test_frames.py --- a/test/test_frames.py Wed Jan 14 09:58:15 2015 +0000 +++ b/test/test_frames.py Wed Jan 14 09:58:25 2015 +0000 @@ -17,6 +17,7 @@ ff = to_lists(vamp.framesFromArray(buf, 2, 2)) assert(ff == [[[0,1],[6,7]],[[2,3],[8,9]],[[4,5],[10,11]]]) ff = to_lists(vamp.framesFromArray(buf, 1, 2)) - assert(ff == [[[0,1],[6,7]],[[1,2],[7,8]],[[2,3],[8,9]],[[3,4],[9,10]],[[4,5],[10,11]],[[5,0],[11,0]]]) + assert(ff == [[[0,1],[6,7]],[[1,2],[7,8]],[[2,3],[8,9]], + [[3,4],[9,10]],[[4,5],[10,11]],[[5,0],[11,0]]]) diff -r a0243984805b -r c444be7637c0 vamp/__init__.py --- a/vamp/__init__.py Wed Jan 14 09:58:15 2015 +0000 +++ b/vamp/__init__.py Wed Jan 14 09:58:25 2015 +0000 @@ -25,7 +25,9 @@ i = i + stepSize def process(data, samplerate, key, parameters, outputs): - plug = vampyhost.loadPlugin(key, samplerate, vampyhost.AdaptNone) ##!!! input domain + plug = vampyhost.loadPlugin(key, samplerate, + vampyhost.AdaptInputDomain + + vampyhost.AdaptChannelCount) stepSize = plug.getPreferredStepSize() blockSize = plug.getPreferredBlockSize() ff = framesFromArray(data, stepSize, blockSize)