Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for AudioMixer kill and re-add and no sound load in bot

Browse source
This commit is contained in:
Stephen Birarda 2014-03-26 13:19:20 -07:00
parent d61c5bb38b
commit 28f962ea2b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/Agent.cpp
View file

@ -124,6 +124,7 @@ void Agent::readPendingDatagrams() {
// let this continue through to the NodeList so it updates last heard timestamp // let this continue through to the NodeList so it updates last heard timestamp
// for the sending audio mixer // for the sending audio mixer
NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket);
} else { } else {
NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket); NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket);
} }

4
examples/bot.js
View file

@ -179,8 +179,6 @@ function updateBehavior(deltaTime) {
Script.update.connect(updateBehavior); Script.update.connect(updateBehavior);
var SOUND_BASE_URL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Raws/"
function loadSounds() { function loadSounds() {
var sound_filenames = ["AB1.raw", "Anchorman2.raw", "B1.raw", "B1.raw", "Bale1.raw", "Bandcamp.raw", 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", "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" "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++) { for (var i = 0; i < sound_filenames.length; i++) {
sounds.push(new Sound(SOUND_BASE_URL + sound_filenames[i])); sounds.push(new Sound(SOUND_BASE_URL + sound_filenames[i]));
} }