fix setControlChannel, new release for csound 6.12.0

hlolli · Oct 28, 2018 · dde1d3e · dde1d3e
1 parent aa9bbe9
commit dde1d3e
Show file tree

Hide file tree

Showing 10 changed files with 896 additions and 886 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "csound-wasm",
-  "version": "6.12.0-0",
+  "version": "6.12.0-1",
   "author": "Hlödver Sigurdsson <[email protected]>",
   "license": "GPL-3.0",
   "keywords": [
@@ -25,14 +25,14 @@
   },
   "dependencies": {
     "bufferutil": "^4.0.0",
-    "libcsound": "^6.11.0-2",
+    "libcsound": "^6.12.0-0",
     "midi": "^0.9.5",
     "speaker": "^0.4.1",
     "utf-8-validate": "^5.0.1"
   },
   "devDependencies": {
-    "nan": "^2.11.0",
-    "shadow-cljs": "^2.6.6",
+    "nan": "^2.11.1",
+    "shadow-cljs": "^2.6.19",
     "source-map-support": "^0.5.9"
   }
 }
diff --git a/release/browser/csound-wasm-browser.js b/release/browser/csound-wasm-browser.js
diff --git a/release/browser/csound-wasm-worklet-processor.js b/release/browser/csound-wasm-worklet-processor.js
diff --git a/release/browser/example3.html b/release/browser/example3.html
@@ -29,7 +29,8 @@
 <button id="play" style="margin-top:310px; height:40px;margin-left:20px">Play</button>
 <div id="tester" style="margin-top:0px;width:600px;height:250px;"></div>
 
-<script>window["csound_worklet_processor_url"] = "./csound-wasm-worklet-processor.js"</script>
+<!-- <script>window["csound_worklet_processor_url"] = "./csound-wasm-worklet-processor.js"</script> -->
+<script>window["csound_worklet_processor_url"] = "http://localhost:8080/csound-wasm-worklet-processor.js"</script>
 
 <script src="./csound-wasm-browser.js"></script>
 
@@ -54,6 +55,7 @@
     editor.setBehavioursEnabled(false);
     editor.setTheme("ace/theme/monokai");
     editor.getSession().setMode("ace/mode/csound_orchestra");
+    csound.setControlChannel("freq", 200);
     csound.startRealtime({ksmps: 1});
 
    document.getElementById('play').onclick = ()=>{            

diff --git a/release/browser/main.js.map b/release/browser/main.js.map
diff --git a/release/node/index.js b/release/node/index.js
diff --git a/release/node/index.js.map b/release/node/index.js.map
diff --git a/src/csound_wasm/browser.cljs b/src/csound_wasm/browser.cljs
@@ -105,7 +105,7 @@
                     (if (exists? ^js js/window.csound_worklet_processor_url)
                       ^js js/window.csound_worklet_processor_url
                       (str "https://s3.amazonaws.com/hlolli/csound-wasm/"
-                           "6.12.0-0"
+                           "6.12.0-1"
                            "/csound-wasm-worklet-processor.js")))
         (.then
          (fn []
@@ -138,22 +138,22 @@
                               "falling back to WebAudio's script processor.\n")
                          err)
                   (reset! public/audio-worklet-node nil)
-                  (vreset! public/start-audio-fn
-                           (fn [config]
-                             (when-not @public/audio-started?
-                               (reset! public/audio-started? true))
-                             (start-audio config)))
+                  (reset! public/start-audio-fn
+                          (fn [config]
+                            (when-not @public/audio-started?
+                              (reset! public/audio-started? true))
+                            (start-audio config)))
                   (let [libcsound (public/activate-init-callback Libcsound)]
                     (reset! public/libcsound libcsound))))))
   (do
     (.warn js/console
            (str "No AudioWorklet support found"))
     (reset! public/audio-worklet-node false)
-    (vreset! public/start-audio-fn
-             (fn [config]
-               (when-not @public/audio-started?
-                 (reset! public/audio-started? true))
-               (start-audio config)))
+    (reset! public/start-audio-fn
+            (fn [config]
+              (when-not @public/audio-started?
+                (reset! public/audio-started? true))
+              (start-audio config)))
     (let [libcsound (public/activate-init-callback Libcsound)]
       (reset! public/libcsound libcsound))))
 

diff --git a/src/csound_wasm/core.cljs b/src/csound_wasm/core.cljs
@@ -343,8 +343,8 @@
 
 (defn- log-event [log]
   (if (exists? js/window)
-    (.log js/console "%c%s" "font-size: 13px;" log)
-    (.log js/console log))
+    (.log js/console "%c%s" "font-size: 13px;" (str log))
+    (.log js/console (str log)))
   #_(when (or (not worker-threads)
               (.-isMainThread worker-threads))
       (dispatch-event "csoundLog" log)))

diff --git a/src/csound_wasm/worklet_processor.cljs b/src/csound_wasm/worklet_processor.cljs
@@ -109,8 +109,9 @@
      #js ["promise" promise-id return-val])))
 
 (defn processor-event-handler [event]
-  (let [data (.-data event)
-        key  (aget data 0)]
+  (let [data   (.-data event)
+        key    (aget data 0)
+        params (aget data 1)]
     (case key
       "promise"
       (handle-promise data)
@@ -119,7 +120,10 @@
                   (case (aget data 1)
                     "startRealtime" #(public/start-realtime (aget data 2))))
           (when @public/wasm-initialized? (@public/startup-fn)))
-      (apply (get public-functions key) (rest data))
+      (apply (get public-functions key)
+             (let [rest-data (if (vector? params)
+                               params (js->clj params))]
+               params))
       ;;(.error js/console "Error unhandled key in processor: " key)
       )))