From 25671fbefe06f7e1b11a7cee03be06a8be902f1a Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Fri, 12 Feb 2016 16:01:23 -0800
Subject: [PATCH 1/2] Update orbitingSound.js to use a sample file that exists
 and setOptions function.

---
 examples/utilities/diagnostics/orbitingSound.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/utilities/diagnostics/orbitingSound.js b/examples/utilities/diagnostics/orbitingSound.js
index 370ed38595..baebc17461 100644
--- a/examples/utilities/diagnostics/orbitingSound.js
+++ b/examples/utilities/diagnostics/orbitingSound.js
@@ -17,7 +17,7 @@ var SPEED = 1.0;
 var currentPosition = { x: 0, y: 0, z: 0 };
 var trailingLoudness = 0.0;
 
-var soundClip = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/Tabla+Loops/Tabla1.wav");
+var soundClip = SoundCache.getSound("http://public.highfidelity.io/sounds/Rats_Squeaks_Active.wav");
 
 var properties = { 
     type: "Box",
@@ -27,18 +27,20 @@ var properties = {
 };
 
 var objectId = Entities.addEntity(properties);
-var sound = Audio.playSound(soundClip, { position: orbitCenter, loop: true, volume: 0.5 });
+var soundOptions = { position: orbitCenter, loop: true, volume: 0.5 };
+var sound = Audio.playSound(soundClip, soundOptions);
 
 function update(deltaTime) { 
     time += deltaTime; 
     currentPosition = { x: orbitCenter.x + Math.cos(time * SPEED) * RADIUS, y: orbitCenter.y, z: orbitCenter.z + Math.sin(time * SPEED) * RADIUS };
     trailingLoudness = 0.9 * trailingLoudness + 0.1 * sound.loudness;
     Entities.editEntity( objectId, { position: currentPosition, color: { red: Math.min(trailingLoudness * 2000, 255), green: 0, blue: 0 } } );
-    sound.options = { position: currentPosition };
+    soundOptions.position = currentPosition;
+    sound.setOptions(soundOptions);
 }
 
 Script.scriptEnding.connect(function() {
     Entities.deleteEntity(objectId);
 });
 
-Script.update.connect(update);
\ No newline at end of file
+Script.update.connect(update);

From 9a3972c43ffca3c5c309b33926bab36c6dec7627 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Fri, 12 Feb 2016 17:42:44 -0800
Subject: [PATCH 2/2] wait for sound to download

---
 examples/utilities/diagnostics/orbitingSound.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/utilities/diagnostics/orbitingSound.js b/examples/utilities/diagnostics/orbitingSound.js
index baebc17461..11ec9c8358 100644
--- a/examples/utilities/diagnostics/orbitingSound.js
+++ b/examples/utilities/diagnostics/orbitingSound.js
@@ -28,9 +28,15 @@ var properties = {
 
 var objectId = Entities.addEntity(properties);
 var soundOptions = { position: orbitCenter, loop: true, volume: 0.5 };
-var sound = Audio.playSound(soundClip, soundOptions);
+var sound;
 
-function update(deltaTime) { 
+function update(deltaTime) {
+    if (!soundClip.downloaded) {
+        return;
+    }
+    if (!sound) {
+        sound = Audio.playSound(soundClip, soundOptions); // Not until downloaded
+    }
     time += deltaTime; 
     currentPosition = { x: orbitCenter.x + Math.cos(time * SPEED) * RADIUS, y: orbitCenter.y, z: orbitCenter.z + Math.sin(time * SPEED) * RADIUS };
     trailingLoudness = 0.9 * trailingLoudness + 0.1 * sound.loudness;