scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 07:22:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clamp tempo range

Browse source 
The function in AudioEngine for change tempo can now be removed
This commit is contained in:
Eric Rosenbaum 2017-03-17 18:13:33 -04:00
parent f2ac365859
commit c9338f37ed
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/blocks/scratch3_sound.js
View file

@ -46,6 +46,11 @@ Scratch3SoundBlocks.MIDI_NOTE_RANGE = {min: 36, max: 96}; // C2 to C7
*/ */
Scratch3SoundBlocks.BEAT_RANGE = {min: 0, max: 100}; Scratch3SoundBlocks.BEAT_RANGE = {min: 0, max: 100};
/** The minimum and maximum tempo values, in bpm.
* @type {{min: number, max: number}}
*/
Scratch3SoundBlocks.TEMPO_RANGE = {min: 20, max: 500};
/** /**
* @param {Target} target - collect sound state for this target. * @param {Target} target - collect sound state for this target.
* @returns {SoundState} the mutable sound state associated with that target. This will be created if necessary. * @returns {SoundState} the mutable sound state associated with that target. This will be created if necessary.
@ -246,15 +251,21 @@ Scratch3SoundBlocks.prototype.getVolume = function (args, util) {
}; };
Scratch3SoundBlocks.prototype.setTempo = function (args) { Scratch3SoundBlocks.prototype.setTempo = function (args) {
var value = Cast.toNumber(args.TEMPO); var tempo = Cast.toNumber(args.TEMPO);
if (typeof this.runtime.audioEngine === 'undefined') return; this._updateTempo(tempo);
this.runtime.audioEngine.setTempo(value);
}; };
Scratch3SoundBlocks.prototype.changeTempo = function (args) { Scratch3SoundBlocks.prototype.changeTempo = function (args) {
var value = Cast.toNumber(args.TEMPO); var change = Cast.toNumber(args.TEMPO);
if (typeof this.runtime.audioEngine === 'undefined') return; if (typeof this.runtime.audioEngine === 'undefined') return;
this.runtime.audioEngine.changeTempo(value); var tempo = change + this.runtime.audioEngine.currentTempo;
this._updateTempo(tempo);
};
Scratch3SoundBlocks.prototype._updateTempo = function (tempo) {
tempo = MathUtil.clamp(tempo, Scratch3SoundBlocks.TEMPO_RANGE.min, Scratch3SoundBlocks.TEMPO_RANGE.max);
if (typeof this.runtime.audioEngine === 'undefined') return;
this.runtime.audioEngine.setTempo(tempo);
}; };
Scratch3SoundBlocks.prototype.getTempo = function () { Scratch3SoundBlocks.prototype.getTempo = function () {