From 3854f75abd32f719da4104849be1215cf6998b1c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 28 Jan 2014 10:41:40 -0800
Subject: [PATCH] cleanup some UUID packing

---
 libraries/audio/src/PositionalAudioRingBuffer.cpp | 4 ++--
 libraries/shared/src/NodeList.cpp                 | 6 ------
 libraries/shared/src/NodeList.h                   | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp
index fa515a5bf7..5434966c00 100644
--- a/libraries/audio/src/PositionalAudioRingBuffer.cpp
+++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp
@@ -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(),
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 4d43159f52..83e8d9824c 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -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);
     
diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h
index b987cd0e65..3f811dbad4 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/shared/src/NodeList.h
@@ -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);