use hash in place of AudioInjectionOptions in other js files

examples/clap.js

@@ -89,11 +89,11 @@ function maybePlaySound(deltaTime) {
 }
 
 function playClap(volume, position) {
-	var options = new AudioInjectionOptions();
-	options.position = position;
-	options.volume = 1.0;
 	var clip = Math.floor(Math.random() * numberOfSounds);
-	Audio.playSound(claps[clip], options);
+	Audio.playSound(claps[clip], {
+	  position: position,
+    volume: volume
+	});
 }
 
 var FASTEST_CLAP_INTERVAL = 150.0;

examples/drumStick.js

@@ -63,8 +63,11 @@ function checkSticks(deltaTime) {
 			//   Waiting for change in velocity direction or slowing to trigger drum sound
 			if ((palmVelocity.y > 0.0) || (speed < STOP_SPEED)) {
 				state[palm] = 0;
-				var options = new AudioInjectionOptions();
+        
-				options.position = Controller.getSpatialControlPosition(palm * 2 + 1);
+        var options = {
+          position: Controller.getSpatialControlPosition(palm * 2 + 1);
+        }
+        
 				if (strokeSpeed[palm] > 1.0) { strokeSpeed[palm] = 1.0; }
 				options.volume = strokeSpeed[palm];
 

examples/editVoxels.js

@@ -68,9 +68,11 @@ var numColors = 9;
 var whichColor = 0;            //  Starting color is 'Copy' mode
 
 //  Create sounds for for every script actions that require one
-var audioOptions = new AudioInjectionOptions();
+// start with audio slightly above the avatar
-audioOptions.volume = 1.0;
+var audioOptions = {
-audioOptions.position = Vec3.sum(MyAvatar.position, { x: 0, y: 1, z: 0 }  ); // start with audio slightly above the avatar
+  position: Vec3.sum(MyAvatar.position, { x: 0, y: 1, z: 0 }  ),
+  volume: 1.0
+};
 
 function SoundArray() {
     this.audioOptions = audioOptions

examples/entityBirds.js

@@ -135,10 +135,10 @@ function updateBirds(deltaTime) {
             // Tweeting behavior
             if (birds[i].tweeting == 0) {
                 if (Math.random() < CHANCE_OF_TWEETING) {
-                    var options = new AudioInjectionOptions();
+                    Audio.playSound(birds[i].tweetSound, {
-                    options.position = properties.position;
+                      position: properties.position,
-                    options.volume = 0.75;
+                      volume: 0.75
-                    Audio.playSound(birds[i].tweetSound, options);
+                    });
                     birds[i].tweeting = 10;
                 }
             } else {

examples/entityScripts/playSoundOnClick.js

@@ -15,10 +15,9 @@
     var bird = new Sound("http://s3.amazonaws.com/hifi-public/sounds/Animals/bushtit_1.raw");
     this.clickDownOnEntity = function(entityID, mouseEvent) { 
         print("clickDownOnEntity()...");
-		var options = new AudioInjectionOptions();
+		    Audio.playSound(bird,  {
-		var position = MyAvatar.position; 
+		      position: MyAvatar.position,
-		options.position = position;
+          volume: 0.5
-		options.volume = 0.5;
+		    });
-		Audio.playSound(bird, options);
     }; 
 })

examples/entityScripts/playSoundOnEnterOrLeave.js

@@ -14,12 +14,11 @@
 (function(){ 
     var bird = new Sound("http://s3.amazonaws.com/hifi-public/sounds/Animals/bushtit_1.raw");
 
-    function playSound(entityID) { 
+    function playSound(entityID) {
-        var options = new AudioInjectionOptions();
+        Audio.playSound(bird, {
-        var position = MyAvatar.position; 
+          position: MyAvatar.position,
-        options.position = position;
+          volume: 0.5
-        options.volume = 0.5;
+        });
-        Audio.playSound(bird, options);
     }; 
 
     this.enterEntity = function(entityID) { 

examples/frisbee.js

@@ -177,10 +177,10 @@ function playSound(sound, position) {
     if (!SOUNDS_ENABLED) {
         return;
     }
-    var options = new AudioInjectionOptions();
+    
-    options.position = position;
+    Audio.playSound(sound,{
-    options.volume = 1.0;
+      position: position
-    Audio.playSound(sound, options);
+    });
 }
 
 function cleanupFrisbees() {

examples/grenadeLauncher.js

@@ -44,8 +44,9 @@ var targetLaunchSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/
 
 var gunModel = "http://public.highfidelity.io/models/attachments/HaloGun.fst";
 
-var audioOptions = new AudioInjectionOptions();
+var audioOptions {
-audioOptions.volume = 0.9;
+  volume: 0.9
+}
 
 var shotsFired = 0;
 

examples/gun.js

@@ -43,8 +43,9 @@ var targetLaunchSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/
 
 var gunModel = "http://public.highfidelity.io/models/attachments/HaloGun.fst";
 
-var audioOptions = new AudioInjectionOptions();
+var audioOptions = {
-audioOptions.volume = 0.9;
+  volume: 0.9
+}
 
 var shotsFired = 0;
 

examples/headMove.js

@@ -72,15 +72,11 @@ var WATCH_AVATAR_DISTANCE = 2.5;
 
 var sound = new Sound("http://public.highfidelity.io/sounds/Footsteps/FootstepW2Right-12db.wav");
 function playSound() {
-    var options = new AudioInjectionOptions();
+    Audio.playSound(sound, {
-    var position = MyAvatar.position; 
+      position: MyAvatar.position
-    options.position = position;
+    });
-    options.volume = 1.0;
-    Audio.playSound(sound, options);
 }
 
-
-
 function pullBack() {
     saveCameraState();
     cameraPosition = Vec3.subtract(MyAvatar.position, Vec3.multiplyQbyV(Camera.getOrientation(), { x: 0, y: -hipsToEyes, z: -hipsToEyes * WATCH_AVATAR_DISTANCE }));

examples/inWorldTestTone.js

@@ -19,11 +19,9 @@ var soundPlaying = false;
 
 function update(deltaTime) {
     if (!Audio.isInjectorPlaying(soundPlaying)) {
-        var options = new AudioInjectionOptions();
+        soundPlaying = Audio.playSound(sound, {
-        options.position = { x:0, y:0, z:0 };
+          loop: true
-        options.volume = 1.0;
+        });
-        options.loop = true;
-        soundPlaying = Audio.playSound(sound, options);
         print("Started sound loop");
     } 
 }

examples/playSound.js

@@ -15,12 +15,11 @@ var bird = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/bushtit_1.raw");
 
 function maybePlaySound(deltaTime) {
 	if (Math.random() < 0.01) {
-		//  Set the location and other info for the sound to play
+		//  Set the location and other info for the sound to play 
-		var options = new AudioInjectionOptions();
+		Audio.playSound(bird, {
-		var position = MyAvatar.position; 
+		  position: MyAvatar.position,
-		options.position = position;
+      volume: 0.5
-		options.volume = 0.5;
+		});
-		Audio.playSound(bird, options);
 	}
 }
 

examples/playSoundLoop.js

@@ -20,10 +20,12 @@ var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+A.raw"
 //var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Bandcamp.wav");
 
 var soundPlaying = false;
-var options = new AudioInjectionOptions();
+var options = {
-options.position = Vec3.sum(Camera.getPosition(), Quat.getFront(MyAvatar.orientation));
+  position: Vec3.sum(Camera.getPosition(), Quat.getFront(MyAvatar.orientation)),
-options.volume = 0.5;
+  volume: 0.5,
-options.loop = true;
+  loop: true
+}
+
 var playing = false;
 var ball = false;
 

examples/playSoundOrbit.js

@@ -19,24 +19,23 @@ var distance = 1;
 var debug = 0;
 
 function playSound() {
-    var options = new AudioInjectionOptions();
+  currentTime += deltaTime;
-    currentTime += deltaTime;
 
 	var s = distance * Math.sin(currentTime);
 	var c = distance * Math.cos(currentTime);
 
-    var soundOffset = { x:s, y:0, z:c };
+  var soundOffset = { x:s, y:0, z:c };
 
-    if (debug) {
+  if (debug) {
-    	print("t=" + currentTime + "offset=" + soundOffset.x + "," + soundOffset.y + "," + soundOffset.z);
+  	print("t=" + currentTime + "offset=" + soundOffset.x + "," + soundOffset.y + "," + soundOffset.z);
-    }
+  }
 
-    var avatarPosition = MyAvatar.position;
+  var avatarPosition = MyAvatar.position;
-    var soundPosition = Vec3.sum(avatarPosition,soundOffset);
+  var soundPosition = Vec3.sum(avatarPosition,soundOffset);
 
-    options.position = soundPosition
+  Audio.playSound(soundClip, {
-    options.volume = 1.0;
+    position: soundPosition
-    Audio.playSound(soundClip, options);
+  });
 }
 
 Script.setInterval(playSound, 250);

examples/playSoundWave.js

@@ -14,11 +14,10 @@ Script.include("libraries/globals.js");
 var soundClip = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail%20Party%20Snippets/Walken1.wav");
 
 function playSound() {
-    var options = new AudioInjectionOptions();
+    Audio.playSound(soundClip, {
-    var position = MyAvatar.position;
+      position: MyAvatar.position,
-    options.position = position;
+      volume: 0.5
-    options.volume = 0.5;
+    });
-    Audio.playSound(soundClip, options);
 }
 
 Script.setInterval(playSound, 10000);

examples/radio.js

@@ -15,10 +15,12 @@ var modelURL = HIFI_PUBLIC_BUCKET + "models/entities/radio/Speakers.fbx";
 var soundURL = HIFI_PUBLIC_BUCKET + "sounds/FamilyStereo.raw";
 
 var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
-var audioOptions = new AudioInjectionOptions();
+var audioOptions = {
-audioOptions.volume = 0.5;
+  volume: 0.5,
-audioOptions.loop = true;
+  loop: true,
-audioOptions.isStereo = true;
+  stereo: true
+}
+
 var injector = null;
 
 var sound = new Sound(soundURL, audioOptions.isStereo);

examples/spaceInvadersExample.js

@@ -217,7 +217,8 @@ function update(deltaTime) {
 
         if (invaderStepOfCycle % stepsPerSound == 0) {
             // play the move sound
-            var options = new AudioInjectionOptions();
+            var options = {};
+            
             if (soundInMyHead) {
                 options.position = { x: MyAvatar.position.x + 0.0, 
                                      y: MyAvatar.position.y + 0.1, 
@@ -225,7 +226,7 @@ function update(deltaTime) {
             } else {
                 options.position = getInvaderPosition(invadersPerRow / 2, numberOfRows / 2);
             }
-            options.volume = 1.0;
+            
             Audio.playSound(moveSounds[currentMoveSound], options);
             
             // get ready for next move sound
@@ -330,7 +331,7 @@ function fireMissile() {
                             lifetime: 5
                         });
 
-        var options = new AudioInjectionOptions();
+        var options = {}
         if (soundInMyHead) {
             options.position = { x: MyAvatar.position.x + 0.0, 
                                  y: MyAvatar.position.y + 0.1, 
@@ -338,7 +339,7 @@ function fireMissile() {
         } else {
             options.position = missilePosition;
         }
-        options.volume = 1.0;
+        
         Audio.playSound(shootSound, options);
 
         missileFired = true;
@@ -380,7 +381,7 @@ function deleteIfInvader(possibleInvaderEntity) {
                     Entities.deleteEntity(myMissile);
 
                     // play the hit sound
-                    var options = new AudioInjectionOptions();
+                    var options = {};
                     if (soundInMyHead) {
                         options.position = { x: MyAvatar.position.x + 0.0, 
                                              y: MyAvatar.position.y + 0.1, 
@@ -388,7 +389,7 @@ function deleteIfInvader(possibleInvaderEntity) {
                     } else {
                         options.position = getInvaderPosition(row, column);
                     }
-                    options.volume = 1.0;
+                    
                     Audio.playSound(hitSound, options);
                 }
             }

examples/toyball.js

@@ -113,10 +113,7 @@ function checkControllerSide(whichSide) {
                                 inHand: true };
             Entities.editEntity(closestEntity, properties);
             
-    		var options = new AudioInjectionOptions();
+			      Audio.playSound(catchSound, { position: ballPosition });
-			options.position = ballPosition;
-			options.volume = 1.0;
-			Audio.playSound(catchSound, options);
             
             return; // exit early
         }
@@ -156,10 +153,7 @@ function checkControllerSide(whichSide) {
         }
 
         // Play a new ball sound
-        var options = new AudioInjectionOptions();
+        Audio.playSound(newSound, { position: ballPosition});
-        options.position = ballPosition;
-        options.volume = 1.0;
-        Audio.playSound(newSound, options);
         
         return; // exit early
     }
@@ -207,10 +201,7 @@ function checkControllerSide(whichSide) {
                 rightHandEntity = false;
             }
 
-    		var options = new AudioInjectionOptions();
+            Audio.playSound(throwSound, { position: ballPosition });
-			options.position = ballPosition;
-			options.volume = 1.0;
-			Audio.playSound(throwSound, options);
         }
     }
 }

examples/walk.js

@@ -285,9 +285,11 @@ function resetJoints() {
 // play footstep sound
 function playFootstep(side) {
 
-    var options = new AudioInjectionOptions();
+    var options = {
-    options.position = Camera.getPosition();
+      position: Camera.getPosition(),
-    options.volume = 0.5;
+      volume: 0.5
+    }
+    
     var walkNumber = 2; // 0 to 2
     if(side===DIRECTION_RIGHT && playFootStepSounds) {
 		Audio.playSound(footsteps[walkNumber+1], options);