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

Maybe fix voice and #650?

Browse Source
This commit is contained in:
Amish Shah
2016-09-12 16:39:06 +01:00
parent fba3508079
commit b39d959cdf
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs.json
View File

File diff suppressed because one or more lines are too long

23
src/client/voice/player/BasePlayer.js
View File

@@ -50,30 +50,25 @@ class VoiceConnectionPlayer extends EventEmitter {
killStream(stream) { killStream(stream) {
const streams = this.processMap.get(stream); const streams = this.processMap.get(stream);
this._streamingData = this.dispatcher.streamingData; this._streamingData = this.dispatcher.streamingData;
this.emit('debug', 'Cleaning up streams after end/error'); this.emit('debug', 'cleaning up player after audio stream ended or encountered an error');
if (streams) { if (streams) {
this.processMap.delete(stream); this.processMap.delete(stream);
if (streams.inputStream && streams.pcmConverter) { if (streams.inputStream && streams.pcmConverter) {
try { try {
if (streams.inputStream.unpipe) { if (streams.inputStream.unpipe) {
streams.inputStream.unpipe(streams.pcmConverter.stdin); streams.inputStream.unpipe(streams.pcmConverter.stdin);
this.emit('debug', 'Stream kill part 4/5 pass'); this.emit('debug', '- unpiped input stream');
} } else if (streams.inputStream.destroy) {
if (streams.pcmConverter.stdout.destroy) { streams.inputStream.destroy();
streams.pcmConverter.stdout.destroy(); this.emit('debug', '- couldn\'t unpipe input stream, so destroyed input stream');
this.emit('debug', 'Stream kill part 2/5 pass');
}
if (streams.pcmConverter && streams.pcmConverter.kill) {
streams.pcmConverter.kill('SIGINT');
this.emit('debug', 'Stream kill part 3/5 pass');
} }
if (streams.pcmConverter.stdin) { if (streams.pcmConverter.stdin) {
streams.pcmConverter.stdin.end(); streams.pcmConverter.stdin.end();
this.emit('debug', 'Stream kill part 1/5 pass'); this.emit('debug', '- ended input stream to pcm converter');
} }
if (streams.inputStream.destroy) { if (streams.pcmConverter && streams.pcmConverter.kill) {
streams.inputStream.destroy(); streams.pcmConverter.kill('SIGINT');
this.emit('debug', 'Stream kill part 5/5 pass'); this.emit('debug', '- killed the pcm converter');
} }
} catch (err) { } catch (err) {
return err; return err;