From f6f9bbf64798846cd94a21d254c56b91f4649981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=A4fer?=
<pschaefer@ITA.AKUSTIK.RWTH-AACHEN.DE>
Date: Fri, 3 Mar 2023 15:24:56 +0100
Subject: [PATCH] Changed all occurances of VAServer Launcher to
VAServerLauncher
---
Source/VAPlugin/Private/VAPlugin.h | 2 +-
Source/VAPlugin/Private/VAServerLauncher.cpp | 6 +++---
Source/VAPlugin/Private/VAServerLauncher.h | 2 +-
Source/VAPlugin/Public/VAReceiverActor.h | 18 +++++++++---------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Source/VAPlugin/Private/VAPlugin.h b/Source/VAPlugin/Private/VAPlugin.h
index 9fa2bcf..9aefa43 100644
--- a/Source/VAPlugin/Private/VAPlugin.h
+++ b/Source/VAPlugin/Private/VAPlugin.h
@@ -153,7 +153,7 @@ public:
static AVAReceiverActor* GetReceiverActor();
- // ******* VAServer Launcher ******* //
+ // ******* VAServerLauncher ******* //
static FVAServerLauncher VAServerLauncher;
diff --git a/Source/VAPlugin/Private/VAServerLauncher.cpp b/Source/VAPlugin/Private/VAServerLauncher.cpp
index b57dd25..7eb67cb 100644
--- a/Source/VAPlugin/Private/VAServerLauncher.cpp
+++ b/Source/VAPlugin/Private/VAServerLauncher.cpp
@@ -77,7 +77,7 @@ bool FVAServerLauncher::RemoteStartVAServer(const FString& Host, const int Port,
int BytesSend = 0;
VAServerLauncherSocket->Send(RequestData.GetData(), RequestData.Num(), BytesSend);
FVAUtils::LogStuff("[FVAServerLauncher::RemoteStartVAServer()]: Send " + FString::FromInt(BytesSend) +
- " bytes to the VAServer Launcher, with version name: " + VersionName + " Waiting for answer.", false);
+ " bytes to the VAServerLauncher, with version name: " + VersionName + " Waiting for answer.", false);
//Receive response
const int32 BufferSize = 16;
@@ -109,7 +109,7 @@ bool FVAServerLauncher::RemoteStartVAServer(const FString& Host, const int Port,
VAServerLauncherSocket = nullptr;
return false;
default:
- FVAUtils::OpenMessageBox("[FVAServerLauncher::RemoteStartVAServer()]: Unexpected response from VAServer Launcher: " +
+ FVAUtils::OpenMessageBox("[FVAServerLauncher::RemoteStartVAServer()]: Unexpected response from VAServerLauncher: " +
FString(reinterpret_cast<char*>(&Response[0])), true);
VAServerLauncherSocket = nullptr;
return false;
@@ -117,7 +117,7 @@ bool FVAServerLauncher::RemoteStartVAServer(const FString& Host, const int Port,
}
else
{
- FVAUtils::LogStuff("[FVAServerLauncher::RemoteStartVAServer()]: Error while receiving response from VAServer Launcher", true);
+ FVAUtils::LogStuff("[FVAServerLauncher::RemoteStartVAServer()]: Error while receiving response from VAServerLauncher", true);
VAServerLauncherSocket = nullptr;
return false;
}
diff --git a/Source/VAPlugin/Private/VAServerLauncher.h b/Source/VAPlugin/Private/VAServerLauncher.h
index b9dffc0..84709eb 100644
--- a/Source/VAPlugin/Private/VAServerLauncher.h
+++ b/Source/VAPlugin/Private/VAServerLauncher.h
@@ -32,6 +32,6 @@ private:
static FString EnumToString(EReproductionInput Enum);
- //Socket connection to the VAServer Launcher, has to be held open until the program ends
+ //Socket connection to the VAServerLauncher, has to be held open until the program ends
FSocket* VAServerLauncherSocket=nullptr;
};
diff --git a/Source/VAPlugin/Public/VAReceiverActor.h b/Source/VAPlugin/Public/VAReceiverActor.h
index 2e0f387..583ec5c 100644
--- a/Source/VAPlugin/Public/VAReceiverActor.h
+++ b/Source/VAPlugin/Public/VAReceiverActor.h
@@ -72,25 +72,25 @@ protected:
UPROPERTY(EditAnywhere, meta = (Category = "Connection", DisplayName = "Automatic Reconnect"))
bool bReconnecToVAServer = true;
- // Activate automatic remote VAServer start via Python (VAServer Launcher)
- UPROPERTY(EditAnywhere, meta = (DisplayName = "Use VAServer Launcher", Category = "VAServer Launcher"))
+ // Activate automatic remote VAServer start via Python (VAServerLauncher)
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "Use VAServerLauncher", Category = "VAServerLauncher"))
bool bAutomaticRemoteVAStart = true;
- // Port for remote VAServer Launcher [0, 65535]
- UPROPERTY(EditAnywhere, meta = (DisplayName = "VAServer Launcher Port", Category = "VAServer Launcher",
+ // Port for remote VAServerLauncher [0, 65535]
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "VAServerLauncher Port", Category = "VAServerLauncher",
ClampMin = "0", ClampMax = "65535", UIMin = "0", UIMax = "65535"))
uint16 RemoteVAStarterPort = 41578;
- // ID for VAServer version being started automatically, configurable in the Config of the VAServer Launcher
- UPROPERTY(EditAnywhere, meta = (DisplayName = "VAServer Version ID", Category = "VAServer Launcher"))
+ // ID for VAServer version being started automatically, configurable in the Config of the VAServerLauncher
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "VAServer Version ID", Category = "VAServerLauncher"))
FString WhichVAServerVersionToStart = TEXT("2022.a");
// Ini file with VA renderer settings. File will be sent to VAServer launcher on startup if filename is not empty.
- UPROPERTY(EditAnywhere, meta = (DisplayName = "VARenderer.ini file", Category = "VAServer Launcher"))
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "VARenderer.ini file", Category = "VAServerLauncher"))
FString VARendererIniFile = TEXT("");
- //Used to select the group of reproduction modules specified in VAServer Launcher config.
- UPROPERTY(EditAnywhere, meta = (DisplayName = "Reproduction input signal type", Category = "VAServer Launcher"))
+ //Used to select the group of reproduction modules specified in VAServerLauncher config.
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "Reproduction input signal type", Category = "VAServerLauncher"))
EReproductionInput ReproductionInputType = EReproductionInput::Binaural;
--
GitLab