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

Build the playArbitraryFFmpeg fix

Browse Source
This commit is contained in:
abalabahaha
2016-05-19 08:49:19 -07:00
parent e1808804c9
commit 00ff2f71a4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Voice/AudioEncoder.js
View File

@@ -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']);

18
lib/Voice/VoiceConnection.js
View File

@@ -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);