From e6b6d7b5170524c9f3308d47f1a26530ef825bf1 Mon Sep 17 00:00:00 2001
From: Lab1 <account@vr.rwth-aachen.de>
Date: Mon, 6 Mar 2023 13:23:45 +0100
Subject: [PATCH] remove default reproduction input type
---
Source/VAPlugin/Private/VAServerLauncher.cpp | 13 +++++--------
Source/VAPlugin/Private/VAServerLauncher.h | 2 +-
Source/VAPlugin/Public/VAEnums.h | 8 +++-----
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/Source/VAPlugin/Private/VAServerLauncher.cpp b/Source/VAPlugin/Private/VAServerLauncher.cpp
index 7eb67cb..676e242 100644
--- a/Source/VAPlugin/Private/VAServerLauncher.cpp
+++ b/Source/VAPlugin/Private/VAServerLauncher.cpp
@@ -63,15 +63,14 @@ bool FVAServerLauncher::RemoteStartVAServer(const FString& Host, const int Port,
}
}
- if (ReproductionInputType != EReproductionInput::Default)
+
+ if (!SendReproductionInputSignalType(ReproductionInputType))
{
- if (!SendReproductionInputSignalType(ReproductionInputType))
- {
- FVAUtils::OpenMessageBox("[FVAServerLauncher::RemoteStartVAServer()]: ReproductionInputType '" + EnumToString(ReproductionInputType) +
- "' could not be sent to VAServerLauncher. See error log for additional info. VAServerLauncher will run with default settings.", true);
- }
+ FVAUtils::OpenMessageBox("[FVAServerLauncher::RemoteStartVAServer()]: ReproductionInputType '" + EnumToString(ReproductionInputType) +
+ "' could not be sent to VAServerLauncher. See error log for additional info. VAServerLauncher will run with default settings.", true);
}
+
//Send requested version
TArray<uint8> RequestData = ConvertString(VersionName);
int BytesSend = 0;
@@ -354,8 +353,6 @@ FString FVAServerLauncher::EnumToString(EReproductionInput Enum)
{
switch (Enum)
{
- case EReproductionInput::Default:
- return TEXT("default");
case EReproductionInput::Binaural:
return TEXT("binaural");
case EReproductionInput::Ambisonics:
diff --git a/Source/VAPlugin/Private/VAServerLauncher.h b/Source/VAPlugin/Private/VAServerLauncher.h
index 84709eb..13f112c 100644
--- a/Source/VAPlugin/Private/VAServerLauncher.h
+++ b/Source/VAPlugin/Private/VAServerLauncher.h
@@ -9,7 +9,7 @@ class FVAServerLauncher
public:
// Remote Start VAServer
bool RemoteStartVAServer(const FString& Host, int Port,
- const FString& VersionName, const FString& VARendererIni = "", const EReproductionInput ReproductionInputType = EReproductionInput::Default);
+ const FString& VersionName, const FString& VARendererIni, const EReproductionInput ReproductionInputType);
bool StartVAServerLauncher();
diff --git a/Source/VAPlugin/Public/VAEnums.h b/Source/VAPlugin/Public/VAEnums.h
index 8866e0e..9e1ca33 100644
--- a/Source/VAPlugin/Public/VAEnums.h
+++ b/Source/VAPlugin/Public/VAEnums.h
@@ -37,14 +37,12 @@ namespace EConnectionSetting
UENUM()
enum class EReproductionInput : uint8
{
- // [NOT RECOMMENDED] Use default reproduction modules
- Default = 0,
// Use reproduction modules for binaural signals
- Binaural = 1,
+ Binaural,
// Use reproduction modules for ambisonics signals
- Ambisonics = 2,
+ Ambisonics,
// Use reproduction modules for custom purposes (e.g. mixed signal types)
- Custom = 3
+ Custom
};
--
GitLab