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

Merge pull request #94 from qeled/indev

Browse Source 
Voice fixes
This commit is contained in:
Amish Shah
2015-12-11 17:34:08 +00:00
parent 925280c3e3 a411968843
commit 72688e1a6a
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Voice/AudioEncoder.js
View File

@@ -67,7 +67,7 @@ var AudioEncoder = (function () {
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var enc = _child_process2["default"].spawn(self.getCommand(), ['-i', "-", '-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1']); var enc = _child_process2["default"].spawn(self.getCommand(), ['-loglevel', '0', '-i', '-', '-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1'], { stdio: ['pipe', 'pipe', 'ignore'] });
stream.pipe(enc.stdin); stream.pipe(enc.stdin);

12
lib/Voice/VoiceConnection.js
View File

@@ -56,7 +56,7 @@ var VoiceConnection = (function (_EventEmitter) {
this.session = session; this.session = session;
this.token = token; this.token = token;
this.server = server; this.server = server;
this.endpoint = endpoint.replace(":80", ""); this.endpoint = endpoint.split(":")[0];
this.vWS = null; // vWS means voice websocket this.vWS = null; // vWS means voice websocket
this.ready = false; this.ready = false;
this.vWSData = {}; this.vWSData = {};
@@ -67,6 +67,8 @@ var VoiceConnection = (function (_EventEmitter) {
this.streamTime = 0; this.streamTime = 0;
this.streamProc = null; this.streamProc = null;
this.KAI = null; this.KAI = null;
this.timestamp = 0;
this.sequence = 0;
this.init(); this.init();
} }
@@ -108,8 +110,6 @@ var VoiceConnection = (function (_EventEmitter) {
var self = this; var self = this;
var startTime = Date.now(); var startTime = Date.now();
var sequence = 0;
var time = 0;
var count = 0; var count = 0;
var length = 20; var length = 20;
@@ -153,10 +153,10 @@ var VoiceConnection = (function (_EventEmitter) {
} }
count++; count++;
sequence + 10 < 65535 ? sequence += 1 : sequence = 0; self.sequence + 1 < 65535 ? self.sequence += 1 : self.sequence = 0;
time + 9600 < 4294967295 ? time += 960 : time = 0; self.timestamp + 960 < 4294967295 ? self.timestamp += 960 : self.timestamp = 0;
self.sendBuffer(buffer, sequence, time, function (e) {}); self.sendBuffer(buffer, self.sequence, self.timestamp, function (e) {});
var nextTime = startTime + count * length; var nextTime = startTime + count * length;

5
src/Voice/AudioEncoder.js
View File

@@ -45,12 +45,13 @@ export default class AudioEncoder {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand(), [ var enc = cpoc.spawn(self.getCommand(), [
'-i', "-", '-loglevel', '0',
'-i', '-',
'-f', 's16le', '-f', 's16le',
'-ar', '48000', '-ar', '48000',
'-ac', 2, '-ac', 2,
'pipe:1' 'pipe:1'
]); ], {stdio: ['pipe', 'pipe', 'ignore']});
stream.pipe(enc.stdin); stream.pipe(enc.stdin);

12
src/Voice/VoiceConnection.js
View File

@@ -24,7 +24,7 @@ export default class VoiceConnection extends EventEmitter {
this.session = session; this.session = session;
this.token = token; this.token = token;
this.server = server; this.server = server;
this.endpoint = endpoint.replace(":80", ""); this.endpoint = endpoint.split(":")[0];
this.vWS = null; // vWS means voice websocket this.vWS = null; // vWS means voice websocket
this.ready = false; this.ready = false;
this.vWSData = {}; this.vWSData = {};
@@ -35,6 +35,8 @@ export default class VoiceConnection extends EventEmitter {
this.streamTime = 0; this.streamTime = 0;
this.streamProc = null; this.streamProc = null;
this.KAI = null; this.KAI = null;
this.timestamp = 0;
this.sequence = 0;
this.init(); this.init();
} }
@@ -78,8 +80,6 @@ export default class VoiceConnection extends EventEmitter {
var self = this; var self = this;
var startTime = Date.now(); var startTime = Date.now();
var sequence = 0;
var time = 0;
var count = 0; var count = 0;
var length = 20; var length = 20;
@@ -123,10 +123,10 @@ export default class VoiceConnection extends EventEmitter {
} }
count++; count++;
sequence + 10 < 65535 ? sequence += 1 : sequence = 0; self.sequence + 1 < 65535 ? self.sequence += 1 : self.sequence = 0;
time + 9600 < 4294967295 ? time += 960 : time = 0; self.timestamp + 960 < 4294967295 ? self.timestamp += 960 : self.timestamp = 0;
self.sendBuffer(buffer, sequence, time, (e) => { }); self.sendBuffer(buffer, self.sequence, self.timestamp, (e) => { });
var nextTime = startTime + (count * length); var nextTime = startTime + (count * length);