Launcher: now uses VAComposedIniParser to setup config for VAServer

LaunchScript/VirtualAcousticsStarterServer.py

@@ -98,6 +98,7 @@ class VirtualAcousticsLauncher:
   def __init__(self):
     print("init")
     self.oConfig = None
+    self.vaIniParser = None
     self.oVAProcess = None 
     self.oLauncherServerSocket = None 
     self.oLauncherConnection = None 
@@ -135,6 +136,7 @@ class VirtualAcousticsLauncher:
     print("Using config: " + sUsedConfigFile)
     self.oConfig = LauncherConfig( sUsedConfigFile )
 
+    self.vaIniParser = VAComposedIniParser(self.oConfig.lsReproductionModules)
 
   #Open network socket used for the communication
   def open_server_socket(self):
@@ -154,6 +156,9 @@ class VirtualAcousticsLauncher:
   #Actually starts the launcher listening for VAServer start requests
   def run(self):
     try:
+      #TODO-PSC: Receive file and name from client
+      self.vaIniParser.sRendererIniPath = None
+      self.vaIniParser.prepare_inis()
       while True:
         print( "Waiting for launcher connection..." )
 
@@ -188,7 +193,6 @@ class VirtualAcousticsLauncher:
     self.oLauncherServerSocket.close()
 
 
-
   #Checks for a message containing the ID of the VAServer instance to be started and returns the respective VAServer directory
   def receive_va_server_id(self):
     try:
@@ -241,7 +245,7 @@ class VirtualAcousticsLauncher:
 
     # Create start command
     sConnectionParam = self.oConfig.sLocalIP + ":" + str( self.oConfig.nVAServerPort )
-    sVACoreIniParam = "conf/VACore.ini"
+    sVACoreIniParam = self.vaIniParser.get_main_inifile()
     sParams = sConnectionParam + " " + sVACoreIniParam
     sCommand = sVAExecutableFile + " " + sParams