From 0af79c4d95f9fe246b2d87cc5d92590d39bf903e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 3 Jul 2014 10:45:05 -0700 Subject: [PATCH 1/2] fix for script agent audio missing channel flag --- assignment-client/src/audio/AudioMixer.cpp | 1 + libraries/script-engine/src/ScriptEngine.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 1c3046b9b1..a38f3b6e4b 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -99,6 +99,7 @@ void AudioMixer::addBufferToMixForListeningNodeWithBuffer(PositionalAudioRingBuf bool shouldAttenuate = (bufferToAdd != listeningNodeBuffer); if (shouldAttenuate) { + // if the two buffer pointers do not match then these are different buffers glm::vec3 relativePosition = bufferToAdd->getPosition() - listeningNodeBuffer->getPosition(); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index daf66dafbe..7a6a251297 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1,3 +1,4 @@ + // // ScriptEngine.cpp // libraries/script-engine/src @@ -469,7 +470,10 @@ void ScriptEngine::run() { // pack a placeholder value for sequence number for now, will be packed when destination node is known int numPreSequenceNumberBytes = audioPacket.size(); - packetStream << (quint16)0; + packetStream << (quint16) 0; + + // assume scripted avatar audio is mono and set channel flag to zero + packetStream << (quint8) 0; // use the orientation and position of this avatar for the source of this audio packetStream.writeRawData(reinterpret_cast(&_avatarData->getPosition()), sizeof(glm::vec3)); From 0a3a8b069358f981213ec8365c6786441a97a952 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 3 Jul 2014 10:45:43 -0700 Subject: [PATCH 2/2] remove space at the top of the ScriptEngine file --- libraries/script-engine/src/ScriptEngine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 7a6a251297..4154c4d415 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1,4 +1,3 @@ - // // ScriptEngine.cpp // libraries/script-engine/src