Merging scratchfoundation#87 Audio API update - fix disconnect/sound stopping

Tim Mickel · Tim Mickel · commit 20e90c68a1f0 · 2014-09-12T11:42:37.000-04:00
diff --git a/js/Scratch.js b/js/Scratch.js
@@ -113,7 +113,7 @@ function Scratch(project_id) {
             var isource = runtime.audioContext.createBufferSource();
             isource.buffer = ibuffer;
             isource.connect(runtime.audioContext.destination);
-            isource.noteOn(0);
+            isource.start();
             iosAudioActive = true;
         }
     });
diff --git a/js/primitives/SoundPrims.js b/js/primitives/SoundPrims.js
@@ -39,7 +39,7 @@ SoundPrims.prototype.addPrimsTo = function(primTable) {
 var playSound = function(snd) {
     if (snd.source) {
         // If this particular sound is already playing, stop it.
-        snd.source.stop();
+        snd.source.disconnect();
         snd.source = null;
     }
 
@@ -108,7 +108,7 @@ var stopAllSounds = function() {
     runtime.audioPlaying = [];
     for (var s = 0; s < oldPlaying.length; s++) {
         if (oldPlaying[s].source) {
-            oldPlaying[s].source.noteOff(0);
+            oldPlaying[s].source.disconnect();
             oldPlaying[s].source.finished();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ function Scratch(project_id) {`
`113`	`113`	`var isource = runtime.audioContext.createBufferSource();`
`114`	`114`	`isource.buffer = ibuffer;`
`115`	`115`	`isource.connect(runtime.audioContext.destination);`
`116`		`- isource.noteOn(0);`
	`116`	`+ isource.start();`
`117`	`117`	`iosAudioActive = true;`
`118`	`118`	`}`
`119`	`119`	`});`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ SoundPrims.prototype.addPrimsTo = function(primTable) {`
`39`	`39`	`var playSound = function(snd) {`
`40`	`40`	`if (snd.source) {`
`41`	`41`	`// If this particular sound is already playing, stop it.`
`42`		`- snd.source.stop();`
	`42`	`+ snd.source.disconnect();`
`43`	`43`	`snd.source = null;`
`44`	`44`	`}`
`45`	`45`
`@@ -108,7 +108,7 @@ var stopAllSounds = function() {`
`108`	`108`	`runtime.audioPlaying = [];`
`109`	`109`	`for (var s = 0; s < oldPlaying.length; s++) {`
`110`	`110`	`if (oldPlaying[s].source) {`
`111`		`- oldPlaying[s].source.noteOff(0);`
	`111`	`+ oldPlaying[s].source.disconnect();`
`112`	`112`	`oldPlaying[s].source.finished();`
`113`	`113`	`}`
`114`	`114`	`}`