diff --git a/benchmarks/core/VACoreSourceManagementBenchmark.cpp b/benchmarks/core/VACoreSourceManagementBenchmark.cpp index f0dfada102818e3967b8bcf3ebfaa1de6f627469..47f8a20accef710dba50cced58541b277258ef27 100644 --- a/benchmarks/core/VACoreSourceManagementBenchmark.cpp +++ b/benchmarks/core/VACoreSourceManagementBenchmark.cpp @@ -9,42 +9,49 @@ using namespace std; -int main( int, char** ) +CVAStruct GetCoreConfig() { - IVAInterface* pCore = NULL; - try - { - CVAStruct oConfig; + CVAStruct oConfig; + + CVAStruct oSectionDebug; + oSectionDebug["loglevel"] = 5; + oConfig["debug"] = oSectionDebug; + + CVAStruct oSectionDriver; + oSectionDriver["driver"] = "Portaudio"; + oConfig["audio driver"] = oSectionDriver; + + CVAStruct oDevice1; + oDevice1["type"] = "HP"; + oDevice1["channels"] = "1,2"; + oConfig["OutputDevice:MyHP"] = oDevice1; - CVAStruct oSectionDebug; - oSectionDebug[ "loglevel" ] = 1; - oConfig[ "debug" ] = oSectionDebug; + CVAStruct oOutput1; + oOutput1["devices"] = "MyHP"; + oConfig["Output:MyDesktopHP"] = oOutput1; - CVAStruct oSectionDriver; - oSectionDriver[ "driver" ] = "Portaudio"; - oConfig[ "audio driver" ] = oSectionDriver; + CVAStruct oReproduction1; + oReproduction1["class"] = "Talkthrough"; + oReproduction1["outputs"] = "MyDesktopHP"; + oConfig["Reproduction:Talkthrough"] = oReproduction1; - CVAStruct oDevice1; - oDevice1[ "type" ] = "HP"; - oDevice1[ "channels" ] = "1,2"; - oConfig[ "OutputDevice:MyHP" ] = oDevice1; + CVAStruct oRenderer1; + oRenderer1["class"] = "BinauralRealTime"; + oRenderer1["Reproductions"] = "MyTalkthroughHeadphones"; + oConfig["Renderer:BRT_CoreTest"] = oRenderer1; - CVAStruct oOutput1; - oOutput1[ "devices" ] = "MyHP"; - oConfig[ "Output:MyDesktopHP" ] = oOutput1; - CVAStruct oReproduction; - oReproduction[ "class" ] = "Talkthrough"; - oReproduction[ "outputs" ] = "MyDesktopHP"; - oConfig[ "Reproduction:MyTalkthroughHeadphones" ] = oReproduction; + return oConfig; +} + +int main( int, char** ) +{ + IVAInterface* pCore = NULL; + try + { - CVAStruct oRenderer; - oRenderer[ "class" ] = "BinauralRealTime"; - oRenderer[ "outputs" ] = "MyTalkthroughHeadphones"; - oRenderer[ "outputgroup" ] = "MyDesktopHP"; - oConfig[ "Renderer:BenchmarkDummyRenderer" ] = oRenderer; - pCore = VACore::CreateCoreInstance( oConfig ); + pCore = VACore::CreateCoreInstance( GetCoreConfig()); pCore->Initialize(); int iIterations = 100; diff --git a/src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/_SourceFiles.cmake index 08d98b6c377cae2f881d6d7b4dd69a9772e29910..6212d24e30013d093471246c1781c4c25f8b1534 100644 --- a/src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralClusterEngine" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils\\BinauralClusterEngine" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralClusterEngine" ) set( DirFiles VABinauralClusterEngine.cpp diff --git a/src/Rendering/Binaural/RealTime/Utils/BinauralListener/VABinauralListener.h b/src/Rendering/Binaural/RealTime/Utils/BinauralListener/VABinauralListener.h index 51fadaca91aa8ffce4d8a11d707e4ddb8affa361..cf68fd7f10ee44cc530360f5f7ce122f4e7996c6 100644 --- a/src/Rendering/Binaural/RealTime/Utils/BinauralListener/VABinauralListener.h +++ b/src/Rendering/Binaural/RealTime/Utils/BinauralListener/VABinauralListener.h @@ -5,7 +5,7 @@ #include #include -#include "../../../../../VACoreImpl.h" +#include "../../../../../core/core.h" #include "../../../../../Motion/VAMotionModelBase.h" #include "../../../../../Motion/VASharedMotionModel.h" #include "../../../../../Scene/VAScene.h" diff --git a/src/Rendering/Binaural/RealTime/Utils/BinauralListener/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/BinauralListener/_SourceFiles.cmake index 0308f0ff32472d4a2c2676e1957825e103cd1bea..56e971ed92b31da9f8dcabbb9b1c215919b6b4a0 100644 --- a/src/Rendering/Binaural/RealTime/Utils/BinauralListener/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/BinauralListener/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralListener" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils\\BinauralListener" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralListener" ) set( DirFiles VABinauralListener.cpp diff --git a/src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/_SourceFiles.cmake index 52a0bdf47e076e90251b17bd8b79852d95106738..5101212e7ae39793ebd88109c8fbbefa39924a95 100644 --- a/src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralSoundSource" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils\\BinauralSoundSource" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralSoundSource" ) set( DirFiles VABinauralSoundSource.cpp diff --git a/src/Rendering/Binaural/RealTime/Utils/BinauralTimeOfArrivalEstimator/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/BinauralTimeOfArrivalEstimator/_SourceFiles.cmake index 7449aa3ace262ae45e0c219f58564bda962238a4..acc697c509b8689beac69bfe88090bff7d411fba 100644 --- a/src/Rendering/Binaural/RealTime/Utils/BinauralTimeOfArrivalEstimator/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/BinauralTimeOfArrivalEstimator/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/BinauralTimeOfArrivalEstimator" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils\\BinauralTimeOfArrivalEstimator" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\BinauralTimeOfArrivalEstimator" ) set( DirFiles VABinauralTOAEstimator.cpp diff --git a/src/Rendering/Binaural/RealTime/Utils/Config/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/Config/_SourceFiles.cmake index d9fa38bde2f189ede179d15a4438eb7e4356e25e..4c5e56d846d3d04973694140957b8c599c508406 100644 --- a/src/Rendering/Binaural/RealTime/Utils/Config/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/Config/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/Config" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils\\Config" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\Config" ) set( DirFiles VAConfig.cpp diff --git a/src/Rendering/Binaural/RealTime/Utils/RelationMetrics/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/RelationMetrics/_SourceFiles.cmake index 0a05292bbbb83893d80ff80d0e885529c3c19860..327f77b1b7a8bae724cc23deed6169d9ec017ada 100644 --- a/src/Rendering/Binaural/RealTime/Utils/RelationMetrics/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/RelationMetrics/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime/Utils/RelationMetrics" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils\\RelationMetrics" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils\\RelationMetrics" ) set( DirFiles VARelationMetrics.cpp diff --git a/src/Rendering/Binaural/RealTime/Utils/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/Utils/_SourceFiles.cmake index 64cf1f9db25a96cd89a7617f789926f1c642a0b1..2e4ac93096790e01ad936596204b2a42831e42c1 100644 --- a/src/Rendering/Binaural/RealTime/Utils/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/Utils/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/Realtime/Utils" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\Realtime\\Utils" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\Realtime\\Utils" ) set( SubDirs BinauralListener BinauralClusterEngine BinauralSoundSource BinauralTimeOfArrivalEstimator RelationMetrics Config) set( DirFiles diff --git a/src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp b/src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp index 2236dc7e06bb64ea5c5c578f0b98bd5062d981b7..c31e92dac9d640ada4f11486186b24034ce97442 100644 --- a/src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp +++ b/src/Rendering/Binaural/RealTime/VABinauralRealTimeRenderer.cpp @@ -3,7 +3,7 @@ // VA Includes #include #include -#include "../../../VACoreImpl.h" +#include "../../../core/core.h" #include "../../../Utils/VAUtils.h" // VA Core Includes diff --git a/src/Rendering/Binaural/RealTime/_SourceFiles.cmake b/src/Rendering/Binaural/RealTime/_SourceFiles.cmake index 13b4933b6482964179352f7adc48b481f9372e27..afad8a3942087092613c90c0d1f033748b82c718 100644 --- a/src/Rendering/Binaural/RealTime/_SourceFiles.cmake +++ b/src/Rendering/Binaural/RealTime/_SourceFiles.cmake @@ -1,7 +1,7 @@ # $Id:$ set( RelativeDir "src/Rendering/Binaural/RealTime" ) -set( RelativeSourceGroup "Source Files\\Rendering\\Binaural\\RealTime" ) +set( RelativeSourceGroup "src\\Rendering\\Binaural\\RealTime" ) set( SubDirs Utils ) set( DirFiles