From 1965ff286ba2b57e3a0913f15b3fe71a13f9a8a1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 18 Oct 2013 09:16:55 -0700 Subject: [PATCH 1/3] fix unix build buster for starfield --- interface/src/starfield/renderer/Tiling.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/interface/src/starfield/renderer/Tiling.h b/interface/src/starfield/renderer/Tiling.h index 7edbfd6656..53b17a9844 100755 --- a/interface/src/starfield/renderer/Tiling.h +++ b/interface/src/starfield/renderer/Tiling.h @@ -12,10 +12,10 @@ #include "starfield/Config.h" namespace starfield { - + const float LOG2 = 1.4426950408889634; + class Tiling { public: - Tiling(unsigned tileResolution) : _tileResolution(tileResolution), _rcpSlice(tileResolution / Radians::twicePi()) { _nBits = ceil(log(getTileCount()) * LOG2); } @@ -39,10 +39,7 @@ namespace starfield { unsigned _tileResolution; float _rcpSlice; unsigned _nBits; - - const float LOG2 = 1.4426950408889634; }; - } #endif From 2fcdd708cbbf43e58050a33b1728b60c4d38fc92 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 18 Oct 2013 09:28:36 -0700 Subject: [PATCH 2/3] fix for audio-mixer crash with node from DS --- assignment-client/src/audio/AudioMixer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 1ae67c4063..de762cb628 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -171,7 +171,8 @@ void AudioMixer::run() { // loop through all other nodes that have sufficient audio to mix for (NodeList::iterator otherNode = nodeList->begin(); otherNode != nodeList->end(); otherNode++) { - if (((PositionalAudioRingBuffer*) otherNode->getLinkedData())->willBeAddedToMix() + if (otherNode->getLinkedData() + && ((PositionalAudioRingBuffer*) otherNode->getLinkedData())->willBeAddedToMix() && (otherNode != node || (otherNode == node && nodeRingBuffer->shouldLoopbackForNode()))) { PositionalAudioRingBuffer* otherNodeBuffer = (PositionalAudioRingBuffer*) otherNode->getLinkedData(); // based on our listen mode we will do this mixing... From acbd664cabd145a0448de4922de455f153d00198 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 18 Oct 2013 09:34:38 -0700 Subject: [PATCH 3/3] fix audio send to wrong socket --- assignment-client/src/audio/AudioMixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index de762cb628..bf2e6ebb97 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -340,7 +340,7 @@ void AudioMixer::run() { } memcpy(clientPacket + numBytesPacketHeader, clientSamples, sizeof(clientSamples)); - nodeList->getNodeSocket()->send(node->getPublicSocket(), clientPacket, sizeof(clientPacket)); + nodeList->getNodeSocket()->send(node->getActiveSocket(), clientPacket, sizeof(clientPacket)); } }