diff --git a/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json b/LaunchScript/VirtualAcousticStarterConfig.ITC16100.json index 9a78f77c90a97c5eee895978ca71fcd75675b4ec..1792c22390aba16e6106ee606bfaf85a8da599a4 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 85e9a07c118b2a3e6c8f7dc4fb8e87c39ca6a86d..d1b818fc970910ef6b41d8c6be0ea63fc7015bbb 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 ee7e25f2d6b1e51c09a0718e0d1cb56d267f36bd..3de2a4fc07c72e77e7d538029b1a2c45f21126e9 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 79b5815578c3ed0debd15be966ce3a2925936188..54bfe4e607ad877aabd7106a4ab63318d379bad8 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"] |