2.11.5

q5js · Nov 28, 2024 · 4a7319d · 4a7319d
1 parent 165427e
commit 4a7319d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
 	"name": "@q5/q5",
-	"version": "2.11.3",
+	"version": "2.11.5",
 	"license": "LGPL-3.0",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "q5",
-	"version": "2.11.4",
+	"version": "2.11.5",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",
 	"contributors": [

diff --git a/q5.js b/q5.js
@@ -2549,7 +2549,7 @@ Q5.modules.input = ($, q) => {
 	let c = $.canvas;
 
 	$._startAudio = () => {
-		if ($.getAudioContext && $.getAudioContext()?.state == 'suspended') $.userStartAudio();
+		if (!Q5.aud || Q5.aud?.state == 'suspended') $.userStartAudio();
 	};
 
 	$._updateMouse = (e) => {
@@ -3140,10 +3140,12 @@ Q5.modules.sound = ($, q) => {
 		let s = new Q5.Sound(path, cb);
 		s.crossOrigin = 'Anonymous';
 		s.addEventListener('canplaythrough', () => {
-			q._preloadCount--;
-			s.loaded = true;
-			if (Q5.aud) s.init();
-			if (cb) cb(s);
+			if (!s.loaded) {
+				q._preloadCount--;
+				s.loaded = true;
+				if (Q5.aud) s.init();
+				if (cb) cb(s);
+			}
 		});
 		sounds.push(s);
 		return s;
@@ -3166,10 +3168,12 @@ if (window.Audio) {
 			s.source = Q5.aud.createMediaElementSource(s);
 			s.source.connect(s.panner);
 			s.panner.connect(Q5.aud.destination);
+			let pan = s.pan;
 			Object.defineProperty(s, 'pan', {
 				get: () => s.panner.pan.value,
 				set: (v) => (s.panner.pan.value = v)
 			});
+			if (pan) s.pan = pan;
 		}
 		setVolume(level) {
 			this.volume = level;

diff --git a/q5.min.js b/q5.min.js
diff --git a/src/q5-input.js b/src/q5-input.js
@@ -37,7 +37,7 @@ Q5.modules.input = ($, q) => {
 	let c = $.canvas;
 
 	$._startAudio = () => {
-		if ($.getAudioContext && $.getAudioContext()?.state == 'suspended') $.userStartAudio();
+		if (!Q5.aud || Q5.aud?.state == 'suspended') $.userStartAudio();
 	};
 
 	$._updateMouse = (e) => {

diff --git a/src/q5-sound.js b/src/q5-sound.js
@@ -8,10 +8,12 @@ Q5.modules.sound = ($, q) => {
 		let s = new Q5.Sound(path, cb);
 		s.crossOrigin = 'Anonymous';
 		s.addEventListener('canplaythrough', () => {
-			q._preloadCount--;
-			s.loaded = true;
-			if (Q5.aud) s.init();
-			if (cb) cb(s);
+			if (!s.loaded) {
+				q._preloadCount--;
+				s.loaded = true;
+				if (Q5.aud) s.init();
+				if (cb) cb(s);
+			}
 		});
 		sounds.push(s);
 		return s;
@@ -34,10 +36,12 @@ if (window.Audio) {
 			s.source = Q5.aud.createMediaElementSource(s);
 			s.source.connect(s.panner);
 			s.panner.connect(Q5.aud.destination);
+			let pan = s.pan;
 			Object.defineProperty(s, 'pan', {
 				get: () => s.panner.pan.value,
 				set: (v) => (s.panner.pan.value = v)
 			});
+			if (pan) s.pan = pan;
 		}
 		setVolume(level) {
 			this.volume = level;