Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove used of PacketPayload in AudioMixer

Browse source
This commit is contained in:
Stephen Birarda 2015-07-06 17:15:01 -07:00
parent f8e6344678
commit 37fd954066
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
assignment-client/src/audio/AudioMixer.cpp
View file

@ -510,18 +510,17 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) {
if (sendData) { if (sendData) {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
auto envPacket = NLPacket::create(PacketType::AudioEnvironment); auto envPacket = NLPacket::create(PacketType::AudioEnvironment);
auto envPacketPayload = envPacket->payload();
unsigned char bitset = 0; unsigned char bitset = 0;
if (hasReverb) { if (hasReverb) {
setAtBit(bitset, HAS_REVERB_BIT); setAtBit(bitset, HAS_REVERB_BIT);
} }
envPacketPayload.write(&bitset, sizeof(unsigned char)); envPacket.write(&bitset, sizeof(unsigned char));
if (hasReverb) { if (hasReverb) {
envPacketPayload.write(&reverbTime, sizeof(float)); envPacket.write(&reverbTime, sizeof(float));
envPacketPayload.write(&wetLevel, sizeof(float)); envPacket.write(&wetLevel, sizeof(float));
} }
nodeList->sendPacket(envPacket, node); nodeList->sendPacket(envPacket, node);
} }
@ -801,25 +800,23 @@ void AudioMixer::run() {
int mixPacketBytes = sizeof(quint16) + AudioConstants::NETWORK_FRAME_BYTES_STEREO; int mixPacketBytes = sizeof(quint16) + AudioConstants::NETWORK_FRAME_BYTES_STEREO;
mixPacket = NodeListPacket::create(PacketType::MixedAudio); mixPacket = NodeListPacket::create(PacketType::MixedAudio);
PacketPayload mixPacketPayload = mixPacket->getPayload();
// pack sequence number // pack sequence number
quint16 sequence = nodeData->getOutgoingSequenceNumber(); quint16 sequence = nodeData->getOutgoingSequenceNumber();
mixPacketPayload.write(&sequence, sizeof(quint16)); mixPacket.write(&sequence, sizeof(quint16));
// pack mixed audio samples // pack mixed audio samples
mixPacketPayload.write(mixSamples, AudioConstants::NETWORK_FRAME_BYTES_STEREO); mixPacket.write(mixSamples, AudioConstants::NETWORK_FRAME_BYTES_STEREO);
} else { } else {
int silentPacketBytes = sizeof(quint16) + sizeof(quint16); int silentPacketBytes = sizeof(quint16) + sizeof(quint16);
mixPacket = NodeListPacket::create(PacketType::SilentAudioFrame); mixPacket = NodeListPacket::create(PacketType::SilentAudioFrame);
// pack sequence number // pack sequence number
quint16 sequence = nodeData->getOutgoingSequenceNumber(); quint16 sequence = nodeData->getOutgoingSequenceNumber();
mixPacketPayload.write(&sequence, sizeof(quint16)); mixPacket.write(&sequence, sizeof(quint16));
// pack number of silent audio samples // pack number of silent audio samples
quint16 numSilentSamples = AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; quint16 numSilentSamples = AudioConstants::NETWORK_FRAME_SAMPLES_STEREO;
mixPacketPayload.write(&numSilentSamples, sizeof(quint16)); mixPacket.write(&numSilentSamples, sizeof(quint16));
} }
// Send audio environment // Send audio environment