Update all references of pc.AudioManager to pc.SoundManager (#1999)

Author: willeastcott

src/audio/channel.js

@@ -3,19 +3,19 @@ Object.assign(pc, function () {
 
     var Channel;
 
-    if (pc.AudioManager.hasAudioContext()) {
+    if (pc.SoundManager.hasAudioContext()) {
         /**
          * @private
          * @class
          * @name pc.Channel
-         * @classdesc A channel is created when the pc.AudioManager begins playback of a pc.Sound. Usually created internally by
-         * pc.AudioManager#playSound or pc.AudioManager#playSound3d. Developers usually won't have to create Channels manually.
-         * @param {pc.AudioManager} manager - The AudioManager instance.
-         * @param {pc.Sound} sound - The sound to playback.
-         * @param {object} [options] - Optional options object.
-         * @param {number} [options.volume=1] - The playback volume, between 0 and 1.
-         * @param {number} [options.pitch=1] - The relative pitch, default of 1, plays at normal pitch.
-         * @param {boolean} [options.loop=false] - Whether the sound should loop when it reaches the end or not.
+         * @classdesc A channel is created when the pc.SoundManager begins playback of a pc.Sound. Usually created internally by
+         * pc.SoundManager#playSound or pc.SoundManager#playSound3d. Developers usually won't have to create Channels manually.
+         * @param {pc.SoundManager} manager - The SoundManager instance.
+         * @param {pc.Sound} sound - The sound to playback.
+         * @param {object} [options] - Optional options object.
+         * @param {number} [options.volume=1] - The playback volume, between 0 and 1.
+         * @param {number} [options.pitch=1] - The relative pitch, default of 1, plays at normal pitch.
+         * @param {boolean} [options.loop=false] - Whether the sound should loop when it reaches the end or not.
          */
         Channel = function (manager, sound, options) {
             options = options || {};
@@ -139,7 +139,7 @@ Object.assign(pc, function () {
              * @function
              * @name pc.Channel#setLoop
              * @description Enable/disable the loop property to make the sound restart from the beginning when it reaches the end.
-             * @param {boolean} loop - True to loop the sound, false otherwise.
+             * @param {boolean} loop - True to loop the sound, false otherwise.
              */
             setLoop: function (loop) {
                 this.loop = loop;
@@ -153,7 +153,7 @@ Object.assign(pc, function () {
              * @function
              * @name pc.Channel#setVolume
              * @description Set the volume of playback between 0 and 1.
-             * @param {number} volume - The volume of the sound. Will be clamped between 0 and 1.
+             * @param {number} volume - The volume of the sound. Will be clamped between 0 and 1.
              */
             setVolume: function (volume) {
                 volume = pc.math.clamp(volume, 0, 1);
@@ -196,7 +196,7 @@ Object.assign(pc, function () {
                 }
             }
         });
-    } else if (pc.AudioManager.hasAudio()) {
+    } else if (pc.SoundManager.hasAudio()) {
         Channel = function (manager, sound, options) {
             this.volume = options.volume || 1;
             this.loop = options.loop || false;

src/audio/channel3d.js

@@ -6,7 +6,7 @@ Object.assign(pc, function () {
 
     var Channel3d;
 
-    if (pc.AudioManager.hasAudioContext()) {
+    if (pc.SoundManager.hasAudioContext()) {
         Channel3d = function (manager, sound, options) {
             pc.Channel.call(this, manager, sound, options);
 
@@ -93,7 +93,7 @@ Object.assign(pc, function () {
                 }
             }
         });
-    } else if (pc.AudioManager.hasAudio()) {
+    } else if (pc.SoundManager.hasAudio()) {
         // temp vector storage
         var offset = new pc.Vec3();
 

src/backwards-compatibility.js

@@ -345,6 +345,8 @@ pc.AssetRegistry.prototype.getAssetById = function (id) {
     return this.get(id);
 };
 
+pc.AudioManager = pc.SoundManager;
+
 pc.GraphNode.prototype._dirtify = function (local) {
     // #ifdef DEBUG
     console.warn('DEPRECATED: pc.GraphNode#_dirtify is deprecated. Use pc.GraphNode#_dirtifyLocal or _dirtifyWorld respectively instead.');

src/framework/application.js

@@ -290,7 +290,7 @@ Object.assign(pc, function () {
 
         this.graphicsDevice = new pc.GraphicsDevice(canvas, options.graphicsDeviceOptions);
         this.stats = new pc.ApplicationStats(this.graphicsDevice);
-        this._audioManager = new pc.SoundManager(options);
+        this._soundManager = new pc.SoundManager(options);
         this.loader = new pc.ResourceLoader(this);
 
         // stores all entities that have been created
@@ -582,7 +582,7 @@ Object.assign(pc, function () {
         this.loader.addHandler("texture", new pc.TextureHandler(this.graphicsDevice, this.assets, this.loader));
         this.loader.addHandler("text", new pc.TextHandler());
         this.loader.addHandler("json", new pc.JsonHandler());
-        this.loader.addHandler("audio", new pc.AudioHandler(this._audioManager));
+        this.loader.addHandler("audio", new pc.AudioHandler(this._soundManager));
         this.loader.addHandler("script", new pc.ScriptHandler(this));
         this.loader.addHandler("scene", new pc.SceneHandler(this));
         this.loader.addHandler("cubemap", new pc.CubemapHandler(this.graphicsDevice, this.assets, this.loader));
@@ -611,9 +611,9 @@ Object.assign(pc, function () {
         } else {
             this.systems.add(new pc.ScriptComponentSystem(this));
         }
-        this.systems.add(new pc.AudioSourceComponentSystem(this, this._audioManager));
-        this.systems.add(new pc.SoundComponentSystem(this, this._audioManager));
-        this.systems.add(new pc.AudioListenerComponentSystem(this, this._audioManager));
+        this.systems.add(new pc.AudioSourceComponentSystem(this, this._soundManager));
+        this.systems.add(new pc.SoundComponentSystem(this, this._soundManager));
+        this.systems.add(new pc.AudioListenerComponentSystem(this, this._soundManager));
         this.systems.add(new pc.ParticleSystemComponentSystem(this));
         this.systems.add(new pc.ScreenComponentSystem(this));
         this.systems.add(new pc.ElementComponentSystem(this));
@@ -1440,9 +1440,9 @@ Object.assign(pc, function () {
          */
         onVisibilityChange: function () {
             if (this.isHidden()) {
-                this._audioManager.suspend();
+                this._soundManager.suspend();
             } else {
-                this._audioManager.resume();
+                this._soundManager.resume();
             }
         },
 
@@ -1841,9 +1841,9 @@ Object.assign(pc, function () {
 
             this.off(); // remove all events
 
-            if (this._audioManager) {
-                this._audioManager.destroy();
-                this._audioManager = null;
+            if (this._soundManager) {
+                this._soundManager.destroy();
+                this._soundManager = null;
             }
 
             pc.http = new pc.Http();

src/sound/listener.js

@@ -6,14 +6,14 @@ Object.assign(pc, function () {
      * @class
      * @name pc.Listener
      * @classdesc Represents an audio listener - used internally.
-     * @param {pc.SoundManager} manager - The sound manager.
+     * @param {pc.SoundManager} manager - The sound manager.
      */
     var Listener = function (manager) {
         this.position = new pc.Vec3();
         this.velocity = new pc.Vec3();
         this.orientation = new pc.Mat4();
 
-        if (pc.AudioManager.hasAudioContext()) {
+        if (pc.SoundManager.hasAudioContext()) {
             this.listener = manager.context.listener;
         }
     };

src/sound/manager.js

@@ -192,9 +192,6 @@ Object.assign(pc, function () {
         }
     });
 
-    // backwards compatibility
-    pc.AudioManager = SoundManager;
-
     return {
         SoundManager: SoundManager
     };