Merge pull request #2335 from richardeakin/rte/audio_tests_update

Audio tests update, consolidated into one app

include/cinder/audio/Context.h

@@ -133,6 +133,9 @@ class CI_API Context : public std::enable_shared_from_this<Context> {
 	//! Returns the time in seconds spent during the last process loop.
 	double getTimeDuringLastProcessLoop() const	{ return mTimeDuringLastProcessLoop; }
 
+	//! Returns nodes that are pulled by the graph (not connected to the output)
+	const	std::vector<Node *>& getAutoPulledNodes();
+
 	//! Returns a string representation of the Node graph for debugging purposes.
 	std::string printGraphToString();
 
@@ -155,7 +158,6 @@ class CI_API Context : public std::enable_shared_from_this<Context> {
 	void	disconnectRecursive( const NodeRef &node, std::set<NodeRef> &traversedNodes );
 	void	initRecursisve( const NodeRef &node, std::set<NodeRef> &traversedNodes  );
 	void	uninitRecursive( const NodeRef &node, std::set<NodeRef> &traversedNodes  );
-	const	std::vector<Node *>& getAutoPulledNodes(); // called if there are any nodes besides output that need to be pulled
 	void	processAutoPulledNodes();
 	void	preProcessScheduledEvents();
 	void	postProcessScheduledEvents();

test/_audio/AudioTests/proj/cmake/CMakeLists.txt

@@ -0,0 +1,39 @@
+cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
+set( CMAKE_VERBOSE_MAKEFILE ON )
+
+project( AudioTests )
+
+get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../.." ABSOLUTE )
+get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE )
+
+include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" )
+
+set( SRC_FILES
+	${APP_PATH}/src/AudioTestsApp.cpp
+	${APP_PATH}/src/DeviceTest.cpp
+	${APP_PATH}/src/DeviceTest.h
+	${APP_PATH}/src/NodeBasicTest.cpp
+	${APP_PATH}/src/NodeBasicTest.h
+	${APP_PATH}/src/NodeEffectsTest.cpp
+	${APP_PATH}/src/NodeEffectsTest.h
+	${APP_PATH}/src/ParamTest.cpp
+	${APP_PATH}/src/ParamTest.h
+	${APP_PATH}/src/SamplePlayerTest.cpp
+	${APP_PATH}/src/SamplePlayerTest.h
+	${APP_PATH}/src/SpectralTest.cpp
+	${APP_PATH}/src/SpectralTest.h
+	${APP_PATH}/src/StressTest.cpp
+	${APP_PATH}/src/StressTest.h
+	${APP_PATH}/src/VoiceTest.cpp
+	${APP_PATH}/src/VoiceTest.h
+	${APP_PATH}/src/WaveTableTest.cpp
+	${APP_PATH}/src/WaveTableTest.h
+	${CINDER_PATH}/samples/_audio/common/AudioDrawUtils.cpp
+	${CINDER_PATH}/samples/_audio/common/AudioDrawUtils.h
+)
+
+ci_make_app(
+	APP_NAME    "AudioTests"
+	CINDER_PATH ${CINDER_PATH}
+	SOURCES     ${SRC_FILES}
+)

test/_audio/AudioTests/proj/vc2019/AudioTests.sln

@@ -0,0 +1,80 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.35130.168
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioTests", "AudioTests.vcxproj", "{242B9F1A-CC82-4E3A-A21E-0533ABD26074}"
+	ProjectSection(ProjectDependencies) = postProject
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE} = {92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cinder", "..\..\..\..\..\proj\vc2019\cinder.vcxproj", "{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_ANGLE|x64 = Debug_ANGLE|x64
+		Debug_ANGLE|x86 = Debug_ANGLE|x86
+		Debug_Shared|x64 = Debug_Shared|x64
+		Debug_Shared|x86 = Debug_Shared|x86
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release_ANGLE|x64 = Release_ANGLE|x64
+		Release_ANGLE|x86 = Release_ANGLE|x86
+		Release_Shared|x64 = Release_Shared|x64
+		Release_Shared|x86 = Release_Shared|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_ANGLE|x64.ActiveCfg = Debug_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_ANGLE|x64.Build.0 = Debug_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_ANGLE|x86.ActiveCfg = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_ANGLE|x86.Build.0 = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_Shared|x64.ActiveCfg = Debug_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_Shared|x64.Build.0 = Debug_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug_Shared|x86.ActiveCfg = Debug_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug|x64.ActiveCfg = Debug|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug|x64.Build.0 = Debug|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Debug|x86.ActiveCfg = Debug|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_ANGLE|x64.ActiveCfg = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_ANGLE|x64.Build.0 = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_ANGLE|x86.ActiveCfg = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_ANGLE|x86.Build.0 = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_Shared|x64.ActiveCfg = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_Shared|x64.Build.0 = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release_Shared|x86.ActiveCfg = Release_Shared|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release|x64.ActiveCfg = Release|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release|x64.Build.0 = Release|x64
+		{242B9F1A-CC82-4E3A-A21E-0533ABD26074}.Release|x86.ActiveCfg = Release|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_ANGLE|x64.ActiveCfg = Debug_ANGLE|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_ANGLE|x64.Build.0 = Debug_ANGLE|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_ANGLE|x86.ActiveCfg = Debug_ANGLE|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_ANGLE|x86.Build.0 = Debug_ANGLE|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_Shared|x64.ActiveCfg = Debug_Shared|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_Shared|x64.Build.0 = Debug_Shared|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_Shared|x86.ActiveCfg = Debug_Shared|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug_Shared|x86.Build.0 = Debug_Shared|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug|x64.ActiveCfg = Debug|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug|x64.Build.0 = Debug|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug|x86.ActiveCfg = Debug|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Debug|x86.Build.0 = Debug|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_ANGLE|x64.ActiveCfg = Release_ANGLE|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_ANGLE|x64.Build.0 = Release_ANGLE|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_ANGLE|x86.ActiveCfg = Release_ANGLE|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_ANGLE|x86.Build.0 = Release_ANGLE|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_Shared|x64.ActiveCfg = Release_Shared|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_Shared|x64.Build.0 = Release_Shared|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_Shared|x86.ActiveCfg = Release_Shared|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release_Shared|x86.Build.0 = Release_Shared|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release|x64.ActiveCfg = Release|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release|x64.Build.0 = Release|x64
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release|x86.ActiveCfg = Release|Win32
+		{92B5BE70-DCAA-40E4-92D8-CC2B95AA28BE}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7627A586-622D-475B-9401-D57EE9B29CFE}
+	EndGlobalSection
+EndGlobal