diff --git a/examples/entityScripts/movable.js b/examples/entityScripts/movable.js index 21e6261179..8b51ee2b90 100644 --- a/examples/entityScripts/movable.js +++ b/examples/entityScripts/movable.js @@ -117,7 +117,7 @@ print("stopSound()"); } if (this.injector) { - Audio.stopInjector(this.injector); + this.injector.stop(); this.injector = null; } } diff --git a/examples/example/audio/birdSongs.js b/examples/example/audio/birdSongs.js index 267fa20b49..876f942dbc 100644 --- a/examples/example/audio/birdSongs.js +++ b/examples/example/audio/birdSongs.js @@ -75,14 +75,14 @@ function maybePlaySound(deltaTime) { //print("number playing = " + numPlaying); } for (var i = 0; i < playing.length; i++) { - if (!Audio.isInjectorPlaying(playing[i].audioId)) { + if (!playing[i].audioId.isPlaying) { Entities.deleteEntity(playing[i].entityId); if (useLights) { Entities.deleteEntity(playing[i].lightId); } playing.splice(i, 1); } else { - var loudness = Audio.getLoudness(playing[i].audioId); + var loudness = playing[i].audioId.loudness; var newColor = { red: playing[i].color.red, green: playing[i].color.green, blue: playing[i].color.blue }; if (loudness > 0.05) { newColor.red *= (1.0 - loudness); diff --git a/examples/utilities/diagnostics/inWorldTestTone.js b/examples/utilities/diagnostics/inWorldTestTone.js index 77ec7ba3b2..ffafd62f97 100644 --- a/examples/utilities/diagnostics/inWorldTestTone.js +++ b/examples/utilities/diagnostics/inWorldTestTone.js @@ -21,7 +21,7 @@ var offset = Vec3.normalize(Quat.getFront(MyAvatar.orientation)); var position = Vec3.sum(MyAvatar.position, offset); function update(deltaTime) { - if (!Audio.isInjectorPlaying(soundPlaying)) { + if (!soundPlaying.isPlaying) { soundPlaying = Audio.playSound(sound, { position: position, loop: true @@ -31,7 +31,7 @@ function update(deltaTime) { } function scriptEnding() { - if (Audio.isInjectorPlaying(soundPlaying)) { + if (soundPlaying.isPlaying) { Audio.stopInjector(soundPlaying); print("Stopped sound loop"); } diff --git a/examples/utilities/diagnostics/orbitingSound.js b/examples/utilities/diagnostics/orbitingSound.js index 54e319faaa..3ff73e9d35 100644 --- a/examples/utilities/diagnostics/orbitingSound.js +++ b/examples/utilities/diagnostics/orbitingSound.js @@ -32,14 +32,14 @@ var sound = Audio.playSound(soundClip, { position: orbitCenter, loop: true, volu 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 * Audio.getLoudness(sound); + trailingLoudness = 0.9 * trailingLoudness + 0.1 * sound.loudness; Entities.editEntity( objectId, { position: currentPosition, color: { red: Math.min(trailingLoudness * 2000, 255), green: 0, blue: 0 } } ); - Audio.setInjectorOptions(sound, { position: currentPosition }); + sound.setOptions({ position: currentPosition }); } Script.scriptEnding.connect(function() { Entities.deleteEntity(objectId); - Audio.stopInjector(sound); + sound.stop(); }); Script.update.connect(update); \ No newline at end of file diff --git a/examples/utilities/diagnostics/playSoundLoop.js b/examples/utilities/diagnostics/playSoundLoop.js index faf23761b4..f54ed88e28 100644 --- a/examples/utilities/diagnostics/playSoundLoop.js +++ b/examples/utilities/diagnostics/playSoundLoop.js @@ -45,8 +45,8 @@ function maybePlaySound(deltaTime) { } function scriptEnding() { - if (Audio.isInjectorPlaying(soundPlaying)) { - Audio.stopInjector(soundPlaying); + if (soundPlaying.isPlaying) { + soundPlaying.stop(); Entities.deleteEntity(ball); print("Stopped sound."); } diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h index 4252eaf2ef..d01294dc36 100644 --- a/libraries/audio/src/AudioInjector.h +++ b/libraries/audio/src/AudioInjector.h @@ -27,6 +27,8 @@ class AbstractAudioInterface; class AudioInjector : public QObject { Q_OBJECT + Q_PROPERTY(bool isPlaying READ isPlaying) + Q_PROPERTY(float loudness READ getLoudness) public: AudioInjector(QObject* parent); AudioInjector(Sound* sound, const AudioInjectorOptions& injectorOptions);