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

Fix redeclaration

Browse Source
This commit is contained in:
abalabahaha
2016-10-02 13:11:26 +09:00
parent 015eb9c546
commit 972558f030
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Voice/AudioEncoder.js
View File

@@ -136,7 +136,7 @@ var AudioEncoder = (function () {
if (!command) return reject(new Error('FFMPEG not found. Make sure it is installed and in path.')); if (!command) return reject(new Error('FFMPEG not found. Make sure it is installed and in path.'));
// add options discord.js needs // add options discord.js needs
var ffmpegOptions = ffmpegOptions.concat(['-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1']); ffmpegOptions = ffmpegOptions.concat(['-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1']);
var enc = _child_process2["default"].spawn(command, ffmpegOptions); var enc = _child_process2["default"].spawn(command, ffmpegOptions);
_this3.hookEncodingProcess(resolve, reject, enc); _this3.hookEncodingProcess(resolve, reject, enc);

12
lib/Voice/VoiceConnection.js
View File

@@ -276,12 +276,12 @@ var VoiceConnection = (function (_EventEmitter) {
} }
options.volume = options.volume !== undefined ? options.volume : this.getVolume(); options.volume = options.volume !== undefined ? options.volume : this.getVolume();
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
_this.encoder.encodeFile(stream, options)["catch"](error).then(function (data) { _this.encoder.encodeFile(stream, options).then(function (data) {
self.streamProc = data.proc; self.streamProc = data.proc;
var intent = self.playStream(data.stream, 2); var intent = self.playStream(data.stream, 2);
resolve(intent); resolve(intent);
callback(null, intent); callback(null, intent);
}); })["catch"](error);
function error() { function error() {
var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0]; var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
@@ -308,13 +308,13 @@ var VoiceConnection = (function (_EventEmitter) {
} }
options.volume = options.volume !== undefined ? options.volume : this.getVolume(); options.volume = options.volume !== undefined ? options.volume : this.getVolume();
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
_this2.encoder.encodeStream(stream, options)["catch"](error).then(function (data) { _this2.encoder.encodeStream(stream, options).then(function (data) {
self.streamProc = data.proc; self.streamProc = data.proc;
self.instream = data.instream; self.instream = data.instream;
var intent = self.playStream(data.stream); var intent = self.playStream(data.stream);
resolve(intent); resolve(intent);
callback(null, intent); callback(null, intent);
}); })["catch"](error);
function error() { function error() {
var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0]; var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
@@ -343,13 +343,13 @@ var VoiceConnection = (function (_EventEmitter) {
} }
options.volume = options.volume !== undefined ? options.volume : this.getVolume(); options.volume = options.volume !== undefined ? options.volume : this.getVolume();
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
_this3.encoder.encodeArbitraryFFmpeg(ffmpegOptions, options)["catch"](error).then(function (data) { _this3.encoder.encodeArbitraryFFmpeg(ffmpegOptions, options).then(function (data) {
self.streamProc = data.proc; self.streamProc = data.proc;
self.instream = data.instream; self.instream = data.instream;
var intent = self.playStream(data.stream); var intent = self.playStream(data.stream);
resolve(intent); resolve(intent);
callback(null, intent); callback(null, intent);
}); })["catch"](error);
function error() { function error() {
var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0]; var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];

2
src/Voice/AudioEncoder.js
View File

@@ -117,7 +117,7 @@ export default class AudioEncoder {
if (!command) return reject(new Error('FFMPEG not found. Make sure it is installed and in path.')); if (!command) return reject(new Error('FFMPEG not found. Make sure it is installed and in path.'));
// add options discord.js needs // add options discord.js needs
var ffmpegOptions = ffmpegOptions.concat([ ffmpegOptions = ffmpegOptions.concat([
'-f', 's16le', '-f', 's16le',
'-ar', '48000', '-ar', '48000',
'-ac', 2, '-ac', 2,

13
src/Voice/VoiceConnection.js
View File

@@ -238,14 +238,14 @@ export default class VoiceConnection extends EventEmitter {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.encoder this.encoder
.encodeFile(stream, options) .encodeFile(stream, options)
.catch(error)
.then(data => { .then(data => {
self.streamProc = data.proc; self.streamProc = data.proc;
var intent = self.playStream(data.stream, 2); var intent = self.playStream(data.stream, 2);
resolve(intent); resolve(intent);
callback(null, intent); callback(null, intent);
}); })
.catch(error);
function error(e = true) { function error(e = true) {
reject(e); reject(e);
callback(e); callback(e);
@@ -267,15 +267,14 @@ export default class VoiceConnection extends EventEmitter {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.encoder this.encoder
.encodeStream(stream, options) .encodeStream(stream, options)
.catch(error)
.then(data => { .then(data => {
self.streamProc = data.proc; self.streamProc = data.proc;
self.instream = data.instream; self.instream = data.instream;
var intent = self.playStream(data.stream); var intent = self.playStream(data.stream);
resolve(intent); resolve(intent);
callback(null, intent); callback(null, intent);
})
}); .catch(error);
function error(e = true) { function error(e = true) {
reject(e); reject(e);
callback(e); callback(e);
@@ -300,14 +299,14 @@ export default class VoiceConnection extends EventEmitter {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.encoder this.encoder
.encodeArbitraryFFmpeg(ffmpegOptions, options) .encodeArbitraryFFmpeg(ffmpegOptions, options)
.catch(error)
.then(data => { .then(data => {
self.streamProc = data.proc; self.streamProc = data.proc;
self.instream = data.instream; self.instream = data.instream;
var intent = self.playStream(data.stream); var intent = self.playStream(data.stream);
resolve(intent); resolve(intent);
callback(null, intent); callback(null, intent);
}); })
.catch(error);
function error(e = true) { function error(e = true) {
reject(e); reject(e);
callback(e); callback(e);