From 28f962ea2b0c7c9fd6228d13cb59a7d85f56076b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 26 Mar 2014 13:19:20 -0700 Subject: [PATCH] fix for AudioMixer kill and re-add and no sound load in bot --- assignment-client/src/Agent.cpp | 1 + examples/bot.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 18051d816c..25dcfcdd95 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -124,6 +124,7 @@ void Agent::readPendingDatagrams() { // let this continue through to the NodeList so it updates last heard timestamp // for the sending audio mixer + NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket); } else { NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket); } diff --git a/examples/bot.js b/examples/bot.js index fd1bee9d2e..a304492d31 100644 --- a/examples/bot.js +++ b/examples/bot.js @@ -179,8 +179,6 @@ function updateBehavior(deltaTime) { Script.update.connect(updateBehavior); -var SOUND_BASE_URL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Raws/" - function loadSounds() { var sound_filenames = ["AB1.raw", "Anchorman2.raw", "B1.raw", "B1.raw", "Bale1.raw", "Bandcamp.raw", "Big1.raw", "Big2.raw", "Brian1.raw", "Buster1.raw", "CES1.raw", "CES2.raw", "CES3.raw", "CES4.raw", @@ -191,6 +189,8 @@ function loadSounds() { "Walken1.raw", "Walken2.raw", "Z1.raw", "Z2.raw" ]; + var SOUND_BASE_URL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Raws/"; + for (var i = 0; i < sound_filenames.length; i++) { sounds.push(new Sound(SOUND_BASE_URL + sound_filenames[i])); }