From b73a425c1c6540f0022910a6b8710a8046e49344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=A4fer?=
<pschaefer@ITA.AKUSTIK.RWTH-AACHEN.DE>
Date: Wed, 1 Mar 2023 10:42:06 +0100
Subject: [PATCH] LauncherConfig: renaming nDefaultSleep to
nWaitForVAServerStart
---
LaunchScript/VirtualAcousticStarterConfig.ITC16100.json | 2 +-
LaunchScript/VirtualAcousticStarterConfig.json | 2 +-
LaunchScript/VirtualAcousticsStarterServer.py | 4 ++--
README.md | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json b/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json
index 9a78f77..1792c22 100644
--- a/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json
+++ b/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json
@@ -2,7 +2,7 @@
"sLocalIP": "10.0.1.240",
"nLauncherPort": 41578,
"nVAServerPort": 12340,
- "nDefaultSleep": 5,
+ "nWaitForVAServerStart": 5,
"lsDefaultReproductionModules": ["TalkthroughHP", "CTC"],
"lsBinauralReproductionModules": ["TalkthroughHP", "CTC"],
diff --git a/LaunchScript/VirtualAcousticStarterConfig.json b/LaunchScript/VirtualAcousticStarterConfig.json
index 85e9a07..d1b818f 100644
--- a/LaunchScript/VirtualAcousticStarterConfig.json
+++ b/LaunchScript/VirtualAcousticStarterConfig.json
@@ -2,7 +2,7 @@
"sLocalIP": "localhost",
"nLauncherPort": 41578,
"nVAServerPort": 12340,
- "nDefaultSleep": 3,
+ "nWaitForVAServerStart": 3,
"lsDefaultReproductionModules": ["TalkthroughHP", "CTC"],
"lsBinauralReproductionModules": ["TalkthroughHP"],
"lsAmbisonicsReproductionModules": ["AmbisonicsBinauralMixdown"],
diff --git a/LaunchScript/VirtualAcousticsStarterServer.py b/LaunchScript/VirtualAcousticsStarterServer.py
index ee7e25f..3de2a4f 100644
--- a/LaunchScript/VirtualAcousticsStarterServer.py
+++ b/LaunchScript/VirtualAcousticsStarterServer.py
@@ -35,7 +35,7 @@ class LauncherConfig:
conf.sLocalIP = json_config["sLocalIP"]
conf.nLauncherPort = json_config["nLauncherPort"]
conf.nVAServerPort = json_config["nVAServerPort"]
- conf.nDefaultSleep = json_config["nDefaultSleep"]
+ conf.nWaitForVAServerStart = json_config["nWaitForVAServerStart"]
conf.lsDefaultReproductionModules = json_config["lsDefaultReproductionModules"]
except KeyError as e:
print( "ERROR reading the json config. Missing " + str(e.args[0]) )
@@ -356,7 +356,7 @@ class VirtualAcousticsLauncher:
self.oVAProcess = subprocess.Popen( sCommand, cwd = self.sVAServerDir, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP )
# wait for requested duration before sending the go signal
- time.sleep( self.oConfig.nDefaultSleep )
+ time.sleep( self.oConfig.nWaitForVAServerStart )
if self.oVAProcess.poll() != None:
print( "VA Process died - sending abort token" )
diff --git a/README.md b/README.md
index 79b5815..54bfe4e 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ The VAServer Launcher can be configured by adjusting the settings in `./LaunchSc
| sLocalIP | IP of this computer. Specify for remote usage | "localhost"
| nLauncherPort | Port used for communication with launcher | 41578 |
| nVAServerPort | Port used for communication with VAServer | 12340 |
-| nDefaultSleep | Time to wait for VAServer to start [seconds] | 3 |
+| nWaitForVAServerStart | Time to wait for VAServer to start [seconds] | 3 |
| lsDefaultReproductionModules | [Reproduction modules](#audio-reproduction) used if [Reproduction input signal type](#unreal-project-configuration) is not specified by client (Unreal) | ["TalkthroughHP", "CTC"] |
| lsBinauralReproductionModules | [Reproduction modules](#audio-reproduction) used for [binaural](#unreal-project-configuration) input signals | ["TalkthroughHP"] |
| lsAmbisonicsReproductionModules | [Reproduction modules](#audio-reproduction) used for [ambisonics](#unreal-project-configuration) input signals | ["AmbisonicsBinauralMixdown"] |
--
GitLab