From 151481d5bf9ad7b52b919c58354b07a6b0aad052 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 17 Jul 2015 15:58:58 -0700 Subject: [PATCH 1/2] Remove seek --- libraries/audio/src/InboundAudioStream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp index 96515e007a..31525f0e7a 100644 --- a/libraries/audio/src/InboundAudioStream.cpp +++ b/libraries/audio/src/InboundAudioStream.cpp @@ -112,8 +112,9 @@ int InboundAudioStream::parseData(NLPacket& packet) { int networkSamples; // parse the info after the seq number and before the audio data (the stream properties) + int oldPos = packet.pos(); int propertyBytes = parseStreamProperties(packet.getType(), packet.read(packet.bytesLeftToRead()), networkSamples); - packet.seek(packet.pos() + propertyBytes); + packet.seek(oldPos + propertyBytes); // handle this packet based on its arrival status. switch (arrivalInfo._status) { From c6e471256d9f35dc7962de4ffce04ac32fccd2b0 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 17 Jul 2015 16:55:45 -0700 Subject: [PATCH 2/2] Fix atomic construction --- libraries/networking/src/NetworkPeer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp index 2e98c096ab..9af0729a22 100644 --- a/libraries/networking/src/NetworkPeer.cpp +++ b/libraries/networking/src/NetworkPeer.cpp @@ -30,10 +30,9 @@ NetworkPeer::NetworkPeer(QObject* parent) : _symmetricSocket(), _activeSocket(NULL), _wakeTimestamp(QDateTime::currentMSecsSinceEpoch()), - _lastHeardMicrostamp(usecTimestampNow()), _connectionAttempts(0) { - + _lastHeardMicrostamp.store(usecTimestampNow()); } NetworkPeer::NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket, QObject* parent) : @@ -44,10 +43,9 @@ NetworkPeer::NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, co _symmetricSocket(), _activeSocket(NULL), _wakeTimestamp(QDateTime::currentMSecsSinceEpoch()), - _lastHeardMicrostamp(usecTimestampNow()), _connectionAttempts(0) { - + _lastHeardMicrostamp.store(usecTimestampNow()); } void NetworkPeer::setPublicSocket(const HifiSockAddr& publicSocket) {