tone-stream 1.10.0 → 1.11.1

package/README.md

@@ -28,23 +28,32 @@ const { ToneStream } = require('tone-stream')
 
 const Speaker = require('speaker')
 
+const sampleRate = 8000
+
 const format = {
-	sampleRate: 8000, 
-	bitDepth: 16,
-	channels: 1
+  sampleRate,
+  bitDepth: 16,
+  channels: 1
 }
 
 const ts = new ToneStream(format)
 
 const s = new Speaker(format)
 
-ts.add([1000, 261.63]) // C4
-ts.add([1000, 296.33]) // D4
-ts.add([1000, 329.63]) // E4
+var ns = 0
+ns += ts.add([1000, 261.63]) // C4
+ns += ts.add([1000, 296.33]) // D4
+ns += ts.add([1000, 329.63]) // E4
+
+var duration = ns / sampleRate * 1000
 
 ts.pipe(s)
 
-setTimeout(() => {}, 2000)
+setTimeout(() => {
+  console.log("done")
+  process.exit(0)
+}, duration)
+
 ```
 
 Playing some DTMF tones:
@@ -54,25 +63,36 @@ const { ToneStream } = require('tone-stream')
 
 const Speaker = require('speaker')
 
+const sampleRate = 8000
+
 const format = {
-	sampleRate: 8000, 
-	bitDepth: 16,
-	channels: 1
+  sampleRate,
+  bitDepth: 16,
+  channels: 1
 }
 
 const ts = new ToneStream(format)
 
 const s = new Speaker(format)
 
-ts.add([1000, 'DTMF:1'])
-ts.add([500, 's'])
-ts.add([1000, 'DTMF:2'])
-ts.add([500, 's'])
-ts.add([1000, 'DTMF:3'])
+var ns = 0
+
+ns += ts.add([1000, 'DTMF:1'])
+ns += ts.add([500, 's'])
+ns += ts.add([1000, 'DTMF:2'])
+ns += ts.add([500, 's'])
+ns += ts.add([1000, 'DTMF:3'])
+ns += ts.add([500, 's'])
+
+var duration = ns / sampleRate * 1000
 
 ts.pipe(s)
 
-setTimeout(() => {}, 2000)
+setTimeout(() => {
+  console.log("done")
+  process.exit(0)
+}, duration)
+
 ```
 
 Using some helper function to add miscelaneous tones
@@ -120,7 +140,7 @@ ts.pipe(s)
 ```
 ## Events
 
-The stream emits:
+The stream emits events:
   - 'empty': when there are no more tones to be played in the queue (it happens when the queue of tones is found empty)
   - 'ended': when all tones in the queue were generated (it happens when the consumer tries to read data from the stream and there are no more tones to be generated)
 

package/index.js

@@ -7,7 +7,7 @@ const DTMF = require("./lib/dtmf");
 const EventEmitter = require('events');
 
 class ToneStream extends Readable {
-  constructor(format, opts) {
+  constructor(format) {
     super();
 
     if (format) {
@@ -21,8 +21,6 @@ class ToneStream extends Readable {
       this.channels = 1;
     }
 
-    this.opts = opts;
-
     this.amplitude = 2 ** this.bitDepth / 2 - 1;
 
     this.specReadStream = new SpecReadStream();
@@ -37,13 +35,18 @@ class ToneStream extends Readable {
   add(spec) {
     this.specReadStream.add(spec);
     this.pending_ended = true
+    var num_samples = spec[0]
+    return num_samples
   }
 
   concat(specs) {
+    var num_samples = 0
     specs.forEach((spec) => {
       this.specReadStream.add(spec);
+      num_samples += spec[0]
     });
     this.pending_ended = true
+    return num_samples
   }
 
   on(evt, cb) {
@@ -80,17 +83,14 @@ class ToneStream extends Readable {
         this.pending_ended = false
         this.eventEmitter.emit("ended")
       }
-      if (this.opts && this.opts.stay_alive) {
-        for (var j = 0; j < numSamples * this.channels; j++) {
-          let offset = j * sampleSize * this.channels;
-          setter(0, offset);
-        }
 
-        this.push(buf);
-        return;
-      } else {
-        return null;
+      for (var j = 0; j < numSamples * this.channels; j++) {
+        let offset = j * sampleSize * this.channels;
+        setter(0, offset);
       }
+
+      this.push(buf);
+      return;
     }
 
     let actualSamples = specs.reduce((total, spec) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tone-stream",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "description": "A simple audio tone stream library",
   "main": "index.js",
   "repository": {