scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed sound loading

Browse source
This commit is contained in:
Eric Rosenbaum 2016-10-17 17:16:55 -04:00
parent ba84b6e34b
commit 6d9f889aa7
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/blocks/scratch3_sound.js
View file

@ -1,4 +1,3 @@
// var Cast = require('../util/cast');
var MathUtil = require('../util/math-util'); var MathUtil = require('../util/math-util');
var Promise = require('promise'); var Promise = require('promise');
@ -31,13 +30,26 @@ Scratch3SoundBlocks.prototype.getPrimitives = function() {
}; };
Scratch3SoundBlocks.prototype.playSound = function (args, util) { Scratch3SoundBlocks.prototype.playSound = function (args, util) {
var url = this._getSoundUrl(args.SOUND_MENU, util); var index = this._getSoundIndex(args.SOUND_MENU, util);
util.target.audioEngine.playSoundFromUrl(url); util.target.audioEngine.playSound(index);
}; };
Scratch3SoundBlocks.prototype._getSoundUrl = function (soundName, util) { Scratch3SoundBlocks.prototype.playSoundAndWait = function (args, util) {
var index = this._getSoundIndex(args.SOUND_MENU, util);
util.target.audioEngine.playSound(index);
var duration = util.target.audioEngine.getSoundDuration(index);
return new Promise(function(resolve) {
setTimeout(function() {
resolve();
}, 1000*duration);
});
};
Scratch3SoundBlocks.prototype._getSoundIndex = function (soundName, util) {
if (util.target.sprite.sounds.length == 0) { if (util.target.sprite.sounds.length == 0) {
return ''; return 0;
} }
var index; var index;
if (typeof soundName === 'number') { if (typeof soundName === 'number') {
@ -46,24 +58,10 @@ Scratch3SoundBlocks.prototype._getSoundUrl = function (soundName, util) {
} else { } else {
index = util.target.getSoundIndexByName(soundName); index = util.target.getSoundIndexByName(soundName);
if (index == -1) { if (index == -1) {
return ''; index = 0;
} }
} }
return util.target.sprite.sounds[index].fileUrl; return index;
};
Scratch3SoundBlocks.prototype.playSoundAndWait = function (args, util) {
var url = this._getSoundUrl(args.SOUND_MENU, util);
util.target.audioEngine.playSoundFromUrl(url);
var duration = util.target.audioEngine.getSoundDuration(url);
return new Promise(function(resolve) {
setTimeout(function() {
resolve();
}, 1000*duration);
});
}; };
Scratch3SoundBlocks.prototype.stopAllSounds = function (args, util) { Scratch3SoundBlocks.prototype.stopAllSounds = function (args, util) {

5
src/sprites/clone.js
View file

@ -48,7 +48,10 @@ function Clone(sprite, runtime) {
/** /**
* Audio engine * Audio engine
*/ */
this.audioEngine = new AudioEngine(); this.audioEngine = null;
if (this.runtime) {
this.audioEngine = new AudioEngine(this.sprite.sounds);
}
} }
util.inherits(Clone, Target); util.inherits(Clone, Target);