Merge branch 'develop' of https://github.com/csound/csound into develop

csound · Dec 3, 2017 · 40120f8 · 40120f8
2 parents a2fda29 + 5447a8f
commit 40120f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/emscripten/build-mkg.sh b/emscripten/build-mkg.sh
@@ -18,8 +18,5 @@ echo "Updating the Csound examples for WebAssembly..."
 sh update_example_libs_from_dist_wasm.sh
 echo "Creating a release directory (dist-wasm) for Csound for WebAssembly..."
 sh release-wasm.sh
-echo "Copying dist-wasm files to gogins.github.io..."
-sh copy_wasm_to_gogins_github_io.sh
 echo "Finished building Csound for WebAssembly."
-ls -ll /tmp/emscripten_temp
-ls -ll build-wasm
+ls -ll dist-wasm
diff --git a/emscripten/src/CsoundObj.js b/emscripten/src/CsoundObj.js
@@ -292,9 +292,9 @@ var CsoundObj = function() {
         var inputChannelN = audioProcessNode.inputCount;
         var outputChannelN = audioProcessNode.outputCount;
         var spin = _getInputBuffer(csound_obj_);
-        var spinBuffer = new Float64Array(Module.HEAP8.buffer, spin, ksmps * inputChannelN);
+        var spinBuffer = new Float32Array(Module.HEAP8.buffer, spin, ksmps * inputChannelN);
         var spout = _getOutputBuffer(csound_obj_);
-        var spoutBuffer = new Float64Array(Module.HEAP8.buffer, spout, ksmps * outputChannelN);
+        var spoutBuffer = new Float32Array(Module.HEAP8.buffer, spout, ksmps * outputChannelN);
         var zerodBFS = _getZerodBFS(csound_obj_);
         that.running = true;
         var csoundFrameI = 0;