Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/processing/p5.js-sound in…
Browse files Browse the repository at this point in the history
…to loadingcallbacks
  • Loading branch information
therewasaguy committed Nov 23, 2015
2 parents 1d9379f + 559fe38 commit 04288f2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/p5.sound.js
Original file line number Diff line number Diff line change
Expand Up @@ -3484,8 +3484,8 @@ signal = function () {
* @param {Number} number to multiply
* @param {Number} inMin input range minumum
* @param {Number} inMax input range maximum
* @param {Number} outMin input range minumum
* @param {Number} outMax input range maximum
* @param {Number} outMin output range minumum
* @param {Number} outMax output range maximum
* @return {p5.SignalScale} object
*/
Signal.prototype.scale = function (inMin, inMax, outMin, outMax) {
Expand Down Expand Up @@ -7329,4 +7329,4 @@ src_app = function () {
var p5SOUND = sndcore;
return p5SOUND;
}(sndcore, master, helpers, panner, soundfile, amplitude, fft, signal, oscillator, env, pulse, noise, audioin, filter, delay, reverb, metro, looper, soundRecorder, peakdetect, gain);
}));
}));

0 comments on commit 04288f2

Please sign in to comment.