Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Audio tests update, consolidated into one app #2335

Merged
merged 40 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
8d59c34
shim for new AudioTests suite
richardeakin Sep 10, 2024
7718216
wip NodeTest via Factor<AudioTest>
richardeakin Sep 10, 2024
d04b7dd
fleshing out first AudioTest, livepp support
richardeakin Sep 10, 2024
6d6d6bf
added NodeEffectsTest, Combo selector in main app to choose which tes…
richardeakin Sep 12, 2024
f804848
added a GUI to show audio graph
richardeakin Sep 12, 2024
c3fe364
fix test and cleanup dead code
richardeakin Sep 12, 2024
f603f86
rename AudioTests -> AudioTestsApp, NodeTest -> NodeBasicTest
richardeakin Sep 12, 2024
8b34257
added ParamTest, test name is set by main test app
richardeakin Sep 13, 2024
04051a6
DeviceTest
richardeakin Sep 13, 2024
d9d8283
made audio::Context::getAutoPulledNodes() public
richardeakin Sep 14, 2024
c8a4554
fleshed out DeviceTest
richardeakin Sep 14, 2024
b9b0192
wip moving over SampleTest and SpectralTest, audio files now loaded a…
richardeakin Sep 14, 2024
fd91c73
Samples and Spectral tests building and running
richardeakin Sep 19, 2024
a6a9c2d
switched Factory's internal storage to std::vector so order added is …
richardeakin Sep 25, 2024
8fd329b
Factory: throw exception when a duplicate key is detected
richardeakin Sep 25, 2024
a70dd10
DeviceTest: show input / output devices in UI
richardeakin Sep 25, 2024
6b6d98a
fleshed out SpectralTest UI, mag spectrum showing again
richardeakin Sep 25, 2024
99c5d55
added WaveTableTest
richardeakin Sep 29, 2024
a3023b1
Added VoiceTest
richardeakin Oct 3, 2024
2637514
removed subtest state to AudioTest base class
richardeakin Oct 3, 2024
72e47bf
Added StressTest
richardeakin Oct 3, 2024
6d0af28
minor test UI improvements
richardeakin Oct 5, 2024
8a6e218
Removed old test projects that have been replaced with AudioTests suite
richardeakin Oct 5, 2024
8a2b0c6
audio test: disable Live++ and set window pos to a good general defau…
richardeakin Oct 5, 2024
ff3bf99
Added cmake project file
richardeakin Oct 10, 2024
f1cfd0a
fix compile error with gcc on ubuntu
richardeakin Oct 17, 2024
ad06874
Merge branch 'master' into rte/audio_tests_update
richardeakin Oct 17, 2024
6e607e1
adding Mac OS X project files from @andrewfb
richardeakin Oct 23, 2024
4dc57a8
remove obsolete AudioTestGui.h
richardeakin Oct 23, 2024
347ceca
set initial ImGui window sizes
richardeakin Oct 23, 2024
99e5ed1
Context UI function makes a copy of auto-pulled nodes before displayi…
richardeakin Oct 23, 2024
d79d169
Fix typo in Audio Context GUI window
Oct 27, 2024
59a45bb
Guard against removing more gens than are available in StressTest
Oct 27, 2024
ff5afd3
Merge pull request #7 from moldybeats/rte/audio_tests_update
richardeakin Oct 29, 2024
40f269b
rename Factory namespace
richardeakin Oct 29, 2024
742ce2b
fix initial tests setup
richardeakin Oct 30, 2024
bca8ac1
added more UI to NodeEffectsTest
richardeakin Oct 30, 2024
7e7f996
UI context graph viewer handles recursive graphs (thanks @moldybeats …
richardeakin Oct 30, 2024
d6e6f21
fix SamplePlayerTest's xrun visual, remove dead code
richardeakin Oct 31, 2024
48f916a
fix SamplePlayerTest's async file load when using BufferPlayerNode
richardeakin Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion include/cinder/audio/Context.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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();
Expand Down
298 changes: 0 additions & 298 deletions test/_audio/AudioTest.msw/AudioTest.sln

This file was deleted.

70 changes: 0 additions & 70 deletions test/_audio/AudioTest.xcworkspace/contents.xcworkspacedata

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
39 changes: 39 additions & 0 deletions test/_audio/AudioTests/proj/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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}
)
80 changes: 80 additions & 0 deletions test/_audio/AudioTests/proj/vc2019/AudioTests.sln
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading