Skip to content
Browse files

merging

  • Loading branch information...
2 parents a05741f + 7503d16 commit ad496e563f9f5bb138cb73417c2db6b97c1cf063 @rosejn rosejn committed
Showing with 8 additions and 7 deletions.
  1. +3 −1 project.clj
  2. +5 −6 src/overtone/sc/core.clj
View
4 project.clj
@@ -12,5 +12,7 @@
[overtone/byte-spec "0.2.0-SNAPSHOT"]
[overtone/midi-clj "0.2.0-SNAPSHOT"]
[org.clojars.overtone/vijual "0.2.1"]]
- :dev-dependencies [[marginalia "0.2.0"]]
+ :dev-dependencies [[marginalia "0.2.0"]
+ [native-deps "1.0.5"]]
+ :native-dependencies [[overtone/scsynth-clj-native-deps "0.0.1-SNAPSHOT"]]
:jvm-opts ["-Xms256m" "-Xmx1g" "-XX:+UseConcMarkSweepGC"])
View
11 src/overtone/sc/core.clj
@@ -132,10 +132,10 @@
(defn connect-internal
[]
(log/debug "Connecting to internal SuperCollider server")
- (let [reply-fn (sc/make-reply-callback
- (fn [buf]
+ (let [reply-fn (sc/make-reply-callback
+ (fn [buf]
(let [msg (osc-decode-packet buf)]
- (event :osc-msg-received
+ (event :osc-msg-received
:msg msg))))
send-fn (fn [peer-obj buffer]
(sc/send-packet (:world @sc*) reply-fn buffer))
@@ -144,7 +144,6 @@
(setup-connect-handlers)
(snd "/status")))
-
(defn connect-external
[host port]
(log/debug "Connecting to external SuperCollider server: " host ":" port)
@@ -264,7 +263,7 @@
(log/info "booting internal audio server listening on port: " port)
(let [server (sc/start "native/linux/x86/ugens")]
(dosync (alter sc* assoc :world server))
- (future
+ (future
(Thread/sleep 3000)
(satisfy-deps :booted))))
@@ -345,7 +344,7 @@
(if (:connection @sc*)
(osc-close (:connection @sc*) true))
(dosync
- (alter sc* assoc
+ (alter sc* assoc
:connection nil
:status :disconnected)
(unsatisfy-all-dependencies)))

0 comments on commit ad496e5

Please sign in to comment.
Something went wrong with that request. Please try again.