# HG changeset patch
# User gyorgyf
# Date 1380975707 -3600
# Node ID 74703a562ce3cb0fa00837c8330e3cc7f66a3677
# Parent  82a176a8a202a06aadbe91f498ee5d0e0966fd54
Added valueNames attribute to parameter descriptor

diff -r 82a176a8a202 -r 74703a562ce3 Makefile.linux
--- a/Makefile.linux	Thu Jan 06 11:25:30 2011 +0000
+++ b/Makefile.linux	Sat Oct 05 13:21:47 2013 +0100
@@ -1,6 +1,6 @@
 
-CXXFLAGS	:= -DHAVE_NUMPY -O2 -Wall -I/usr/include/python2.6 -I/usr/lib/python2.6/dist-packages/numpy/core/include -fPIC
-LDFLAGS		:= -shared -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython2.6 -lpthread -Wl,--version-script=vamp-plugin.map
+CXXFLAGS	:= -DHAVE_NUMPY -O2 -Wall -I/usr/include/python2.7 -I/usr/lib/python2.7/dist-packages/numpy/core/include -fPIC
+LDFLAGS		:= -shared -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython2.7 -lpthread -Wl,--version-script=vamp-plugin.map
 
 default: vampy.so 
 all: vampy.so vampymod.so
@@ -18,7 +18,7 @@
 # Install plugin
 #
 INSTALL_DIR			:=$(DESTDIR)/usr/local/lib/vamp
-PYEXAMPLE_DIR			:='Example VamPy Plugins'
+PYEXAMPLE_DIR		:='Example VamPy Plugins'
 PLUGIN_NAME			:=vampy
 PLUGIN_EXT			:=.so
 
diff -r 82a176a8a202 -r 74703a562ce3 PyTypeInterface.cpp
--- a/PyTypeInterface.cpp	Thu Jan 06 11:25:30 2011 +0000
+++ b/PyTypeInterface.cpp	Sat Oct 05 13:21:47 2013 +0100
@@ -1019,6 +1019,9 @@
 		case p::quantizeStep:
 			_convert(pyValue,pd.quantizeStep);
 			break;
+		case p::valueNames:
+			_convert(pyValue,pd.valueNames);
+			break;
 		default :
 		 	setValueError("Unknown key in Vamp ParameterDescriptor",m_strict);
 			cerr << "Invalid key in Vamp ParameterDescriptor: " << key << endl; 
@@ -1180,6 +1183,7 @@
 	parmKeys["defaultValue"] = p::defaultValue;
 	parmKeys["isQuantized"] = p::isQuantized;
 	parmKeys["quantizeStep"] = p::quantizeStep;
+	parmKeys["valueNames"] = p::valueNames;
 
 	isMapInitialised = true;
 	return true;
diff -r 82a176a8a202 -r 74703a562ce3 PyTypeInterface.h
--- a/PyTypeInterface.h	Thu Jan 06 11:25:30 2011 +0000
+++ b/PyTypeInterface.h	Sat Oct 05 13:21:47 2013 +0100
@@ -72,7 +72,8 @@
 	maxValue,
 	defaultValue,
 	isQuantized,
-	quantizeStep
+	quantizeStep,
+	valueNames
 	};
 }