From e629881665ff614ca4503e8bbfd9c849e74b0a0a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 12 Jun 2017 02:18:27 -0700 Subject: [PATCH] mirror audio format negotiation --- assignment-client/src/audio/AudioMixerClientData.cpp | 4 ++++ libraries/networking/src/udt/PacketHeaders.h | 1 + 2 files changed, 5 insertions(+) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 616d6252d8..ec235600e2 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -81,7 +81,9 @@ void AudioMixerClientData::processPackets() { break; } case PacketType::NegotiateAudioFormat: + case PacketType::MirroredNegotiateAudioFormat: negotiateAudioFormat(*packet, node); + potentiallyMirrorPacket(*packet); break; case PacketType::RequestsDomainListData: parseRequestsDomainListData(*packet); @@ -117,6 +119,8 @@ void AudioMixerClientData::potentiallyMirrorPacket(ReceivedMessage& message) { mirroredType = PacketType::MirroredInjectAudio; } else if (message.getType() == PacketType::SilentAudioFrame) { mirroredType = PacketType::MirroredSilentAudioFrame; + } else if (message.getType() == PacketType::NegotiateAudioFormat) { + mirroredType = PacketType::MirroredNegotiateAudioFormat; } else { return; } diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index f2a13dc449..52b0662c2b 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -115,6 +115,7 @@ public: AdjustAvatarSorting, OctreeFileReplacement, CollisionEventChanges, + MirroredNegotiateAudioFormat, MirroredMicrophoneAudioNoEcho, MirroredMicrophoneAudioWithEcho, MirroredInjectAudio,