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

update streamDispatcher

Browse Source
This commit is contained in:
Amish Shah
2016-12-28 17:28:14 +00:00
parent be32bbc3a4
commit 8cf520d5af
3 changed files with 362 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ class AudioPlayer extends EventEmitter {
this.voiceConnection = voiceConnection;
this.prism = new Prism();
this.opusEncoder = OpusEncoders.fetch();
this.transcoders = new Collection();
this.streams = new Collection();
this.streamingData = {
channels: 2,
count: 0,
@@ -29,14 +29,17 @@ class AudioPlayer extends EventEmitter {
}
get currentTranscoder() {
return this.transcoders.last();
return this.streams.last().transcoder;
}
destroyAllTranscoders(exceptLatest) {
for (const stream of this.transcoders.keys()) {
const transcoder = this.transcoders.get(stream);
destroyAllStreams(exceptLatest) {
for (const stream of this.streams.keys()) {
const data = this.streams.get(stream);
const transcoder = data.transcoder;
const dispatcher = data.dispatcher;
if (exceptLatest && transcoder === this.currentTranscoder) continue;
transcoder.kill();
if (transcoder) transcoder.kill();
if (dispatcher) dispatcher.destroy('end');
}
}
@@ -47,15 +50,17 @@ class AudioPlayer extends EventEmitter {
media: stream,
ffmpegArguments,
});
this.transcoders.set(stream, transcoder);
this.streams.set(stream, { transcoder });
this.playPCMStream(transcoder.output, options);
}
playPCMStream(stream, { seek = 0, volume = 1, passes = 1 } = {}) {
const options = { seek, volume, passes };
this.destroyAllTranscoders(true);
this.destroyAllStreams(true);
const dispatcher = new StreamDispatcher(this, stream, options);
dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value));
if (!this.streams.has(stream)) this.streams.set(stream, { dispatcher });
this.streams.get(stream).dispatcher = dispatcher;
return dispatcher;
}
}