History

remove dependency of PacketHeaders on NodeList

Stephen Birarda committed 11 years ago

Commit 6b3cf1b1 parent c76ae5627 files · +144 −107Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 27 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−4
@@ -493,7 +493,7 @@ void ScriptEngine::run() { · 492 unmodified lines
493 / (1000 * 1000)) + 0.5);493 / (1000 * 1000)) + 0.5);
494 const int SCRIPT_AUDIO_BUFFER_BYTES = SCRIPT_AUDIO_BUFFER_SAMPLES * sizeof(int16_t);494 const int SCRIPT_AUDIO_BUFFER_BYTES = SCRIPT_AUDIO_BUFFER_SAMPLES * sizeof(int16_t);
495 495
496 QByteArray avatarPacket = byteArrayWithPopulatedHeader(PacketTypeAvatarData);496 QByteArray avatarPacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeAvatarData);
497 avatarPacket.append(_avatarData->toByteArray());497 avatarPacket.append(_avatarData->toByteArray());
498 498
499 nodeList->broadcastToNodes(avatarPacket, NodeSet() << NodeType::AvatarMixer);499 nodeList->broadcastToNodes(avatarPacket, NodeSet() << NodeType::AvatarMixer);
@@ -534,9 +534,9 @@ void ScriptEngine::run() { · 34 unmodified lines
534 }534 }
535 }535 }
536 536
537 QByteArray audioPacket = byteArrayWithPopulatedHeader(silentFrame537 QByteArray audioPacket = nodeList->byteArrayWithPopulatedHeader(silentFrame
538 ? PacketTypeSilentAudioFrame538 ? PacketTypeSilentAudioFrame
539 : PacketTypeMicrophoneAudioNoEcho);539 : PacketTypeMicrophoneAudioNoEcho);
540 540
541 QDataStream packetStream(&audioPacket, QIODevice::Append);541 QDataStream packetStream(&audioPacket, QIODevice::Append);
542 542