comparison PyPlugin.cpp @ 7:a4c955e9a70b

* housekeeping: VAMP -> Vamp throughout (not an acronym)

 */
 
 
 
 /**
- * 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
 
 */
 

 		PyObject *pyDict, *pyKey, *pyValue;
 		
 		//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
 			if ( !PyDict_Check(pyDict) ) continue;
 			

 			while (PyDict_Next(pyDict, &pyPos, &pyKey, &pyValue)) 
 			{		
 				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); 
 						break;				
 					case name: 			

 						break;
 					case sampleRate:
 						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);
 		} // for list
 		Py_CLEAR(pyList);

 		PyObject *pyDict, *pyKey, *pyValue;
 		
 		//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
 			if ( !PyDict_Check(pyDict) ) continue;
 			

 			while (PyDict_Next(pyDict, &pyPos, &pyKey, &pyValue)) 
 			{		
 				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); 
 						break;				
 					case p::name: 			

 						break;
 					case p::isQuantized:
 						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);
 		} // for list
 		Py_CLEAR(pyList);

 				{	
 					emptyFeature = false;
 					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: 	
 							feature.hasTimestamp = (bool) PyInt_AS_LONG(pyValue); 
 							break;				

 							break; 								
 						case label: 			
 							feature.label = PyString_AsString(pyValue); 
 							break; 													
 						default : 	
-							cerr << "Invalid key in VAMP FeatureSet: " 
+							cerr << "Invalid key in Vamp FeatureSet: " 
 							<< PyString_AsString(pyKey) << endl; 
 					} // switch					
 
 				} // while 
 				if (emptyFeature) cerr << "Warning: This feature is empty or badly formatted." << endl;

 				{	
 					emptyFeature = false;
 					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: 	
 							feature.hasTimestamp = (bool) PyInt_AS_LONG(pyValue); 
 							break;