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

Fixed multiple ffmpeg/avconv processes being alive

Browse Source
This commit is contained in:
Amish Shah
2015-12-12 18:04:48 +00:00
parent d66b765933
commit 4d43867206
4 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Voice/AudioEncoder.js
View File

@@ -93,8 +93,6 @@ var AudioEncoder = (function () {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var enc = _child_process2["default"].spawn(self.getCommand(), ['-loglevel', '0', '-i', file, '-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1', '-af', '"volume=' + (options.volume || 1) + '"'], { stdio: ['pipe', 'pipe', 'ignore'] }); var enc = _child_process2["default"].spawn(self.getCommand(), ['-loglevel', '0', '-i', file, '-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1', '-af', '"volume=' + (options.volume || 1) + '"'], { stdio: ['pipe', 'pipe', 'ignore'] });
console.log(['-loglevel', '0', '-i', file, '-f', 's16le', '-ar', '48000', '-af', '"volume=' + (options.volume || 1) + '"', '-ac', 2, 'pipe:1'].join(" "));
enc.stdout.once("readable", function () { enc.stdout.once("readable", function () {
resolve({ resolve({
proc: enc, proc: enc,

13
lib/Voice/VoiceConnection.js
View File

@@ -91,6 +91,9 @@ var VoiceConnection = (function (_EventEmitter) {
VoiceConnection.prototype.stopPlaying = function stopPlaying() { VoiceConnection.prototype.stopPlaying = function stopPlaying() {
this.playing = false; this.playing = false;
this.playingIntent = null; this.playingIntent = null;
if (this.streamProc) {
this.streamProc.kill();
}
if (this.instream) { if (this.instream) {
//not all streams implement these... //not all streams implement these...
//and even file stream don't seem to implement them properly... //and even file stream don't seem to implement them properly...
@@ -222,14 +225,6 @@ var VoiceConnection = (function (_EventEmitter) {
} }
}; };
VoiceConnection.prototype.test = function test() {
this.playFile("C:/users/amish/desktop/audio.mp3").then(function (stream) {
stream.on("time", function (time) {
console.log("Time", time);
});
});
};
VoiceConnection.prototype.playFile = function playFile(stream) { VoiceConnection.prototype.playFile = function playFile(stream) {
var _this = this; var _this = this;
@@ -237,6 +232,7 @@ var VoiceConnection = (function (_EventEmitter) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, str) {} : arguments[2]; var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, str) {} : arguments[2];
var self = this; var self = this;
self.stopPlaying();
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
@@ -265,6 +261,7 @@ var VoiceConnection = (function (_EventEmitter) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, str) {} : arguments[2]; var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, str) {} : arguments[2];
var self = this; var self = this;
self.stopPlaying();
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;

10
src/Voice/AudioEncoder.js
View File

@@ -88,16 +88,6 @@ export default class AudioEncoder {
'-af', '"volume=' + (options.volume || 1)+'"' '-af', '"volume=' + (options.volume || 1)+'"'
], { stdio: ['pipe', 'pipe', 'ignore'] }); ], { stdio: ['pipe', 'pipe', 'ignore'] });
console.log([
'-loglevel', '0',
'-i', file,
'-f', 's16le',
'-ar', '48000',
'-af', '"volume=' + (options.volume || 1) + '"',
'-ac', 2,
'pipe:1',
].join(" "));
enc.stdout.once("readable", function () { enc.stdout.once("readable", function () {
resolve({ resolve({
proc: enc, proc: enc,

14
src/Voice/VoiceConnection.js
View File

@@ -62,6 +62,9 @@ export default class VoiceConnection extends EventEmitter {
stopPlaying() { stopPlaying() {
this.playing = false; this.playing = false;
this.playingIntent = null; this.playingIntent = null;
if (this.streamProc) {
this.streamProc.kill();
}
if(this.instream){ if(this.instream){
//not all streams implement these... //not all streams implement these...
//and even file stream don't seem to implement them properly... //and even file stream don't seem to implement them properly...
@@ -196,17 +199,9 @@ export default class VoiceConnection extends EventEmitter {
} }
} }
test() {
this.playFile("C:/users/amish/desktop/audio.mp3")
.then(stream => {
stream.on("time", time => {
console.log("Time", time);
})
})
}
playFile(stream, options=false, callback = function (err, str) { }) { playFile(stream, options=false, callback = function (err, str) { }) {
var self = this; var self = this;
self.stopPlaying();
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;
@@ -232,6 +227,7 @@ export default class VoiceConnection extends EventEmitter {
playRawStream(stream, options=false, callback = function (err, str) { }) { playRawStream(stream, options=false, callback = function (err, str) { }) {
var self = this; var self = this;
self.stopPlaying();
if (typeof options === "function") { if (typeof options === "function") {
// options is the callback // options is the callback
callback = options; callback = options;