[FIX] Don't resume 3d sounds when switching tabs, [FIX] Don't start s…

…ounds when changing '3d' property
playcanvas · Dec 7, 2015 · 4eeb950 · 4eeb950
1 parent 4e70076
commit 4eeb950
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/src/audio/audio_channel.js b/src/audio/audio_channel.js
@@ -66,6 +66,10 @@ pc.extend(pc, function () {
                 this.manager.on('volumechange', this.onManagerVolumeChange, this);
                 this.manager.on('suspend', this.onManagerSuspend, this);
                 this.manager.on('resume', this.onManagerResume, this);
+
+                // suspend immediately if manager is suspended
+                if (this.manager.suspended)
+                    this.onManagerSuspend();
             },
 
             /**
@@ -227,6 +231,10 @@ pc.extend(pc, function () {
                 this.manager.on('suspend', this.onManagerSuspend, this);
                 this.manager.on('resume', this.onManagerResume, this);
 
+                // suspend immediately if manager is suspended
+                if (this.manager.suspended)
+                    this.onManagerSuspend();
+
             },
 
             pause: function () {

diff --git a/src/audio/audio_channel3d.js b/src/audio/audio_channel3d.js
@@ -75,6 +75,11 @@ pc.extend(pc, function () {
                 this.source.connect(this.panner);
                 this.panner.connect(this.gain);
                 this.gain.connect(context.destination);
+
+                if (!this.loop) {
+                    // mark source as paused when it ends
+                    this.source.onended = this.pause.bind(this);
+                }
             }
         });
     } else if (pc.AudioManager.hasAudio()) {

diff --git a/src/framework/components/audiosource/audiosource_component.js b/src/framework/components/audiosource/audiosource_component.js
@@ -223,7 +223,19 @@ pc.extend(pc, function () {
         onSet3d: function (name, oldValue, newValue) {
             if (oldValue !== newValue) {
                 if (this.system.initialized && this.currentSource) {
+                    var paused = false;
+                    var suspended = false;
+                    if (this.channel) {
+                        paused = this.channel.paused;
+                        suspended = this.channel.suspended;
+                    }
+
                     this.play(this.currentSource);
+
+                    if (this.channel) {
+                        this.channel.paused = paused;
+                        this.channel.suspended = suspended;
+                    }
                 }
             }
         },