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

voice stuff

Browse Source
This commit is contained in:
Amish Shah
2016-08-25 14:24:06 +01:00
parent 253789f398
commit d6f5df39fc
10 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,10 @@ class VoiceConnectionPlayer extends EventEmitter {
this.opusEncoder = OpusEngines.fetch();
const Engine = ConverterEngines.fetch();
this.converterEngine = new Engine(this);
this.converterEngine.on('error', err => {
this._shutdown();
this.emit('error', err);
});
this.speaking = false;
this.processMap = new Map();
}
@@ -38,25 +42,21 @@ class VoiceConnectionPlayer extends EventEmitter {
if (streams) {
if (streams.inputStream && streams.pcmConverter) {
try {
streams.pcmConverter.on('error', console.log);
streams.pcmConverter.stdin.on('error', console.log);
streams.pcmConverter.stdout.on('error', console.log);
streams.inputStream.stdout.on('error', console.log);
if (streams.inputStream.unpipe) {
streams.inputStream.unpipe(streams.pcmConverter.stdin);
this.emit('debug', 'stream kill part 4/5 pass');
}
if (streams.pcmConverter.stdout.destroy) {
streams.pcmConverter.stdout.destroy();
this.emit('debug', 'stream kill part 2/5 pass');
}
if (streams.pcmConverter.stdin) {
streams.pcmConverter.stdin.end();
this.emit('debug', 'stream kill part 1/5 pass');
}
if (streams.pcmConverter && streams.pcmConverter.kill) {
streams.pcmConverter.kill('SIGINT');
this.emit('debug', 'stream kill part 3/5 pass');
}
if (streams.inputStream.unpipe) {
streams.inputStream.unpipe(streams.pcmConverter.stdin);
this.emit('debug', 'stream kill part 4/5 pass');
if (streams.pcmConverter.stdin) {
streams.pcmConverter.stdin.end();
this.emit('debug', 'stream kill part 1/5 pass');
}
if (streams.inputStream.destroy) {
streams.inputStream.destroy();

1
src/client/voice/player/DefaultPlayer.js
View File

@@ -4,6 +4,7 @@ const fs = require('fs-extra');
class DefaultPlayer extends BasePlayer {
playFile(file) {
this._shutdown();
const fileStream = fs.createReadStream(file).on('error', console.log);
const pcmStream = this.convertStream(fileStream).on('error', console.log);
const dispatcher = this.playPCMStream(pcmStream);