From 7f4a3d45222cdb229559f4ddf4a9942d86d23b30 Mon Sep 17 00:00:00 2001 From: Nick Campbell Date: Wed, 28 Sep 2011 01:03:43 -0400 Subject: [PATCH] Fixed up example to work again... Also fixed and updated lib to use startNext instead of just next. Signed-off-by: Nick Campbell --- examples/test.js | 20 +++++++++++++------- lib/queuestream.js | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/examples/test.js b/examples/test.js index bb3ff44..16bc94a 100644 --- a/examples/test.js +++ b/examples/test.js @@ -1,21 +1,27 @@ var Queue = require('../lib/queuestream').QueueStream(), fs = require('fs'); -stream.on('error', function(err) { +Queue.on('error', function(err) { console.log('err: ' + err); }); -stream.on('data', function(data) { - console.log(data.toString()); +Queue.on('data', function(data) { + console.log('listener 1: ' + data.toString()); +}); +Queue.on('data', function(data) { + console.log('listener 2: ' + data.toString()); +}); +Queue.on('data', function(data) { + console.log('listener 3: ' + data.toString()); }); -stream.on('end', function() { +Queue.on('end', function() { console.log('done'); }); var test1 = fs.createReadStream(__dirname + '/files/test1.txt'); -stream.queue(test1); +Queue.queue(test1); var test2 = fs.createReadStream(__dirname + '/files/test2.txt'); -stream.queue(test2); +Queue.queue(test2); -stream.start(); +Queue.startNext(); diff --git a/lib/queuestream.js b/lib/queuestream.js index 276302f..b312d6d 100644 --- a/lib/queuestream.js +++ b/lib/queuestream.js @@ -73,7 +73,7 @@ QueueStream.prototype.start = function() { if (this.current.paused) this.current.resume(); } else if (this.streams.length > 0) { - this.next(); + this.startNext(); } } @@ -117,7 +117,7 @@ QueueStream.prototype.end = function() { // Handle currentStream Events QueueStream.prototype.currentEnd = function() { this.current = null; - this.next(); + this.startNext(); } QueueStream.prototype.currentData = function(data) {