Mercurial > hg > vampy
changeset 79:f5c028376bf9
Some old changes that, I think, probably did not help anything
| author | Chris Cannam |
|---|---|
| date | Wed, 12 Aug 2015 15:25:04 +0100 |
| parents | e101ff25d757 |
| children | e2bb3cf7adf1 |
| files | COPYING PyFeature.h PyFeatureSet.h PyOutputDescriptor.h PyParameterDescriptor.h PyPlugin.h PyRealTime.h README vampy-main.cpp |
| diffstat | 9 files changed, 15 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYING Tue Apr 14 11:14:39 2015 +0100 +++ b/COPYING Wed Aug 12 15:25:04 2015 +0100 @@ -1,7 +1,8 @@ VamPy - Centre for Digital Music, Queen Mary University of London. - Copyright (C) 2008-2009 Gyorgy Fazekas, QMUL. + Centre for Digital Music, Queen Mary University of London + Copyright (C) 2008-2009 Gyorgy Fazekas + Copyright (C) 2008-2015 Queen Mary, University of London Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
--- a/PyFeature.h Tue Apr 14 11:14:39 2015 +0100 +++ b/PyFeature.h Wed Aug 12 15:25:04 2015 +0100 @@ -41,7 +41,7 @@ /// pointer to type interface required: PyTypeInterface ti; } FeatureObject; -PyAPI_DATA(PyTypeObject) Feature_Type; +extern PyTypeObject Feature_Type; #define PyFeature_CheckExact(v) ((v)->ob_type == &Feature_Type) #define PyFeature_Check(v) PyObject_TypeCheck(v, &Feature_Type)
--- a/PyFeatureSet.h Tue Apr 14 11:14:39 2015 +0100 +++ b/PyFeatureSet.h Wed Aug 12 15:25:04 2015 +0100 @@ -18,11 +18,11 @@ PyDictObject dict; } FeatureSetObject; -PyAPI_DATA(PyTypeObject) FeatureSet_Type; +extern PyTypeObject FeatureSet_Type; #define PyFeatureSet_CheckExact(v) ((v)->ob_type == &FeatureSet_Type) #define PyFeatureSet_Check(v) PyObject_TypeCheck(v, &FeatureSet_Type) -void initFeatureSetType(void); +extern void initFeatureSetType(void); #endif
--- a/PyOutputDescriptor.h Tue Apr 14 11:14:39 2015 +0100 +++ b/PyOutputDescriptor.h Wed Aug 12 15:25:04 2015 +0100 @@ -19,7 +19,7 @@ PyObject *dict; } OutputDescriptorObject; -PyAPI_DATA(PyTypeObject) OutputDescriptor_Type; +extern PyTypeObject OutputDescriptor_Type; #define PyOutputDescriptor_CheckExact(v) ((v)->ob_type == &OutputDescriptor_Type) #define PyOutputDescriptor_Check(v) PyObject_TypeCheck(v, &OutputDescriptor_Type)
--- a/PyParameterDescriptor.h Tue Apr 14 11:14:39 2015 +0100 +++ b/PyParameterDescriptor.h Wed Aug 12 15:25:04 2015 +0100 @@ -19,7 +19,7 @@ PyObject *dict; } ParameterDescriptorObject; -PyAPI_DATA(PyTypeObject) ParameterDescriptor_Type; +extern PyTypeObject ParameterDescriptor_Type; #define PyParameterDescriptor_CheckExact(v) ((v)->ob_type == &ParameterDescriptor_Type) #define PyParameterDescriptor_Check(v) PyObject_TypeCheck(v, &ParameterDescriptor_Type)
--- a/PyPlugin.h Tue Apr 14 11:14:39 2015 +0100 +++ b/PyPlugin.h Wed Aug 12 15:25:04 2015 +0100 @@ -9,40 +9,6 @@ */ -/* - Vamp - - An API for audio analysis and feature extraction plugins. - - Centre for Digital Music, Queen Mary, University of London. - Copyright 2006 Chris Cannam. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR - ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the names of the Centre for - Digital Music; Queen Mary, University of London; and Chris Cannam - shall not be used in advertising or otherwise to promote the sale, - use or other dealings in this Software without prior written - authorization. -*/ - #ifndef _PYTHON_WRAPPER_PLUGIN_H_ #define _PYTHON_WRAPPER_PLUGIN_H_
--- a/PyRealTime.h Tue Apr 14 11:14:39 2015 +0100 +++ b/PyRealTime.h Wed Aug 12 15:25:04 2015 +0100 @@ -19,7 +19,7 @@ Vamp::RealTime *rt; } RealTimeObject; -PyAPI_DATA(PyTypeObject) RealTime_Type; +extern PyTypeObject RealTime_Type; #define PyRealTime_CheckExact(v) ((v)->ob_type == &RealTime_Type) #define PyRealTime_Check(v) PyObject_TypeCheck(v, &RealTime_Type) @@ -29,10 +29,10 @@ /* PyRealTime C++ API */ -PyAPI_FUNC(PyObject *) +extern PyObject * PyRealTime_FromRealTime(Vamp::RealTime&); -PyAPI_FUNC(const Vamp::RealTime*) +extern const Vamp::RealTime* PyRealTime_AsRealTime (PyObject *self);
--- a/README Tue Apr 14 11:14:39 2015 +0100 +++ b/README Wed Aug 12 15:25:04 2015 +0100 @@ -1,5 +1,5 @@ -* Vampy is a wrapper for the Vamp audio analysis plugin API. + Vampy is a wrapper for the Vamp audio analysis plugin API. (http://www.vamp-plugins.org/) It allows for writing Vamp plugins in Python.
--- a/vampy-main.cpp Tue Apr 14 11:14:39 2015 +0100 +++ b/vampy-main.cpp Wed Aug 12 15:25:04 2015 +0100 @@ -286,7 +286,9 @@ const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int version,unsigned int index) -{ +{ + DSTREAM << "# vampGetPluginDescriptor(" << version << "," << index << ")" << endl; + if (version < 1) return 0; int isPythonInitialized = Py_IsInitialized();