Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup some UUID packing

Browse source
This commit is contained in:
Stephen Birarda 2014-01-28 10:41:40 -08:00
parent 4103cc1cde
commit 3854f75abd
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/audio/src/PositionalAudioRingBuffer.cpp
View file

@ -38,8 +38,8 @@ PositionalAudioRingBuffer::~PositionalAudioRingBuffer() {
int PositionalAudioRingBuffer::parseData(const QByteArray& packet) {
QDataStream packetStream(packet);
// skip the source UUID
packetStream.skipRawData(NUM_BYTES_RFC4122_UUID);
// skip the packet header (includes the source UUID)
packetStream.skipRawData(numBytesForPacketHeader(packet));
packetStream.skipRawData(parsePositionalData(packet.mid(packetStream.device()->pos())));
packetStream.skipRawData(writeData(packet.data() + packetStream.device()->pos(),

6
libraries/shared/src/NodeList.cpp
View file

@ -541,12 +541,6 @@ void NodeList::sendAssignment(Assignment& assignment) {
_nodeSocket.writeDatagram(packet, assignmentServerSocket->getAddress(), assignmentServerSocket->getPort());
}
int NodeList::packOwnerUUID(unsigned char* packetData) {
QByteArray rfcUUID = _ownerUUID.toRfc4122();
memcpy(packetData, rfcUUID.constData(), rfcUUID.size());
return rfcUUID.size();
}
QByteArray NodeList::constructPingPacket() {
QByteArray pingPacket = byteArrayWithPopluatedHeader(PacketTypePing);

2
libraries/shared/src/NodeList.h
View file

@ -97,8 +97,6 @@ public:
void setAssignmentServerSocket(const HifiSockAddr& serverSocket) { _assignmentServerSocket = serverSocket; }
void sendAssignment(Assignment& assignment);
int packOwnerUUID(unsigned char* packetData);
QByteArray constructPingPacket();
QByteArray constructPingReplyPacket(const QByteArray& pingPacket);