Merge branch 'master' into bugfix/65_fix_loop

2019-07-21 12:22:04 +02:00
parent a482000c79 c07f6552ed
commit dbd437c120
14 changed files with 1336 additions and 56 deletions
--- a/desktop/sources/scripts/ronin.js
+++ b/desktop/sources/scripts/ronin.js
@@ -22,7 +22,7 @@ function Ronin () {
  this.surface = new Surface(this)
  this.library = new Library(this)
  this.interpreter = new Lisp(this.library, this.includes)
-
+  this.osc = new Osc(this)
  // Parameters

  this.always = false
@@ -46,7 +46,7 @@ function Ronin () {
    this.source.start()
    this.commander.start()
    this.surface.start()
-    console.log('Ronin', 'Started')
+    this.osc.start()
  }

  this.reset = function () {