Mercurial > hg > vampy

changeset 41:94d09b4027aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge r1089 from earlier vampy2 branch
author cannam
date Mon, 05 Oct 2009 12:51:08 +0000
parents e06c3488314a
children 06bbfa2aa51a
files PyTypeInterface.cpp VamPy.vcproj
diffstat 2 files changed, 60 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/PyTypeInterface.cpp	Mon Oct 05 12:47:58 2009 +0000
+++ b/PyTypeInterface.cpp	Mon Oct 05 12:51:08 2009 +0000
@@ -132,7 +132,7 @@
 	}
 	
 	// convert the first element of any iterable sequence (for convenience and backwards compatibility)
-	if (PySequence_Check(pyValue) and PySequence_Size(pyValue) > 0) 
+	if (PySequence_Check(pyValue) && PySequence_Size(pyValue) > 0) 
 	{
 		PyObject* item = PySequence_GetItem(pyValue,0);
 		if (item)
@@ -216,7 +216,7 @@
 	}
 	
 	// convert the first element of iterable sequences
-	if (PySequence_Check(pyValue) and PySequence_Size(pyValue) > 0) 
+	if (PySequence_Check(pyValue) && PySequence_Size(pyValue) > 0) 
 	{
 		PyObject* item = PySequence_GetItem(pyValue,0);
 		if (item)
--- a/VamPy.vcproj	Mon Oct 05 12:47:58 2009 +0000
+++ b/VamPy.vcproj	Mon Oct 05 12:51:08 2009 +0000
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;..\vamp-plugin-sdk&quot;;C:\Python26\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VAMPY_EXPORTS;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VAMPY_EXPORTS;HAVE_NUMPY"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -178,6 +178,26 @@
 				>
 			</File>
 			<File
+				RelativePath=".\PyExtensionModule.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PyFeature.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PyFeatureSet.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PyOutputDescriptor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PyParameterDescriptor.h"
+				>
+			</File>
+			<File
 				RelativePath=".\PyPlugin.h"
 				>
 			</File>
@@ -185,6 +205,14 @@
 				RelativePath=".\PyPlugScanner.h"
 				>
 			</File>
+			<File
+				RelativePath=".\PyRealTime.h"
+				>
+			</File>
+			<File
+				RelativePath=".\PyTypeInterface.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -202,6 +230,26 @@
 				>
 			</File>
 			<File
+				RelativePath=".\PyExtensionModule.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PyFeature.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PyFeatureSet.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PyOutputDescriptor.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PyParameterDescriptor.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\PyPlugin.cpp"
 				>
 			</File>
@@ -210,7 +258,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\pyvamp-main.cpp"
+				RelativePath=".\PyRealTime.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\PyTypeInterface.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\vampy-main.cpp"
 				>
 			</File>
 		</Filter>