minor WASM improvements

Author: ByteSizedFox

wasm/compile.sh

@@ -1,6 +1,6 @@
 emcc main.c ../src/*.c -I ../include -o DECtalkMini.js \
   -s WASM=1 \
-  -s EXPORTED_FUNCTIONS='["_tts_init","_tts_speak","_tts_get_buffer","_tts_get_buffer_length","_tts_reset","_tts_get_last_phone","_malloc","_free"]' \
+  -s EXPORTED_FUNCTIONS='["_tts_init","_tts_speak","_tts_get_buffer","_tts_get_buffer_length","_tts_reset","_malloc","_free"]' \
   -s EXPORTED_RUNTIME_METHODS='["cwrap","ccall","getValue","setValue","UTF8ToString","stringToUTF8","HEAP16"]' \
   -s ALLOW_MEMORY_GROWTH=1 \
   -s INITIAL_MEMORY=33554432 \

wasm/index.html

@@ -86,7 +86,7 @@ <h1>DECtalkMini</h1>
 
     <script>
         let Module = null;
-        let tts_init, tts_speak, tts_get_buffer, tts_get_buffer_length, tts_reset, tts_get_last_phone;
+        let tts_init, tts_speak, tts_get_buffer, tts_get_buffer_length, tts_reset;
         let audioContext = null;
         let currentSource = null;
         let currentAudioBuffer = null;
@@ -142,13 +142,13 @@ <h1>DECtalkMini</h1>
             });
         }
 
-        window.onPhoneCallback = function(phone) {
-            const currentSampleCount = Module.cwrap('tts_get_buffer_length', 'number', [])();
+        window.onPhoneCallback = function(phoneme) {
+            const currentSampleCount = tts_get_buffer_length();
             const timeInSeconds = currentSampleCount / currentSampleRate;
-            const phonemeName = phonemes[phone] || 'UNKNOWN';
+            const phonemeName = phonemes[phoneme] || 'UNKNOWN';
 
             phonemeTimeline.push({
-                phone: phone,
+                phone: phoneme,
                 phonemeName: phonemeName,
                 time: timeInSeconds
             });
@@ -172,7 +172,6 @@ <h1>DECtalkMini</h1>
                 tts_get_buffer = Module.cwrap('tts_get_buffer', 'number', []);
                 tts_get_buffer_length = Module.cwrap('tts_get_buffer_length', 'number', []);
                 tts_reset = Module.cwrap('tts_reset', 'number', []);
-                tts_get_last_phone = Module.cwrap('tts_get_last_phone', 'number', []);
 
                 tts_init();
                 audioContext = new (window.AudioContext || window.webkitAudioContext)();

wasm/main.c

@@ -2,7 +2,6 @@
 #include "epsonapi.h"
 #include <emscripten.h>
 #include <string.h>
-#include <stdio.h>
 
 #define MAX_BUFFER_SIZE 65536
 static short audio_buffer[MAX_BUFFER_SIZE];
@@ -11,20 +10,22 @@ static int sample_rate = 11025;
 
 extern int last_phoneme;
 
-// Declare JS function that will be called from C
-EM_JS(void, js_phone_callback, (int phone), {
+// JavaScript callback that we'll call
+EM_JS(void, js_audio_callback, (short* data, int length, int phoneme, int buffer_position), {
     if (window.onPhoneCallback) {
-        window.onPhoneCallback(phone);
+        window.onPhoneCallback(phoneme);
     }
 });
 
 EMSCRIPTEN_KEEPALIVE
 short* audio_callback(short *data, long length) {
-    //printf("last_phone value: %d\n", last_phoneme);  // Should be 0-48
-    // Call JavaScript callback with current phone value
-    js_phone_callback(last_phoneme & 0x00FF);
+    // Get current phoneme and pass it to JavaScript along with audio data
+    int current_phoneme = last_phoneme & 0x00FF;
 
-    // Copy samples from callback into our buffer
+    // Call JavaScript callback with phoneme info
+    js_audio_callback(data, length, current_phoneme, buffer_index);
+    
+    // Copy samples to buffer
     for (int i = 0; i < length && buffer_index < MAX_BUFFER_SIZE; i++) {
         audio_buffer[buffer_index++] = data[i];
     }
@@ -58,11 +59,6 @@ int tts_get_buffer_length() {
     return buffer_index;
 }
 
-EMSCRIPTEN_KEEPALIVE
-int tts_get_last_phone() {
-    return last_phoneme;
-}
-
 EMSCRIPTEN_KEEPALIVE
 int tts_reset() {
     buffer_index = 0;