Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-17 20:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify broadcast creation

Browse Source
This commit is contained in:
Amish Shah
2016-12-30 12:46:34 +00:00
parent 2f630a0dbb
commit bf4010e89c
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/voice/player/AudioPlayer.js
View File

@@ -35,12 +35,6 @@ class AudioPlayer extends EventEmitter {
} }
destroyStream(stream) { destroyStream(stream) {
if (stream instanceof VoiceBroadcast && this.streams.has(stream)) {
const data = this.streams.get(stream);
if (data.dispatcher) data.dispatcher.destroy('end');
this.streams.delete(stream);
return;
}
const data = this.streams.get(stream); const data = this.streams.get(stream);
if (!data) return; if (!data) return;
const transcoder = data.transcoder; const transcoder = data.transcoder;
@@ -89,11 +83,11 @@ class AudioPlayer extends EventEmitter {
playBroadcast(broadcast, { volume = 1, passes = 1 } = {}) { playBroadcast(broadcast, { volume = 1, passes = 1 } = {}) {
const options = { volume, passes }; const options = { volume, passes };
this.destroyAllStreams(); this.destroyAllStreams();
this.streams.set(broadcast, broadcast);
const dispatcher = new StreamDispatcher(this, broadcast, options); const dispatcher = new StreamDispatcher(this, broadcast, options);
dispatcher.on('end', () => this.destroyStream(broadcast)); dispatcher.on('end', () => this.destroyStream(broadcast));
dispatcher.on('error', () => this.destroyStream(broadcast)); dispatcher.on('error', () => this.destroyStream(broadcast));
dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value)); dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value));
this.streams.set(broadcast, { dispatcher, input: broadcast });
broadcast.registerDispatcher(dispatcher); broadcast.registerDispatcher(dispatcher);
return dispatcher; return dispatcher;
} }