History

Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol

Atlante45 committed 11 years ago

Commit fbb6a942 parents aca759a c6ffda1107 files · +1921 −2050Browse files

Showing the changes to assignment-client/src/AssignmentFactory.cpp (1 of 107 files). Show all

Unified · Split

assignment-client/src/AssignmentFactory.cpp+4−6
@@ -17,15 +17,13 @@ · 16 unmodified lines
1717 #include "avatars/AvatarMixer.h"
1818 #include "entities/EntityServer.h"
1919
20−ThreadedAssignment* AssignmentFactory::unpackAssignment(const QByteArray& packet) {
21− QDataStream packetStream(packet);
22− packetStream.skipRawData(numBytesForPacketHeader(packet));
20+ThreadedAssignment* AssignmentFactory::unpackAssignment(NLPacket& packet) {
2321
2422 quint8 packedType;
25− packetStream >> packedType;
26−
23+ packet.peekPrimitive(&packedType);
24+
2725 Assignment::Type unpackedType = (Assignment::Type) packedType;
28−
26+
2927 switch (unpackedType) {
3028 case Assignment::AudioMixerType:
3129 return new AudioMixer(packet);