WaveRecorder: fix hang in StreamingThread (#106)

The read() could hang forever waiting for data when the
WaveRecorder was stopped.
Now it terminates the thread.

Also fix bug in AudioFifo when partially full. It would not read any data!

Fixes #105

1 files changed, 24 insertions, 1 deletions

diff --git a/src/test/java/com/jsyn/engine/TestFifo.java b/src/test/java/com/jsyn/engine/TestFifo.java
index 1c681fb..3c57053 100644
--- a/src/test/java/com/jsyn/engine/TestFifo.java
+++ b/src/test/java/com/jsyn/engine/TestFifo.java
@@ -34,7 +34,7 @@ public class TestFifo {
         fifo.allocate(8);
         assertEquals(0, fifo.available(), "start empty");
 
-        assertEquals(Double.NaN, fifo.read(), "read back Nan when emopty");
+        assertEquals(Double.NaN, fifo.read(), "read back Nan when empty");
 
         fifo.write(1.0);
         assertEquals(1, fifo.available(), "added one value");
@@ -52,6 +52,29 @@ public class TestFifo {
         watchdog.interrupt();
     }
 
+    @Test
+    public void testReadAvailable() {
+        Thread watchdog = startWatchdog(600);
+
+        AudioFifo fifo = new AudioFifo();
+        fifo.setReadWaitEnabled(false);
+        fifo.allocate(8);
+
+        final double x1 = 0.234;
+        fifo.write(x1);
+        final double x2 = 0.750;
+        fifo.write(x2);
+        assertEquals(2, fifo.available(), "added two values");
+
+        double[] buffer = new double[6];
+        int numRead = fifo.read(buffer, 2, buffer.length - 2);
+        assertEquals(2, numRead, "should have read two values");
+        assertEquals(x1, buffer[2], "read x1");
+        assertEquals(x2, buffer[3], "read x2");
+
+        watchdog.interrupt();
+    }
+
     /**
      * Wrap around several times to test masking.
      */