dont require libcsound as global

hlolli · hlolli · commit 2a179282a3e1 · 2018-03-02T16:45:49.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ package-lock.json
 *.wav
 browser/cljs-runtime
 browser/manifest.edn
+.shadow-cljs
+yarn.lock
diff --git a/.npmignore b/.npmignore
@@ -4,3 +4,9 @@ node_modules
 package-lock.json
 *~
 *.wav
+deps.cljs
+project.clj
+shadow-cljs.edn
+src
+.shadow-cljs
+yarn.lock
diff --git a/browser/index.html b/browser/index.html
@@ -1,42 +1,43 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
   <head>
-<title>csound-wasm dev</title>
-</head>
-<body>
-  <h1>csound-wasm dev</h1>
-  <script src="/libcsound.js"></script>
-  <script src="/main.js"></script>
+    <meta charset="utf-8">
+    <title>csound-wasm dev</title>
+  </head>
+  <body>
+    <h1>csound-wasm dev</h1>
+    <script src="main.js"></script>
   <script>
-    var csound = csound_wasm;
+    // var csound = csound_wasm.browser.main;
     const beeper = `
     <CsoundSynthesizer>
       <CsOptions>
-	-+rtmidi=null -M0
+        -+rtmidi=null -M0
       </CsOptions>
       <CsInstruments>
-	;Example by Andrés Cabrera
+        ;Example by Andrés Cabrera
 
-	sr = 44100
-	ksmps = 32
-	nchnls = 2
-	0dbfs = 1
+        sr = 44100
+        ksmps = 32
+        nchnls = 2
+        0dbfs = 1
 
         massign   0, 1 ;assign all MIDI channels to instrument 1
-	
+        
         opcode declick, a, a
-	ain     xin
-	aenv    linseg 0, 0.02, 1, p3 - 0.05, 1, 0.02, 0, 0.01, 0
+        ain     xin
+        aenv    linseg 0, 0.02, 1, p3 - 0.05, 1, 0.02, 0, 0.01, 0
         xout ain * aenv         ; apply envelope and write output
         endop
-	
-	instr 1
-	iCps    cpsmidi   ;get the frequency from the key pressed
-	iAmp    ampmidi   0dbfs * 0.3 ;get the amplitude
-	aOut    poscil    iAmp, iCps ;generate a sine tone
-	kenv	mxadsr	0.1, 0, 1, 0.5
-	aOut *= kenv
+        
+        instr 1
+        iCps    cpsmidi   ;get the frequency from the key pressed
+        iAmp    ampmidi   0dbfs * 0.3 ;get the amplitude
+        aOut    poscil    iAmp, iCps ;generate a sine tone
+        kenv    mxadsr  0.1, 0, 1, 0.5
+        aOut *= kenv
         outs      aOut, aOut ;write it to the output
-	endin
+        endin
 
       </CsInstruments>
       <CsScore>
diff --git a/browser/libcsound.js b/browser/libcsound.js
diff --git a/browser/main.js b/browser/main.js
diff --git a/deps.cljs b/deps.cljs
@@ -0,0 +1,3 @@
+{:foreign-libs
+ [{:file "csound_wasm/libcsound.js"
+   :provides ["libcsound"]}]}
diff --git a/examples/example1.js b/examples/example1.js
@@ -1,4 +1,4 @@
-const csound = require('../index.js');
+const csound = require('../');
 
 const beeper = `
 instr 1
diff --git a/examples/example2.js b/examples/example2.js
@@ -1,4 +1,4 @@
-const csound = require('../index.js');
+const csound = require('../');
 
 const beeper = `
 instr 1
diff --git a/examples/example3.js b/examples/example3.js
@@ -1,4 +1,4 @@
-const csound = require('../index.js');
+const csound = require('../');
 
 const csd = `
 <CsoundSynthesizer>
diff --git a/examples/example4.js b/examples/example4.js
@@ -1,4 +1,4 @@
-const csound = require('../index.js');
+const csound = require('../');
 
 const csd = `
 <CsoundSynthesizer>
diff --git a/examples/example5.js b/examples/example5.js
@@ -1,28 +1,28 @@
-const csound = require('../index.js');
+const csound = require('../');
 
 const csd = `
     <CsoundSynthesizer>
       <CsOptions>
-	-+rtmidi=null -M0
+        -+rtmidi=null -M0
       </CsOptions>
       <CsInstruments>
-	;Example by Andrés Cabrera
+        ;Example by Andrés Cabrera
 
-	sr = 44100
-	ksmps = 32
-	nchnls = 2
-	0dbfs = 1
+        sr = 44100
+        ksmps = 32
+        nchnls = 2
+        0dbfs = 1
 
         massign   0, 1 ;assign all MIDI channels to instrument 1
-	
-	instr 1
-	iCps    cpsmidi   ;get the frequency from the key pressed
-	iAmp    ampmidi   0dbfs * 0.3 ;get the amplitude
-	aOut    poscil    iAmp, iCps ;generate a sine tone
-	kenv	mxadsr	0.1, 0, 1, 0.5
-	aOut *= kenv
+        
+        instr 1
+        iCps    cpsmidi   ;get the frequency from the key pressed
+        iAmp    ampmidi   0dbfs * 0.3 ;get the amplitude
+        aOut    poscil    iAmp, iCps ;generate a sine tone
+        kenv    mxadsr  0.1, 0, 1, 0.5
+        aOut *= kenv
         outs      aOut, aOut ;write it to the output
-	endin
+        endin
 
       </CsInstruments>
       <CsScore>
diff --git a/node/index.js b/node/index.js
diff --git a/node/libcsound.wasm b/node/libcsound.wasm
@@ -0,0 +1 @@
+../libcsound.wasm
diff --git a/package.json b/package.json
@@ -1,29 +1,30 @@
 {
-   "name": "csound-wasm",
-   "version": "6.10.0-3",
-   "author": "Hlödver Sigurdsson <hlolli@gmail.com>",
-   "license": "GPL-3.0",
-   "keywords": [
-      "csound",
-      "csound-wasm",
-      "wasm",
-      "webassembly",
-      "audio",
-      "webaudio"
+  "name": "csound-wasm",
+  "version": "6.10.0-3",
+  "author": "Hlödver Sigurdsson <hlolli@gmail.com>",
+  "license": "GPL-3.0",
+  "keywords": [
+    "csound",
+    "csound-wasm",
+    "wasm",
+    "webassembly",
+    "audio",
+    "webaudio"
    ],
-   "main": "index.js",
-   "browser": "browser/main.js",
-   "build": {
-      "appId": "csound-wasm"
-   },
-   "dependencies": {
-      "bufferutil": "^3.0.3",
-      "midi": "^0.9.5",
-      "speaker": "^0.3.0",
-      "utf-8-validate": "^4.0.0"
-   },
-   "devDependencies": {
-      "shadow-cljs": "^2.0.144",
-      "web-audio-api": "^0.2.2"
-   }
+  "main": "node/index.js",
+  "browser": "browser/main.js",
+  "build": {
+    "appId": "csound-wasm"
+  },
+  "dependencies": {
+    "bufferutil": "^3.0.3",
+    "libcsound": "^6.10.0-3",
+    "midi": "^0.9.5",
+    "speaker": "^0.3.0",
+    "utf-8-validate": "^4.0.0"
+  },
+  "devDependencies": {
+    "shadow-cljs": "^2.2.3",
+    "web-audio-api": "^0.2.2"
+  }
 }
diff --git a/project.clj b/project.clj
@@ -4,6 +4,12 @@
   :license {:name "GNU GPL v3+"
             :url "http://www.gnu.org/licenses/gpl-3.0.en.html"}
   :source-paths ["src"]
-  :resource-paths ["libcsound.js" "libcsound.wasm" "package.json"]
+  :resource-paths ["package.json" "deps.cljs"
+                   "libcsound.js" "libcsound.wasm"]
   :scm {:name "git"
-        :url "https://github.com/hlolli/csound-wasm"})
+        :url "https://github.com/hlolli/csound-wasm"}
+
+  ;; :plugins [[lein-cljsbuild "1.1.7"]]
+  ;; :hooks [leiningen.cljsbuild]
+  ;; :cljsbuild {:builds []}
+  )
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -1,8 +1,11 @@
 {:dependencies [[org.clojure/core.specs.alpha "0.1.24"]]
  :source-paths ["src"]
  :builds {:node {:target :node-library
-                 :output-to "index.js"
+                 :output-to "node/index.js"
                  :modules {:main {:entries [csound-wasm.node]}}
+                 :js-options {:resolve {"libcsound"
+                                        {:target :file
+                                         :file "src/csound_wasm/libcsound.js"}}}
                  :exports {:startRealtime csound-wasm.public/start-realtime
                            :compileOrc csound-wasm.public/compile-orc
                            :renderToFile csound-wasm.node/render-to-file
@@ -25,18 +28,18 @@
                            :getKsmps csound-wasm.public/get-ksmps
                            :get0dbfs csound-wasm.public/get-0dbfs
                            :enableMidi csound-wasm.node/enable-midi
-                           :pushMidi csound-wasm.public/push-midi-message
-                           }}
+                           :pushMidi csound-wasm.public/push-midi-message}}
           :browser {:target :browser
                     :output-dir "browser"
                     :asset-path "./"
-                    :js-options {:resolve {"libcsound" {:target :global
-                                                        :global "Module"}}}
-                    :compiler-options {:optimizations :simple
+                    :js-options {:resolve {"libcsound"
+                                           {:target :file
+                                            :file "src/csound_wasm/libcsound.js"}}}
+                    :compiler-options {:optimizations :advanced
                                        :output-wrapper true}
                     :modules {:main {:entries [csound-wasm.browser]
-                                     :prepend "var csound_wasm = (function () {\n"
-                                     :append "\n return csound_wasm.browser.main;})()\n"}}
+                                     :append "\nvar csound = csound_wasm.browser.main;\n"}}
+                    :exports {:csound csound-wasm.browser/main}
                     :devtools {:http-root "browser"
                                :http-resource-root "browser"
                                :http-port 8600
diff --git a/src/csound_wasm/browser.cljs b/src/csound_wasm/browser.cljs
@@ -1,29 +1,20 @@
 (ns csound-wasm.browser
-  (:require [csound-wasm.public :as public]))
+  (:require [csound-wasm.public :as public]
+            ["libcsound" :as libcsound]))
 
 (enable-console-print!)
 
-(declare csound-object)
+(public/activate-init-callback libcsound/calledRun)
 
-(defn wait-for-libcsound []
-  (if (and (exists? js/Module)
-           (nil? @public/csound-object))
-    (do (reset! public/csound-object js/Module)
-        (def csound-object js/Module)
-        (public/activate-init-callback (.-calledRun csound-object))
-        (set! (.-print csound-object)
-              (fn [log]
-                (.log js/console "%c%s" "background: #222; color: #bada55" log)))
-        (set! (.-printErr csound-object)
-              (fn [log]
-                (.log js/console "%c%s" "background: #222; color: #bada55" log)))
-        (set! (.-noExitRuntime csound-object) true))
-    (js/setTimeout
-     (fn [] (wait-for-libcsound))
-     1)))
+(set! libcsound/print
+      (fn [log]
+        (.log js/console "%c%s" "background: #222; color: #bada55" log)))
 
-(wait-for-libcsound)
+(set! libcsound/printErr
+      (fn [log]
+        (.log js/console "%c%s" "background: #222; color: #bada55" log)))
 
+(set! libcsound/noExitRuntime true)
 
 (defn enable-midi []
   (letfn [(handle-midi-input [event]
@@ -75,11 +66,11 @@
 (def wasm-buffer-offset (volatile! 0))
 
 (defn start-audio [csound-instance]
-  (let [ksmps ((.cwrap csound-object "CsoundObj_getKsmps" #js ["number"] #js ["number"])
+  (let [ksmps ((libcsound/cwrap "CsoundObj_getKsmps" #js ["number"] #js ["number"])
                csound-instance)
-        input-count ((.cwrap csound-object "CsoundObj_getInputChannelCount" #js ["number"] #js ["number"])
+        input-count ((libcsound/cwrap "CsoundObj_getInputChannelCount" #js ["number"] #js ["number"])
                      csound-instance)
-        output-count ((.cwrap csound-object "CsoundObj_getOutputChannelCount" #js ["number"] #js ["number"])
+        output-count ((libcsound/cwrap "CsoundObj_getOutputChannelCount" #js ["number"] #js ["number"])
                       csound-instance)
         audio-context-constructor (or js/window.AudioContext js/window.webkitAudioContext)
         audio-context (new audio-context-constructor)
@@ -89,11 +80,11 @@
         _ (do (set! (.-inputCount audio-process-node) input-count)
               (set! (.-outputCount audio-process-node) output-count))
         buffer-size (.-bufferSize audio-process-node)
-        output-pointer ((.cwrap csound-object "CsoundObj_getOutputBuffer" #js ["number"] #js ["number"])
+        output-pointer ((libcsound/cwrap "CsoundObj_getOutputBuffer" #js ["number"] #js ["number"])
                         csound-instance)
-        csound-output-buffer (new js/Float32Array (.-buffer (.-HEAP8 csound-object))
+        csound-output-buffer (new js/Float32Array (.-buffer (.-HEAP8 libcsound))
                                   output-pointer (* ksmps output-count))
-        zerodbfs ((.cwrap csound-object "CsoundObj_getZerodBFS" #js ["number"] #js ["number"])
+        zerodbfs ((libcsound/cwrap "CsoundObj_getZerodBFS" #js ["number"] #js ["number"])
                   csound-instance)
         range-output-cnt (range output-count)
         process-buffers (fn [e sample-count src-offset dst-offset]
@@ -106,7 +97,7 @@
                                                      (+ j src-offset))))
                                        zerodbfs)))))
         perform-ksmps-fn (fn []
-                           ((.cwrap csound-object "CsoundObj_performKsmps" #js ["number"] #js ["number"])
+                           ((libcsound/cwrap "CsoundObj_performKsmps" #js ["number"] #js ["number"])
                             csound-instance))]
     (vreset! wasm-buffer-offset ksmps)
     (set! (.-onaudioprocess audio-process-node)
@@ -127,8 +118,7 @@
                         (recur sample-count
                                (+ index sample-count)))))))))
     (.connect audio-process-node (.-destination audio-context))
-    nil
-    ))
+    nil))
 
 (vreset! public/start-audio-fn start-audio)
 
diff --git a/src/csound_wasm/libcsound.js b/src/csound_wasm/libcsound.js
@@ -10291,5 +10291,5 @@ run();
 
 // {{MODULE_ADDITIONS}}
 
-
+module.exports = Module;
 
diff --git a/src/csound_wasm/libcsound.js.map b/src/csound_wasm/libcsound.js.map
diff --git a/src/csound_wasm/node.cljs b/src/csound_wasm/node.cljs
diff --git a/src/csound_wasm/public.cljs b/src/csound_wasm/public.cljs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{:foreign-libs`
	`2`	`+ [{:file "csound_wasm/libcsound.js"`
	`3`	`+ :provides ["libcsound"]}]}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const csound = require('../index.js');`
	`1`	`+const csound = require('../');`
`2`	`2`
`3`	`3`	const beeper = `
`4`	`4`	`instr 1`