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

fix some stuff

Browse Source
This commit is contained in:
Amish Shah
2016-10-24 20:13:44 +01:00
parent 5749eb6bb0
commit 1a5ce878a1
6 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,9 +26,10 @@ class AudioPlayer extends EventEmitter {
stream.on('end', () => {
console.log(Date.now(), 'real input stream ended');
})
});
stream.on('error', e => this.emit('error', e));
const conversionProcess = this.audioToPCM.createConvertStream(0);
stream.pipe(conversionProcess.process.stdin, { end: false });
conversionProcess.setInput(stream);
return this.playPCMStream(conversionProcess.process.stdout, conversionProcess);
}
@@ -37,12 +38,7 @@ class AudioPlayer extends EventEmitter {
console.log(Date.now(), 'clean up triggered due to', reason);
const filter = checkStream && this.currentDispatcher && this.currentDispatcher.stream === checkStream;
if (this.currentConverter && (checkStream ? filter : true)) {
if (this.currentConverter.process.stdin.destroy) {
this.currentConverter.process.stdin.destroy();
}
if (this.currentConverter.process.kill) {
this.currentConverter.process.kill();
}
this.currentConverter.destroy();
this.currentConverter = null;
}
}
@@ -65,6 +61,7 @@ class AudioPlayer extends EventEmitter {
dispatcher.on('end', () => this.cleanup(dispatcher.stream, 'disp ended'));
dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value));
this.currentDispatcher = dispatcher;
return dispatcher;
}
}