Merge branch 'master' into indev

This commit is contained in:
Schuyler Cebulskie
2016-09-20 23:02:56 -04:00

View File

@@ -257,7 +257,7 @@ class VoiceConnection extends EventEmitter {
*/ */
playConvertedStream(stream, { seek = 0, volume = 1, passes = 1 } = {}) { playConvertedStream(stream, { seek = 0, volume = 1, passes = 1 } = {}) {
const options = { seek, volume, passes }; const options = { seek, volume, passes };
this._shutdown(); this.player._shutdown();
const dispatcher = this.player.playPCMStream(stream, options); const dispatcher = this.player.playPCMStream(stream, options);
return dispatcher; return dispatcher;
} }