Mercurial > hg > vampy

changeset 7:a4c955e9a70b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* housekeeping: VAMP -> Vamp throughout (not an acronym)
author cannam
date Wed, 11 Jun 2008 16:04:52 +0000
parents e1b508f2f914
children 3af6b5990ad8
files Example VamPy plugins/PyZeroCrossing.py PyPlugScanner.cpp PyPlugin.cpp PyPlugin.h README pyvamp-main.cpp
diffstat 6 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Example VamPy plugins/PyZeroCrossing.py	Wed Mar 19 16:02:29 2008 +0000
+++ b/Example VamPy plugins/PyZeroCrossing.py	Wed Jun 11 16:04:52 2008 +0000
@@ -1,5 +1,5 @@
 '''PyZeroCrossing.py - Example plugin demonstrates''' 
-'''how to call a python class using the VamPy VAMP plugin'''
+'''how to call a python class using the VamPy Vamp plugin'''
 
 #from time import *
 #import sys
@@ -142,4 +142,4 @@
 		
 		#return a LIST of list of dictionaries
 		return [output0,output1]
-		
\ No newline at end of file
+		
--- a/PyPlugScanner.cpp	Wed Mar 19 16:02:29 2008 +0000
+++ b/PyPlugScanner.cpp	Wed Jun 11 16:04:52 2008 +0000
@@ -1,5 +1,5 @@
 /**
- * This VAMP plugin is a wrapper for Python Scripts. (VamPy)
+ * This Vamp plugin is a wrapper for Python Scripts. (VamPy)
  * Centre for Digital Music, Queen Mary, University of London.
  * Copyright 2008, George Fazekas.
 
--- a/PyPlugin.cpp	Wed Mar 19 16:02:29 2008 +0000
+++ b/PyPlugin.cpp	Wed Jun 11 16:04:52 2008 +0000
@@ -35,14 +35,14 @@
 
 
 /**
- * This VAMP plugin is a wrapper for Python Scripts. (vampy)
+ * This Vamp plugin is a wrapper for Python Scripts. (vampy)
  * Centre for Digital Music, Queen Mary, University of London.
  * Copyright 2008, George Fazekas.
 
 TODO:	needs more complete error checking 
 	  	needs correct implementation of Python threading
 	  	more efficient data conversion using the buffering interface or ctypes
-	 	VAMP programs not implemented
+	 	Vamp programs not implemented
 		support multiple plugins per script in scanner
 		ensure proper cleanup, host do a good job though
 
@@ -515,7 +515,7 @@
 		//Parse Output List
 		for (Py_ssize_t i = 0; i < PyList_GET_SIZE(pyList); ++i) {
 	
-			//Get i-th VAMP output descriptor (Borrowed Reference)
+			//Get i-th Vamp output descriptor (Borrowed Reference)
 			pyDict = PyList_GET_ITEM(pyList,i);
 			
 			//We only care about dictionaries holding output descriptors
@@ -530,7 +530,7 @@
 				switch (outKeys[PyString_AsString(pyKey)]) 
 				{
 					case not_found : 	
-						cerr << "Unknown key in VAMP OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
+						cerr << "Unknown key in Vamp OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
 						break;
 					case identifier: 	
 						od.identifier = PyString_AsString(pyValue); 
@@ -575,7 +575,7 @@
 						od.sampleRate = (float) PyFloat_AS_DOUBLE(pyValue);
 						break;					
 					default : 	
-						cerr << "Invalid key in VAMP OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
+						cerr << "Invalid key in Vamp OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
 				} 					
 			} // while dict
 			list.push_back(od);
@@ -616,7 +616,7 @@
 		//Parse Output List
 		for (Py_ssize_t i = 0; i < PyList_GET_SIZE(pyList); ++i) {
 	
-			//Get i-th VAMP output descriptor (Borrowed Reference)
+			//Get i-th Vamp output descriptor (Borrowed Reference)
 			pyDict = PyList_GET_ITEM(pyList,i);
 			
 			//We only care about dictionaries holding output descriptors
@@ -631,7 +631,7 @@
 				switch (parmKeys[PyString_AsString(pyKey)]) 
 				{
 					case not_found : 	
-						cerr << "Unknown key in VAMP OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
+						cerr << "Unknown key in Vamp OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
 						break;
 					case p::identifier: 	
 						pd.identifier = PyString_AsString(pyValue); 
@@ -658,7 +658,7 @@
 						pd.isQuantized = (bool) PyInt_AS_LONG(pyValue); 
 						break;					
 					default : 	
-						cerr << "Invalid key in VAMP OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
+						cerr << "Invalid key in Vamp OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
 				} 				
 			} // while dict
 			list.push_back(pd);
@@ -864,7 +864,7 @@
 					switch (ffKeys[PyString_AsString(pyKey)]) 
 					{
 						case not_found : 	
-							cerr << "Unknown key in VAMP FeatureSet: " 
+							cerr << "Unknown key in Vamp FeatureSet: " 
 							<< PyString_AsString(pyKey) << endl; 
 							break;
 						case hasTimestamp: 	
@@ -882,7 +882,7 @@
 							feature.label = PyString_AsString(pyValue); 
 							break; 													
 						default : 	
-							cerr << "Invalid key in VAMP FeatureSet: " 
+							cerr << "Invalid key in Vamp FeatureSet: " 
 							<< PyString_AsString(pyKey) << endl; 
 					} // switch					
 
@@ -956,7 +956,7 @@
 					switch (ffKeys[PyString_AsString(pyKey)]) 
 					{
 						case not_found : 	
-							cerr << "Unknown key in VAMP FeatureSet: " 
+							cerr << "Unknown key in Vamp FeatureSet: " 
 							<< PyString_AsString(pyKey) << endl; 
 							break;
 						case hasTimestamp: 	
--- a/PyPlugin.h	Wed Mar 19 16:02:29 2008 +0000
+++ b/PyPlugin.h	Wed Jun 11 16:04:52 2008 +0000
@@ -33,7 +33,7 @@
 */
 
 	/**
-	 * This plugin abstracts appropriate Python Scripts as a VAMP plugin.
+	 * This plugin abstracts appropriate Python Scripts as a Vamp plugin.
 	*/
 
 #ifndef _PYTHON_WRAPPER_PLUGIN_H_
--- a/README	Wed Mar 19 16:02:29 2008 +0000
+++ b/README	Wed Jun 11 16:04:52 2008 +0000
@@ -1,12 +1,12 @@
 
- * VamPy is a VAMP plugin wrapper for Python Scripts.
+ * VamPy is a Vamp plugin wrapper for Python Scripts.
 
 WHAT IS IT FOR?
 	
-	you can write VAMP plugins in Python which can do the same as the native C++ plugins
+	you can write Vamp plugins in Python which can do the same as the native C++ plugins
 	plus more if you're using advanced Python modules.
 
-	you might get into VAMP development more easily this way.
+	you might get into Vamp development more easily this way.
 	you can use it for prototyping your plugin before writing in C++	 
 
 
@@ -26,15 +26,15 @@
 
 	(1) Make sure you have Python installed.
 	(2) Compile the C++ source or ask me for a binary (MacOS).
-	(3) Copy the library in your Vamp plugin directory like any other VAMP plugins: 
-		eg. /Library/Audio/Plug-Ins/VAMP
+	(3) Copy the library in your Vamp plugin directory like any other Vamp plugins: 
+		eg. /Library/Audio/Plug-Ins/Vamp
 	(4) Write your python plugins and copy them to the same place.
 	(5) Each plugin must contain a single class with the same name as your script file.
 		e.g. PyZeroCrossing.py -> calss PyZeroCrossing
 		-Scripts with syntax errors in them are ignored.
 		-Scripts not having the same class as the filename are ignored.
 		-Other unknown scripts are likely to cause a nasty crash. 
-		(Don't put other python scripts in your VAMP directory.)
+		(Don't put other python scripts in your Vamp directory.)
 
 	
 WHY PYTHON?
@@ -55,13 +55,13 @@
 	g++  -dynamiclib   -o vamp-pyvamp-plugin.dylib ./PyPlugScanner.o ./PyPlugin.o ./pyvamp-main.o sdk/vamp-sdk/libvamp-sdk.a 
 	-u _PyMac_Error /Library/Frameworks/Python.framework/Versions/2.5/Python
 	
-	(3) There is a modified Makefile from the VAMP-SDK that compiles this plugin by default.
+	(3) There is a modified Makefile from the Vamp SDK that compiles this plugin by default.
 
 
 TODO:	needs more complete error checking 
 	  	needs correct implementation of Python threading
 	  	more efficient data conversion using the buffering interface or ctypes
-	 	VAMP 'programs' not implemented
+	 	Vamp 'programs' not implemented
 		support multiple classes per script in scanner
 		ensure proper cleanup, (host do a good job though)
 
--- a/pyvamp-main.cpp	Wed Mar 19 16:02:29 2008 +0000
+++ b/pyvamp-main.cpp	Wed Jun 11 16:04:52 2008 +0000
@@ -35,7 +35,7 @@
 */
 
 /**
- * This VAMP plugin is a wrapper for Python Scripts. (VamPy)
+ * This Vamp plugin is a wrapper for Python Scripts. (VamPy)
  * Centre for Digital Music, Queen Mary, University of London.
  * Copyright 2008, George Fazekas.
 */