Moved emscripten APIs to their own module and added stubs for other methods

4 files changed, 57 insertions, 22 deletions

diff --git a/src/emscripten_api.rs b/src/emscripten_api.rs
new file mode 100644
index 0000000..ec6704e
--- /dev/null
+++ b/src/emscripten_api.rs
@@ -0,0 +1,39 @@
+use transforms;
+
+#[no_mangle]
+pub extern "C" fn find_fundamental_frequency(signal: *const f32, signal_length: isize, sample_rate: f32) -> f32 {
+    use std::slice;
+    let signal_slice = unsafe {
+        &slice::from_raw_parts(signal, signal_length as usize)
+    };
+    
+    transforms::find_fundamental_frequency(&signal_slice, sample_rate).unwrap_or(0.0)
+}
+
+#[no_mangle]
+pub extern "C" fn correlation(signal: *const f32, signal_length: isize) {
+    //TODO correlate inline
+}
+
+#[no_mangle]
+pub extern "C" fn hz_to_cents_error(hz: f32) -> f32 {
+    //TODO implement
+    0.0
+}
+
+use std::os::raw::c_char;
+use std::ffi::CStr;
+use std::ffi::CString;
+
+#[no_mangle]
+pub extern "C" fn hz_to_pitch(hz: f32) -> *mut c_char {
+    //TODO implement
+    CString::new("C 4")
+		.unwrap()
+        .into_raw()
+}
+
+#[no_mangle]
+pub extern "C" fn align_to_rising_edge(signal: *const f32, signal_length: isize) {
+    //TODO format signal nicely inline
+}
diff --git a/src/lib.rs b/src/lib.rs
index 3331f72..b053e0c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,3 +11,6 @@ pub mod gui;
 extern crate portaudio;
 #[cfg(not(target_os = "emscripten"))]
 pub mod audio;
+
+#[cfg(target_os = "emscripten")]
+pub mod emscripten_api;
diff --git a/src/transforms.rs b/src/transforms.rs
index 656255b..55f81b6 100644
--- a/src/transforms.rs
+++ b/src/transforms.rs
@@ -236,19 +236,3 @@ pub fn align_to_rising_edge(samples: &[f32]) -> Vec<f32> {
         .cloned()
         .collect()
 }
-
-
-#[cfg(target_os = "emscripten")]
-pub mod emscripten_api {
-    #[no_mangle]
-    pub extern "C" fn find_fundamental_frequency(signal: *const f32, signal_length: isize, sample_rate: f32) -> f32 {
-        use std::slice;
-        let signal_slice = unsafe {
-            &slice::from_raw_parts(signal, signal_length as usize)
-        };
-        
-        println!("Signal is {:?}", signal_slice);
-        println!("Sample rate is {:?}Hz", sample_rate);
-        super::find_fundamental_frequency(&signal_slice, sample_rate).unwrap_or(0.0)
-    }
-}
diff --git a/web/main.js b/web/main.js
index b01340d..2388be8 100644
--- a/web/main.js
+++ b/web/main.js
@@ -5,21 +5,30 @@ var Module = {
     onRuntimeInitialized: main
 };
 
-function jsArrayToF32ArrayPtr(jsArray) {
+function jsArrayToF32ArrayPtr(jsArray, callback) {
     var data = new Float32Array(jsArray);
     var nDataBytes = data.length * data.BYTES_PER_ELEMENT;
     var dataPtr = Module._malloc(nDataBytes);
 
     var dataHeap = new Uint8Array(Module.HEAPU8.buffer, dataPtr, nDataBytes);
     dataHeap.set(new Uint8Array(data.buffer));
-    return dataHeap.byteOffset;
+
+    var result = callback(dataHeap.byteOffset, jsArray.length);
+
+    Module._free(dataPtr);
+    
+    return result;
+}
+
+function find_fundamental_frequency(data, samplingRate) {
+    return jsArrayToF32ArrayPtr(data, function(dataPtr, dataLength) {
+        return Module._find_fundamental_frequency(dataPtr, dataLength, samplingRate);
+    });
 }
 
 function main() {
     var data = [1, 0, -1, 0, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, -1, 0];
-    var dataLength = data.length;
-    var ptr = jsArrayToF32ArrayPtr(data);
-
-    var fundamental = _find_fundamental_frequency(ptr, data.length, 44100.0);
+    var fundamental = find_fundamental_frequency(data, 44100.0);
+    
     console.log("Javascript here. Our fundamental frequency according to Rust is " + fundamental + "Hz");
 }