fixup merge

InworldAI/Source/InworldAIClient/Private/InworldClient.cpp

@@ -472,7 +472,9 @@ void UInworldClient::SendAudioSessionStart(const FString& AgentId, EInworldMicro
 	NO_CLIENT_RETURN(void())
 	EMPTY_ARG_RETURN(AgentId, void())
 
-	Inworld::GetClient()->StartAudioSession(TCHAR_TO_UTF8(*AgentId), MicrophoneMode);
+	Inworld::AudioSessionStartPayload AudioSessionStartPayload;
+	AudioSessionStartPayload.MicMode = static_cast<Inworld::AudioSessionStartPayload::MicrophoneMode>(MicrophoneMode);
+	Inworld::GetClient()->StartAudioSession(TCHAR_TO_UTF8(*AgentId), AudioSessionStartPayload);
 }
 
 void UInworldClient::SendAudioSessionStartToConversation(const FString& ConversationId, EInworldMicrophoneMode MicrophoneMode/* = EInworldMicrophoneMode::OPEN_MIC*/)

InworldAI/Source/InworldAIClient/Private/InworldPacketTranslator.cpp

@@ -97,18 +97,6 @@ void InworldPacketTranslator::TranslateEvent<>(const Inworld::ControlEventConver
 	}
 }
 
-template <>
-void InworldPacketTranslator::TranslateEvent<>(const Inworld::ControlEventConversationUpdate& Original, FInworldConversationUpdateEvent& New)
-{
-	TranslateInworldPacket(Original, New);
-	New.EventType = static_cast<EInworldConversationUpdateType>(Original.GetType());
-	New.bIncludePlayer = Original.GetIncludePlayer();
-	for (const auto& Agent : Original.GetAgents())
-	{
-		New.Agents.Add(UTF8_TO_TCHAR(Agent.c_str()));
-	}
-}
-
 template<>
 void InworldPacketTranslator::TranslateEvent<Inworld::EmotionEvent, FInworldEmotionEvent>(const Inworld::EmotionEvent& Original, FInworldEmotionEvent& New)
 {

InworldAI/Source/InworldAIClient/Private/InworldPackets.cpp

@@ -235,17 +235,6 @@ void FInworldConversationUpdateEvent::AppendDebugString(FString& Str) const
 	}
 }
 
-void FInworldConversationUpdateEvent::AppendDebugString(FString& Str) const
-{
-	AppendToDebugString(Str, TEXT("ConversationUpdate"));
-	AppendToDebugString(Str, EventType == EInworldConversationUpdateType::STARTED ? TEXT("STARTED") : EventType == EInworldConversationUpdateType::EVICTED ? TEXT("EVICTED") : TEXT("UPDATED"));
-	AppendToDebugString(Str, bIncludePlayer ? TEXT("IncludePlayer") : TEXT("ExcludePlayer"));
-	for (const auto& AgentId : Agents)
-	{
-		AppendToDebugString(Str, AgentId);
-	}
-}
-
 void FInworldEmotionEvent::AppendDebugString(FString& Str) const
 {
 	AppendToDebugString(Str, TEXT("Emotion"));