From 00ff2f71a44e6fec1e70c3a688efa36d076e287e Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Thu, 19 May 2016 08:49:19 -0700 Subject: [PATCH] Build the playArbitraryFFmpeg fix --- lib/Voice/AudioEncoder.js | 4 ++-- lib/Voice/VoiceConnection.js | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Voice/AudioEncoder.js b/lib/Voice/AudioEncoder.js index 1c28fc99e..a757b5b98 100644 --- a/lib/Voice/AudioEncoder.js +++ b/lib/Voice/AudioEncoder.js @@ -160,11 +160,11 @@ var AudioEncoder = (function () { }); }; - AudioEncoder.prototype.encodeArbitraryFFmpeg = function encodeArbitraryFFmpeg(ffmpegOptions) { + AudioEncoder.prototype.encodeArbitraryFFmpeg = function encodeArbitraryFFmpeg(ffmpegOptions, volume) { var _this3 = this; return new Promise(function (resolve, reject) { - _this3.volume = new _VolumeTransformer2["default"](1); + _this3.volume = new _VolumeTransformer2["default"](volume); // add options discord.js needs var options = ffmpegOptions.concat(['-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1']); diff --git a/lib/Voice/VoiceConnection.js b/lib/Voice/VoiceConnection.js index b5557b109..4607abb4b 100644 --- a/lib/Voice/VoiceConnection.js +++ b/lib/Voice/VoiceConnection.js @@ -318,23 +318,23 @@ var VoiceConnection = (function (_EventEmitter) { }); }; - VoiceConnection.prototype.playArbitraryFFmpeg = function playArbitraryFFmpeg(ffmpegOptions) { + VoiceConnection.prototype.playArbitraryFFmpeg = function playArbitraryFFmpeg(ffmpegOptions, volume) { var _this3 = this; - var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1]; + var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, str) {} : arguments[2]; var self = this; self.stopPlaying(); - if (typeof options === "function") { - // options is the callback - callback = options; + if (typeof volume === "function") { + // volume is the callback + callback = volume; } - if (typeof options !== "object") { - options = {}; + if (!ffmpegOptions instanceof Array) { + ffmpegOptions = []; } - options.volume = options.volume !== undefined ? options.volume : this.getVolume(); + var volume = volume !== undefined ? volume : this.getVolume(); return new Promise(function (resolve, reject) { - _this3.encoder.encodeArbitraryFFmpeg(ffmpegOptions)["catch"](error).then(function (data) { + _this3.encoder.encodeArbitraryFFmpeg(ffmpegOptions, volume)["catch"](error).then(function (data) { self.streamProc = data.proc; self.instream = data.instream; var intent = self.playStream(data.stream);