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 Buffer deprecation stuff

Browse Source
This commit is contained in:
Amish Shah
2017-01-07 22:30:20 +00:00
parent 9f8289e433
commit 3b1264ad6d
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/voice/VoiceBroadcast.js
View File

@@ -55,11 +55,10 @@ class VoiceBroadcast extends EventEmitter {
return d; return d;
} }
applyVolume(buffer, volume) { applyVolume(buffer, volume = this._volume) {
volume = volume || this._volume;
if (volume === 1) return buffer; if (volume === 1) return buffer;
const out = new Buffer(buffer.length); const out = Buffer.alloc(buffer.length);
for (let i = 0; i < buffer.length; i += 2) { for (let i = 0; i < buffer.length; i += 2) {
if (i >= buffer.length - 1) break; if (i >= buffer.length - 1) break;
const uint = Math.min(32767, Math.max(-32767, Math.floor(volume * buffer.readInt16LE(i)))); const uint = Math.min(32767, Math.max(-32767, Math.floor(volume * buffer.readInt16LE(i))));
@@ -319,7 +318,7 @@ class VoiceBroadcast extends EventEmitter {
this._missed = 0; this._missed = 0;
if (buffer.length !== bufferLength) { if (buffer.length !== bufferLength) {
const newBuffer = new Buffer(bufferLength).fill(0); const newBuffer = Buffer.alloc(bufferLength).fill(0);
buffer.copy(newBuffer); buffer.copy(newBuffer);
buffer = newBuffer; buffer = newBuffer;
} }

4
src/client/voice/VoiceUDPClient.js
View File

@@ -124,7 +124,7 @@ class VoiceConnectionUDPClient extends EventEmitter {
}); });
}); });
const blankMessage = new Buffer(70); const blankMessage = Buffer.alloc(70);
blankMessage.writeUIntBE(this.voiceConnection.authentication.ssrc, 0, 4); blankMessage.writeUIntBE(this.voiceConnection.authentication.ssrc, 0, 4);
this.send(blankMessage); this.send(blankMessage);
} }
@@ -132,7 +132,7 @@ class VoiceConnectionUDPClient extends EventEmitter {
function parseLocalPacket(message) { function parseLocalPacket(message) {
try { try {
const packet = new Buffer(message); const packet = Buffer.from(message);
let address = ''; let address = '';
for (let i = 4; i < packet.indexOf(0, i); i++) address += String.fromCharCode(packet[i]); for (let i = 4; i < packet.indexOf(0, i); i++) address += String.fromCharCode(packet[i]);
const port = parseInt(packet.readUIntLE(packet.length - 2, 2).toString(10), 10); const port = parseInt(packet.readUIntLE(packet.length - 2, 2).toString(10), 10);

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

@@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter;
const NaCl = require('tweetnacl'); const NaCl = require('tweetnacl');
const VoiceBroadcast = require('../VoiceBroadcast'); const VoiceBroadcast = require('../VoiceBroadcast');
const nonce = new Buffer(24); const nonce = Buffer.alloc(24);
nonce.fill(0); nonce.fill(0);
/** /**
@@ -180,7 +180,7 @@ class StreamDispatcher extends EventEmitter {
} }
createPacket(sequence, timestamp, buffer) { createPacket(sequence, timestamp, buffer) {
const packetBuffer = new Buffer(buffer.length + 28); const packetBuffer = Buffer.alloc(buffer.length + 28);
packetBuffer.fill(0); packetBuffer.fill(0);
packetBuffer[0] = 0x80; packetBuffer[0] = 0x80;
packetBuffer[1] = 0x78; packetBuffer[1] = 0x78;
@@ -199,7 +199,7 @@ class StreamDispatcher extends EventEmitter {
applyVolume(buffer) { applyVolume(buffer) {
if (this.volume === 1) return buffer; if (this.volume === 1) return buffer;
const out = new Buffer(buffer.length); const out = Buffer.alloc(buffer.length);
for (let i = 0; i < buffer.length; i += 2) { for (let i = 0; i < buffer.length; i += 2) {
if (i >= buffer.length - 1) break; if (i >= buffer.length - 1) break;
const uint = Math.min(32767, Math.max(-32767, Math.floor(this.volume * buffer.readInt16LE(i)))); const uint = Math.min(32767, Math.max(-32767, Math.floor(this.volume * buffer.readInt16LE(i))));
@@ -269,7 +269,7 @@ class StreamDispatcher extends EventEmitter {
data.missed = 0; data.missed = 0;
if (buffer.length !== bufferLength) { if (buffer.length !== bufferLength) {
const newBuffer = new Buffer(bufferLength).fill(0); const newBuffer = Buffer.alloc(bufferLength).fill(0);
buffer.copy(newBuffer); buffer.copy(newBuffer);
buffer = newBuffer; buffer = newBuffer;
} }

4
src/client/voice/receiver/VoiceReceiver.js
View File

@@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter;
const NaCl = require('tweetnacl'); const NaCl = require('tweetnacl');
const Readable = require('./VoiceReadable'); const Readable = require('./VoiceReadable');
const nonce = new Buffer(24); const nonce = Buffer.alloc(24);
nonce.fill(0); nonce.fill(0);
/** /**
@@ -127,7 +127,7 @@ class VoiceReceiver extends EventEmitter {
this.emit('warn', 'Failed to decrypt voice packet'); this.emit('warn', 'Failed to decrypt voice packet');
return; return;
} }
data = new Buffer(data); data = Buffer.from(data);
if (this.opusStreams.get(user.id)) this.opusStreams.get(user.id)._push(data); if (this.opusStreams.get(user.id)) this.opusStreams.get(user.id)._push(data);
/** /**
* Emitted whenever voice data is received from the voice connection. This is _always_ emitted (unlike PCM). * Emitted whenever voice data is received from the voice connection. This is _always_ emitted (unlike PCM).