scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 23:30:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

move promise into audio engine

Browse source 
changes to play note, play drum and rest blocks so their promises to wait are returned by the audio engine
This commit is contained in:
Eric Rosenbaum 2017-01-06 10:31:01 -05:00
parent 4298f4865f
commit dbe2cef93c
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/blocks/scratch3_sound.js
View file

@ -1,6 +1,5 @@
var MathUtil = require('../util/math-util'); var MathUtil = require('../util/math-util');
var Cast = require('../util/cast'); var Cast = require('../util/cast');
var Promise = require('promise');
var Scratch3SoundBlocks = function (runtime) { var Scratch3SoundBlocks = function (runtime) {
/** /**
@ -21,6 +20,7 @@ Scratch3SoundBlocks.prototype.getPrimitives = function () {
sound_stopallsounds: this.stopAllSounds, sound_stopallsounds: this.stopAllSounds,
sound_playnoteforbeats: this.playNoteForBeats, sound_playnoteforbeats: this.playNoteForBeats,
sound_playdrumforbeats: this.playDrumForBeats, sound_playdrumforbeats: this.playDrumForBeats,
sound_restforbeats: this.restForBeats,
sound_setinstrumentto: this.setInstrument, sound_setinstrumentto: this.setInstrument,
sound_seteffectto: this.setEffect, sound_seteffectto: this.setEffect,
sound_changeeffectby: this.changeEffect, sound_changeeffectby: this.changeEffect,
@ -30,8 +30,9 @@ Scratch3SoundBlocks.prototype.getPrimitives = function () {
sound_effects_menu: this.effectsMenu, sound_effects_menu: this.effectsMenu,
sound_setvolumeto: this.setVolume, sound_setvolumeto: this.setVolume,
sound_changevolumeby: this.changeVolume, sound_changevolumeby: this.changeVolume,
sound_sound_settempotobpm: this.setTempo, sound_settempotobpm: this.setTempo,
sound_changetempoby: this.changeTempo sound_changetempoby: this.changeTempo,
sound_tempo: this.getTempo
}; };
}; };
@ -69,21 +70,15 @@ Scratch3SoundBlocks.prototype.stopAllSounds = function (args, util) {
}; };
Scratch3SoundBlocks.prototype.playNoteForBeats = function (args, util) { Scratch3SoundBlocks.prototype.playNoteForBeats = function (args, util) {
util.target.audioPlayer.playNoteForBeats(args.NOTE, args.BEATS); return util.target.audioPlayer.playNoteForBeats(args.NOTE, args.BEATS);
return new Promise(function (resolve) { };
setTimeout(function () {
resolve();
}, (1000 * args.BEATS));
});
};
Scratch3SoundBlocks.prototype.playDrumForBeats = function (args, util) { Scratch3SoundBlocks.prototype.playDrumForBeats = function (args, util) {
util.target.audioPlayer.playDrumForBeats(args.DRUM, args.BEATS); return util.target.audioPlayer.playDrumForBeats(args.DRUM, args.BEATS);
return new Promise(function (resolve) { };
setTimeout(function () {
resolve(); Scratch3SoundBlocks.prototype.restForBeats = function (args, util) {
}, (1000 * args.BEATS)); return util.target.audioPlayer.waitForBeats(args.BEATS);
});
}; };
Scratch3SoundBlocks.prototype.setInstrument = function (args, util) { Scratch3SoundBlocks.prototype.setInstrument = function (args, util) {
@ -125,6 +120,10 @@ Scratch3SoundBlocks.prototype.changeTempo = function (args, util) {
util.target.audioPlayer.changeTempo(value); util.target.audioPlayer.changeTempo(value);
}; };
Scratch3SoundBlocks.prototype.getTempo = function (args, util) {
return util.target.audioPlayer.currentTempo;
};
Scratch3SoundBlocks.prototype.soundsMenu = function (args) { Scratch3SoundBlocks.prototype.soundsMenu = function (args) {
return args.SOUND_MENU; return args.SOUND_MENU;
}; };