From 930f27682850b158281be0ea397cdb1f9f1d6521 Mon Sep 17 00:00:00 2001
From: abalabahaha <hi@abal.moe>
Date: Sat, 12 Mar 2016 22:06:30 -0800
Subject: [PATCH] Aaron copied horrible code from elsewhere

---
 lib/Voice/AudioEncoder.js    | 4 ++--
 lib/Voice/VoiceConnection.js | 7 ++++++-
 src/Voice/AudioEncoder.js    | 4 ++--
 src/Voice/VoiceConnection.js | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/Voice/AudioEncoder.js b/lib/Voice/AudioEncoder.js
index 518cec65c..0c69f12dc 100644
--- a/lib/Voice/AudioEncoder.js
+++ b/lib/Voice/AudioEncoder.js
@@ -85,7 +85,7 @@ var AudioEncoder = (function () {
 		var _this = this;
 
 		return new Promise(function (resolve, reject) {
-			_this.volume = new _VolumeTransformer2["default"](options.volume || 1);
+			_this.volume = new _VolumeTransformer2["default"](options.volume);
 
 			var enc = _child_process2["default"].spawn(_this.getCommand(), ['-hide_banner', '-i', '-', '-f', 's16le', '-ar', '48000', '-ss', options.seek || 0, '-ac', 2, 'pipe:1']);
 
@@ -126,7 +126,7 @@ var AudioEncoder = (function () {
 		var _this2 = this;
 
 		return new Promise(function (resolve, reject) {
-			_this2.volume = new _VolumeTransformer2["default"](options.volume || 1);
+			_this2.volume = new _VolumeTransformer2["default"](options.volume);
 
 			var enc = _child_process2["default"].spawn(_this2.getCommand(), ['-hide_banner', '-i', file, '-f', 's16le', '-ar', '48000', '-ss', options.seek || 0, '-ac', 2, 'pipe:1']);
 
diff --git a/lib/Voice/VoiceConnection.js b/lib/Voice/VoiceConnection.js
index b4aa1305b..bed9bdc33 100644
--- a/lib/Voice/VoiceConnection.js
+++ b/lib/Voice/VoiceConnection.js
@@ -35,6 +35,10 @@ var _VoicePacket = require("./VoicePacket");
 
 var _VoicePacket2 = _interopRequireDefault(_VoicePacket);
 
+var _VolumeTransformer = require("./VolumeTransformer");
+
+var _VolumeTransformer2 = _interopRequireDefault(_VolumeTransformer);
+
 var _StreamIntent = require("./StreamIntent");
 
 var _StreamIntent2 = _interopRequireDefault(_StreamIntent);
@@ -73,6 +77,7 @@ var VoiceConnection = (function (_EventEmitter) {
 		this.KAI = null;
 		this.timestamp = 0;
 		this.sequence = 0;
+		this.volume = new _VolumeTransformer2["default"]();
 		this.init();
 	}
 
@@ -142,8 +147,8 @@ var VoiceConnection = (function (_EventEmitter) {
 
 				if (!buffer) {
 					if (onWarning) {
-						retStream.emit("end");
 						self.setSpeaking(false);
+						retStream.emit("end");
 						return;
 					} else {
 						onWarning = true;
diff --git a/src/Voice/AudioEncoder.js b/src/Voice/AudioEncoder.js
index d39550cde..370061cb0 100644
--- a/src/Voice/AudioEncoder.js
+++ b/src/Voice/AudioEncoder.js
@@ -60,7 +60,7 @@ export default class AudioEncoder {
 
 	encodeStream(stream, options) {
 		return new Promise((resolve, reject) => {
-			this.volume = new VolumeTransformer(options.volume || 1);
+			this.volume = new VolumeTransformer(options.volume);
 
 			var enc = cpoc.spawn(this.getCommand(), [
 				'-hide_banner',
@@ -107,7 +107,7 @@ export default class AudioEncoder {
 
 	encodeFile(file, options) {
 		return new Promise((resolve, reject) => {
-			this.volume = new VolumeTransformer(options.volume || 1);
+			this.volume = new VolumeTransformer(options.volume);
 
 			var enc = cpoc.spawn(this.getCommand(), [
 				'-hide_banner',
diff --git a/src/Voice/VoiceConnection.js b/src/Voice/VoiceConnection.js
index 6567b7922..cdff9d465 100644
--- a/src/Voice/VoiceConnection.js
+++ b/src/Voice/VoiceConnection.js
@@ -12,6 +12,7 @@ import dns from "dns";
 import udp from "dgram";
 import AudioEncoder from "./AudioEncoder";
 import VoicePacket from "./VoicePacket";
+import VolumeTransformer from "./VolumeTransformer";
 import StreamIntent from "./StreamIntent";
 import EventEmitter from "events";
 import unpipe from "unpipe";
@@ -38,6 +39,7 @@ export default class VoiceConnection extends EventEmitter {
 		this.KAI = null;
 		this.timestamp = 0;
 		this.sequence = 0;
+		this.volume = new VolumeTransformer();
 		this.init();
 	}
 
@@ -107,8 +109,8 @@ export default class VoiceConnection extends EventEmitter {
 
 				if (!buffer) {
 					if (onWarning) {
-						retStream.emit("end");
 						self.setSpeaking(false);
+						retStream.emit("end");
 						return;
 					} else {
 						onWarning = true;