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

hydra have you actually fixed voice whatttt

Browse Source
This commit is contained in:
Amish Shah
2016-10-24 17:10:17 +01:00
parent b24e0b347e
commit c6d0c31c84
2 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/voice/dispatcher/StreamDispatcher.js
View File

@@ -38,7 +38,7 @@ class StreamDispatcher extends EventEmitter {
* aren't recommended, as it means you are using 5x more bandwidth. You _can_ edit this at runtime. * aren't recommended, as it means you are using 5x more bandwidth. You _can_ edit this at runtime.
* @type {number} * @type {number}
*/ */
this.passes = streamOptions.passes || 1; this.passes = streamOptions.passes || 3;
/** /**
* Whether playing is paused * Whether playing is paused

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

@@ -10,30 +10,51 @@ class AudioPlayer extends EventEmitter {
this.voiceConnection = voiceConnection; this.voiceConnection = voiceConnection;
this.audioToPCM = new (PCMConverters.fetch())(); this.audioToPCM = new (PCMConverters.fetch())();
this.opusEncoder = OpusEncoders.fetch(); this.opusEncoder = OpusEncoders.fetch();
this.currentConverter = null;
this.currentDispatcher = null;
this.audioToPCM.on('error', e => this.emit('error', e)); this.audioToPCM.on('error', e => this.emit('error', e));
} this.streamingData = {
playUnknownStream(stream) {
const conversionProcess = this.audioToPCM.createConvertStream(0);
stream.pipe(conversionProcess.process.stdin, { end: false });
return this.playPCMStream(conversionProcess.process.stdout);
}
playPCMStream(stream) {
stream.on('error', e => this.emit('error', e));
const dispatcher = new StreamDispatcher(this, stream, {
channels: 2, channels: 2,
count: 0, count: 0,
sequence: 0, sequence: 0,
timestamp: 0, timestamp: 0,
pausedTime: 0, pausedTime: 0,
}, { };
}
playUnknownStream(stream) {
const conversionProcess = this.audioToPCM.createConvertStream(0);
stream.pipe(conversionProcess.process.stdin, { end: false });
return this.playPCMStream(conversionProcess.process.stdout, conversionProcess);
}
cleanup(checkStream) {
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 = null;
}
}
playPCMStream(stream, converter) {
this.cleanup();
this.currentConverter = converter;
if (this.currentDispatcher) {
this.streamingData = this.currentDispatcher.streamingData;
}
stream.on('error', e => this.emit('error', e));
const dispatcher = new StreamDispatcher(this, stream, this.streamingData, {
volume: 1, volume: 1,
}); });
dispatcher.on('error', e => console.log('error', e)); dispatcher.on('error', e => this.emit('error', e));
dispatcher.on('end', e => console.log('end', e)); dispatcher.on('end', () => this.cleanup(dispatcher.stream));
dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value)); dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value));
this.currentDispatcher = dispatcher;
} }
} }