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

Attempt to process volume option

Browse Source
This commit is contained in:
abalabahaha
2016-03-12 21:27:48 -08:00
parent 13e8a39f9f
commit 25f25f5506
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Voice/VoiceConnection.js
View File

@@ -254,6 +254,9 @@ var VoiceConnection = (function (_EventEmitter) {
callback = options;
options = {};
}
if (options.volume != null) {
this.setVolume(options.volume);
}
return new Promise(function (resolve, reject) {
_this.encoder.encodeFile(stream, options)["catch"](error).then(function (data) {
self.streamProc = data.proc;
@@ -283,6 +286,9 @@ var VoiceConnection = (function (_EventEmitter) {
callback = options;
options = {};
}
if (options.volume != null) {
this.setVolume(options.volume);
}
return new Promise(function (resolve, reject) {
_this2.encoder.encodeStream(stream, options)["catch"](error).then(function (data) {
self.streamProc = data.proc;
@@ -312,6 +318,9 @@ var VoiceConnection = (function (_EventEmitter) {
callback = options;
options = {};
}
if (options.volume != null) {
this.setVolume(options.volume);
}
return new Promise(function (resolve, reject) {
_this3.encoder.encodeArbitraryFFmpeg(ffmpegOptions)["catch"](error).then(function (data) {
self.streamProc = data.proc;

10
src/Voice/VoiceConnection.js
View File

@@ -217,6 +217,9 @@ export default class VoiceConnection extends EventEmitter {
callback = options;
options = {};
}
if (options.volume != null) {
this.setVolume(options.volume);
}
return new Promise((resolve, reject) => {
this.encoder
.encodeFile(stream, options)
@@ -243,6 +246,9 @@ export default class VoiceConnection extends EventEmitter {
callback = options;
options = {};
}
if (options.volume != null) {
this.setVolume(options.volume);
}
return new Promise((resolve, reject) => {
this.encoder
.encodeStream(stream, options)
@@ -270,6 +276,9 @@ export default class VoiceConnection extends EventEmitter {
callback = options;
options = {};
}
if (options.volume != null) {
this.setVolume(options.volume);
}
return new Promise((resolve, reject) => {
this.encoder
.encodeArbitraryFFmpeg(ffmpegOptions)
@@ -280,7 +289,6 @@ export default class VoiceConnection extends EventEmitter {
var intent = self.playStream(data.stream);
resolve(intent);
callback(null, intent);
});
function error(e = true) {
reject(e);