diff --git a/Source/VAPlugin/Private/VAServerLauncher.cpp b/Source/VAPlugin/Private/VAServerLauncher.cpp index 7eb67cb72d83f46aba85a074d2ac1b104d2d4519..676e242e8fb168650f8cc47c9c527049f023bd70 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 84709eb0141a4cbb050b2ae34e5418aad82207a5..13f112c47d7211628a70391d3f756f4429e00241 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 8866e0ef8277ba1a8c0fa4d4a7548e5ef72bda45..9e1ca33586d83d24af4bfa4cd92d30db45ba364c 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 };