Skip to content

Commit c9d4374

Browse files
committed
rebuild lib with reference example fix #320
1 parent 429b953 commit c9d4374

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

lib/p5.sound.js

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! p5.sound.js v0.3.9 2018-09-08 */
1+
/*! p5.sound.js v0.3.9 2018-09-10 */
22
/**
33
* p5.sound extends p5 with <a href="http://caniuse.com/audio-api"
44
* target="_blank">Web Audio</a> functionality including audio input,
@@ -1060,15 +1060,21 @@ soundfile = function () {
10601060
request.onload = function () {
10611061
if (request.status === 200) {
10621062
// on sucess loading file:
1063+
if (!self.panner)
1064+
return;
10631065
ac.decodeAudioData(request.response, // success decoding buffer:
10641066
function (buff) {
1067+
if (!self.panner)
1068+
return;
10651069
self.buffer = buff;
10661070
self.panner.inputChannels(buff.numberOfChannels);
10671071
if (callback) {
10681072
callback(self);
10691073
}
10701074
}, // error decoding buffer. "e" is undefined in Chrome 11/22/2015
10711075
function () {
1076+
if (!self.panner)
1077+
return;
10721078
var err = new CustomError('decodeAudioData', errorTrace, self.url);
10731079
var msg = 'AudioContext error at decodeAudioData for ' + self.url;
10741080
if (errorCallback) {
@@ -1079,6 +1085,8 @@ soundfile = function () {
10791085
}
10801086
});
10811087
} else {
1088+
if (!self.panner)
1089+
return;
10821090
var err = new CustomError('loadSound', errorTrace, self.url);
10831091
var msg = 'Unable to load ' + self.url + '. The request status was: ' + request.status + ' (' + request.statusText + ')';
10841092
if (errorCallback) {
@@ -1104,7 +1112,11 @@ soundfile = function () {
11041112
} else if (this.file !== undefined) {
11051113
var reader = new FileReader();
11061114
reader.onload = function () {
1115+
if (!self.panner)
1116+
return;
11071117
ac.decodeAudioData(reader.result, function (buff) {
1118+
if (!self.panner)
1119+
return;
11081120
self.buffer = buff;
11091121
self.panner.inputChannels(buff.numberOfChannels);
11101122
if (callback) {
@@ -1113,6 +1125,8 @@ soundfile = function () {
11131125
});
11141126
};
11151127
reader.onerror = function (e) {
1128+
if (!self.panner)
1129+
return;
11161130
if (onerror) {
11171131
onerror(e);
11181132
}
@@ -2012,6 +2026,8 @@ soundfile = function () {
20122026
// Render the song
20132027
// act on the result
20142028
offlineContext.oncomplete = function (e) {
2029+
if (!self.panner)
2030+
return;
20152031
var filteredBuffer = e.renderedBuffer;
20162032
var bufferData = filteredBuffer.getChannelData(0);
20172033
// step 1:
@@ -2306,9 +2322,10 @@ soundfile = function () {
23062322
* <div><code>
23072323
* var inp, button, mySound;
23082324
* var fileName = 'cool';
2309-
* function setup() {
2325+
* function preload() {
23102326
* mySound = loadSound('assets/doorbell.mp3');
2311-
*
2327+
* }
2328+
* function setup() {
23122329
* btn = createButton('click to save file');
23132330
* btn.position(0, 0);
23142331
* btn.mouseClicked(handleMouseClick);

0 commit comments

Comments
 (0)