From ec4893173950ee12f0cc1f2665ea97801861b209 Mon Sep 17 00:00:00 2001
From: Roger Dannenberg <rbd@cs.cmu.edu>
Date: Sat, 27 Mar 2021 17:32:02 -0400
Subject: [PATCH] I very recently pushed nyx.c thinking it was the same one
 pushed earlier by Steve. This version has some fundamental changes to keep
 reading/writing of multiple channels synchronized and insuring that the same
 number of samples are written to every channel. There are some minor
 differences like using printf instead of stdputstr and I tried to follow what
 I found in the nyx.c that has been in use for a long time.

---
 lib-src/libnyquist/nyx.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib-src/libnyquist/nyx.c b/lib-src/libnyquist/nyx.c
index 4f377beb1..cc34c6e0a 100644
--- a/lib-src/libnyquist/nyx.c
+++ b/lib-src/libnyquist/nyx.c
@@ -41,7 +41,7 @@
 #define NYX_FULL_COPY 1
 
 /* show memory stats */
-#define NYX_MEMORY_STATS 1
+// #define NYX_MEMORY_STATS 1
 
 /* show details of obarray copy */
 // #define NYX_DEBUG_COPY 1
@@ -486,7 +486,7 @@ void nyx_init()
    xlprot1(nyx_result);
 
 #if defined(NYX_MEMORY_STATS) && NYX_MEMORY_STATS
-   stdputstr("\nnyx_init\n");
+   printf("\nnyx_init\n");
    xmem();
 #endif
 }
@@ -531,7 +531,7 @@ void nyx_cleanup()
    }
 
 #if defined(NYX_MEMORY_STATS) && NYX_MEMORY_STATS
-   stdputstr("\nnyx_cleanup\n");
+   printf("\nnyx_cleanup\n");
    xmem();
 #endif
 }
@@ -830,7 +830,7 @@ nyx_rval nyx_eval_expression(const char *expr_string)
    LVAL expr = NULL;
 
 #if defined(NYX_MEMORY_STATS) && NYX_MEMORY_STATS
-   stdputstr("\nnyx_eval_expression before\n");
+   printf("\nnyx_eval_expression before\n");
    xmem();
 #endif
 
@@ -914,7 +914,7 @@ nyx_rval nyx_eval_expression(const char *expr_string)
    gc();
 
 #if defined(NYX_MEMORY_STATS) && NYX_MEMORY_STATS
-   stdputstr("\nnyx_eval_expression after\n");
+   printf("\nnyx_eval_expression after\n");
    xmem();
 #endif
 
@@ -970,20 +970,20 @@ int nyx_get_audio(nyx_audio_callback callback, void *userdata)
    }
 
 #if defined(NYX_MEMORY_STATS) && NYX_MEMORY_STATS
-   stdputstr("\nnyx_get_audio before\n");
+   printf("\nnyx_get_audio before\n");
    xmem();
 #endif
 
    num_channels = nyx_get_audio_num_channels();
 
-   buffer = (sample_type *) malloc(max_sample_block_len * sizeof(sample_type *));
+   buffer = (sample_type *) malloc(max_sample_block_len * sizeof(sample_type));
    if (buffer == NULL) {
-       goto finish;
+      goto finish;
    }
 
    states = (sound_state_type) malloc(num_channels * sizeof(sound_state_node));
    if (states == NULL) {
-       goto finish;
+      goto finish;
    }
    for (ch = 0; ch < num_channels; ch++) {
        states[ch].cnt = 0;       // force initial fetch
@@ -1121,7 +1121,7 @@ int nyx_get_audio(nyx_audio_callback callback, void *userdata)
  finish:
 
    if (buffer) {
-       free(buffer);
+      free(buffer);
    }
 
    if (states) {
@@ -1131,7 +1131,7 @@ int nyx_get_audio(nyx_audio_callback callback, void *userdata)
    gc();
 
 #if defined(NYX_MEMORY_STATS) && NYX_MEMORY_STATS
-   stdputstr("\nnyx_get_audio after\n");
+   printf("\nnyx_get_audio after\n");
    xmem();
 #endif