scratchfoundation/scratch-audio
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-audio.git synced 2024-12-22 14:02:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: use GreenPlayer in AudioPlayer

Browse source
This commit is contained in:
Michael "Z" Goddard 2018-06-12 09:21:03 -04:00
parent 2a63b0b027
commit 961749815c
No known key found for this signature in database
GPG key ID: 762CD40DD5349872
1 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/AudioPlayer.js
View file

@ -2,7 +2,7 @@ const PanEffect = require('./effects/PanEffect');
const PitchEffect = require('./effects/PitchEffect'); const PitchEffect = require('./effects/PitchEffect');
const VolumeEffect = require('./effects/VolumeEffect'); const VolumeEffect = require('./effects/VolumeEffect');
const SoundPlayer = require('./SoundPlayer'); const SoundPlayer = require('./GreenPlayer');
class AudioPlayer { class AudioPlayer {
/** /**
@ -17,7 +17,7 @@ class AudioPlayer {
this.outputNode = this.audioEngine.audioContext.createGain(); this.outputNode = this.audioEngine.audioContext.createGain();
// Create the audio effects // Create the audio effects.
const volumeEffect = new VolumeEffect(this.audioEngine, this, null); const volumeEffect = new VolumeEffect(this.audioEngine, this, null);
const pitchEffect = new PitchEffect(this.audioEngine, this, volumeEffect); const pitchEffect = new PitchEffect(this.audioEngine, this, volumeEffect);
const panEffect = new PanEffect(this.audioEngine, this, pitchEffect); const panEffect = new PanEffect(this.audioEngine, this, pitchEffect);
@ -33,12 +33,11 @@ class AudioPlayer {
pitchEffect.connect(panEffect); pitchEffect.connect(panEffect);
volumeEffect.connect(pitchEffect); volumeEffect.connect(pitchEffect);
// reset effects to their default parameters // Reset effects to their default parameters.
this.clearEffects(); this.clearEffects();
// sound players that are currently playing, indexed by the sound's // SoundPlayers mapped by sound id.
// soundId this.soundPlayers = {};
this.activeSoundPlayers = {};
} }
/** /**
@ -55,7 +54,19 @@ class AudioPlayer {
* players * players
*/ */
getSoundPlayers () { getSoundPlayers () {
return this.activeSoundPlayers; return this.soundPlayers;
}
/**
* Add a SoundPlayer instance to soundPlayers map.
* @param {SoundPlayer} soundPlayer - SoundPlayer instance to add
*/
addSoundPlayer (soundPlayer) {
this.soundPlayers[soundPlayer.id] = soundPlayer;
for (const effectName in this.effects) {
this.effects[effectName].update();
}
} }
/** /**
@ -64,37 +75,16 @@ class AudioPlayer {
* @return {Promise} a Promise that resolves when the sound finishes playing * @return {Promise} a Promise that resolves when the sound finishes playing
*/ */
playSound (soundId) { playSound (soundId) {
// if this sound is not in the audio engine, return
if (!this.audioEngine.audioBuffers[soundId]) {
return;
}
// if this sprite or clone is already playing this sound, stop it first
if (this.activeSoundPlayers[soundId]) {
this.activeSoundPlayers[soundId].stop();
}
// create a new soundplayer to play the sound // create a new soundplayer to play the sound
const player = new SoundPlayer(this.audioEngine.audioContext); if (!this.soundPlayers[soundId]) {
player.setBuffer(this.audioEngine.audioBuffers[soundId]); this.addSoundPlayer(new SoundPlayer(
player.connect(this.outputNode); this.audioEngine,
player.start(); {id: soundId, buffer: this.audioEngine.audioBuffers[soundId]}
));
// add it to the list of active sound players
this.activeSoundPlayers[soundId] = player;
for (const effectName in this.effects) {
this.effects[effectName].update();
}
// remove sounds that are not playing from the active sound players
// array
for (const id in this.activeSoundPlayers) {
if (this.activeSoundPlayers.hasOwnProperty(id)) {
if (!this.activeSoundPlayers[id].isPlaying) {
delete this.activeSoundPlayers[id];
}
}
} }
const player = this.soundPlayers[soundId];
player.connect(this);
player.play();
return player.finished(); return player.finished();
} }
@ -104,8 +94,8 @@ class AudioPlayer {
*/ */
stopAllSounds () { stopAllSounds () {
// stop all active sound players // stop all active sound players
for (const soundId in this.activeSoundPlayers) { for (const soundId in this.soundPlayers) {
this.activeSoundPlayers[soundId].stop(); this.soundPlayers[soundId].stop();
} }
} }