Pass settings through to base, and pass in source

3 files changed, 8 insertions, 10 deletions

diff --git a/index.js b/index.js
index 8596c98..670513d 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,5 @@
 /* File Streamer from multiple source protocols */
 
-  , request = require('request');
-
 module.exports = {
 	getStreamer: function(uri) {
 
diff --git a/streamers/http.js b/streamers/http.js
index 7ee5863..331cc37 100644
--- a/streamers/http.js
+++ b/streamers/http.js
@@ -4,18 +4,18 @@ var inherits = require('util').inherits
 var Streamer = require('./base');
 
 /* -- HTTP Streamer -- */
-function HttpStreamer(options) {
+function HttpStreamer(source, options) {
 	if(!(this instanceof HttpStreamer)) 
-		return new HttpStreamer(options);
+		return new HttpStreamer(source, options);
 
-	Streamer.call(this);
+	Streamer.call(this, options);
 	var self = this;
 
 	this.request = request.defaults({
 		encoding: null
 	});
 
-	var req = this.request('http://slurm.trakt.us/images/fanart/1395.78.jpg');
+	var req = this.request(source);
 	req.on('response', function(res) {
 		var length = req.getHeader('content-length', res.headers);
 		if(length !== undefined)
diff --git a/streamers/youtube.js b/streamers/youtube.js
index 6e2bbc1..f45f1bd 100644
--- a/streamers/youtube.js
+++ b/streamers/youtube.js
@@ -4,14 +4,14 @@ var inherits = require('util').inherits
 var Streamer = require('./base');
 
 /* -- YouTube Streamer -- */
-function YoutubeStreamer(options) {
+function YoutubeStreamer(source, options) {
 	if(!(this instanceof YoutubeStreamer)) 
-		return new YoutubeStreamer(options);
-	
+		return new YoutubeStreamer(source, options);
+
 	Streamer.call(this, options);
 	var self = this;
 
-	var vid = ytdl('https://youtube.com/watch?v=3T2kChOed70');
+	var vid = ytdl(source);
 	vid.on('info', function(info, format) {
 		self._progress.setLength(format.size);
 	})