From 71604d8958525d0bd57ba390d83ab0a1f2606862 Mon Sep 17 00:00:00 2001
From: vr-group <account@vr.rwth-aachen.de>
Date: Thu, 29 Jun 2023 14:37:33 +0200
Subject: [PATCH] update aixCAVE configs
---
...VirtualAcousticStarterConfig.ITC16100.json | 8 +--
conf/VAReproduction.Prototype.ini | 4 +-
conf/VASetup.aixCAVE.ini | 64 +++++++------------
3 files changed, 28 insertions(+), 48 deletions(-)
diff --git a/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json b/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json
index 25b1b84..e9f4ff3 100644
--- a/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json
+++ b/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json
@@ -6,17 +6,15 @@
"sVASetupIni": "VASetup.aixCAVE.ini",
"lsBinauralReproductionModules": ["TalkthroughHP", "CTC"],
- "dVAServerDirectories" = {
+ "dVAServerDirectories": {
"20160906.aixcave" : "D:/Demos/VA_20160906/Binaries",
"20160906.aixcave.barrend" : "D:/Demos/VA_20160906/Binaries",
"20161206.aixcave" : "D:/Demos/VA_20161206",
"20161206.aixcave.barrend" : "D:/Demos/VA_20161206",
- "2018.a" : "D:/VAServer-git/v2018.a",
- "2019.a" : "D:/VAServer-git/v2019.a_dev",
- "2020.a" : "D:/VAServer-git/v2020.a",
- "2022.a" : "D:/VAServer-git/v2022.a",
+ "2020.a" : "../v2020.a",
+ "2022.a" : "../v2022.a"
}
}
diff --git a/conf/VAReproduction.Prototype.ini b/conf/VAReproduction.Prototype.ini
index a4a0154..2fe2f82 100644
--- a/conf/VAReproduction.Prototype.ini
+++ b/conf/VAReproduction.Prototype.ini
@@ -32,7 +32,7 @@ Outputs = MyDesktopHP
Class = NCTC
Enabled = false
Name = Crosstalk cancellation for N loudspeakers
-Outputs = MyDesktopLS
+Outputs = MyLoudSpeakers
TrackedListenerID = 1
# algorithm: reg|...
Algorithm = reg
@@ -55,7 +55,7 @@ Outputs = MyDesktopLS
Class = Ambisonics
Enabled = false
Name = (Higher-Order) Ambisonics decoder for loudspeaker arrays
-Outputs = ???
+Outputs = MyLoudSpeakers
TruncationOrder = 2
ReproductionCenterPos = AUTO
diff --git a/conf/VASetup.aixCAVE.ini b/conf/VASetup.aixCAVE.ini
index 71eb29d..bd54cf6 100644
--- a/conf/VASetup.aixCAVE.ini
+++ b/conf/VASetup.aixCAVE.ini
@@ -39,28 +39,24 @@ OutputChannels = AUTO
[Setup]
# -- outputs
-[Output:Ac_Op]
+[Output:MyDesktopLS]
Description = Acoustic Operator Monitor Loudspeaker
Devices = MONL, MONR
-[Output:Wireless_HP]
+[Output:MyDesktopHP]
Description = Wireless Headphones
Devices = WHP
-[Output:HP_1]
-Description = Wired Headphones 1
-Devices = HP1
-
-[Output:HP_2]
-Description = Wired Headphones 2
-Devices = HP2
+[Output:MySecondHP]
+Description = Wireless Headphones
+Devices = MasterWHP
-[Output:Cave_LS]
+[Output:MyLoudSpeakers]
Type = Group
Description = aixCave Loudspeaker Array
Devices = LS1, LS2, LS3, LS4, LS5, LS6, LS7, LS8, LS9, LS10, LS11, LS12
-[Output:Cave_SW]
+[Output:MySubwoofers]
Description = aixCave Subwoofer Array
Devices = SW1, SW2, SW3, SW4, SW5, SW6, SW7, SW8, SW9
@@ -71,19 +67,15 @@ Devices = LS2, LS5, LS8, LS11
# -- inputs
-[Input:Cave_MikeArray]
+[Input:Cave_MicArray]
Description = aixCave Microphone Array
Devices = MIC1,MIC2,MIC3,MIC4,MIC5,MIC6,MIC7,MIC8,MIC9,MIC10,MIC11,MIC12,MIC13,MIC14,MIC15,MIC16,MIC17,MIC18,MIC19,MIC20,MIC21,MIC22
-[Input:Ac_Op_TableMike]
-Description = Acoustic Operator Table Microphone
+[Input:Cave_Op_TableMic]
+Description = Cave Operator Table Microphone (Monacor PDM-211)
Devices = TMIC1
-[Input:Cave_Op_TableMike]
-Description = Cave Operator Table Microphone Panasonic xyz
-Devices = TMIC2
-
-[Input:Cave_WirelessMike]
+[Input:Cave_WirelessMic]
Description = Cave Wireless Microphone
Devices = WMIC
@@ -108,32 +100,26 @@ Devices = WMIC
[OutputDevice:MONL]
Type = LS
Description = Neumann K110
-Channels = 1
+Channels = 7
DataFileName = Neumann_K110_Directivity_DFT.daff
[OutputDevice:MONR]
Type = LS
Description = Neumann K110
-Channels = 2
+Channels = 8
DataFileName = Neumann_K110_Directivity_DFT.daff
-[OutputDevice:WHP]
+[OutputDevice:MasterWHP]
Type = HP
Description = Sennheiser
-Channels = 3,4
+Channels = 1,2
DataFileName = Sennheiser_WHP_Equalization.wav
-[OutputDevice:HP1]
-Type = HP
-Description = Superlux 1
-Channels = 5,6
-DataFileName = Superlux_Equalization.wav
-
-[OutputDevice:HP2]
+[OutputDevice:WHP]
Type = HP
-Description = Superlux 2
-Channels = 7,8
-DataFileName = Superlux_Equalization.wav
+Description = Sennheiser
+Channels = 3,4
+DataFileName = Sennheiser_WHP_Equalization.wav
[OutputDevice:LS1]
@@ -328,19 +314,15 @@ DataFileName = ProDipe_Directivity_DFT.daff
# Door
[InputDevice:WMIC]
-Type = HP
+Type = MIC
Description = Sennheiser Wireless Microphone
Channels = 1
[InputDevice:TMIC1]
-Type = HP
-Description = Table Microphone 1
-Channels = 7
+Type = MIC
+Description = Table Microphone CAVE Master
+Channels = 2
-[InputDevice:TMIC2]
-Type = HP
-Description = Table Microphone 2
-Channels = 8
[InputDevice:MIC1]
Type = MIC
--
GitLab