diff --git a/oregano/examples/gui-example.rkt b/oregano/examples/gui-example.rkt index 53c9ba5..732d77e 100644 --- a/oregano/examples/gui-example.rkt +++ b/oregano/examples/gui-example.rkt @@ -4,9 +4,9 @@ (display "in example.rkt") -(sleep 0.1) +;(sleep 0.1) -(define my-sin (make-note "sin-inst" 880)) +(define my-sin (make-note "saw-inst" 880)) (param-slider "change frequency" 300 1000 400 diff --git a/oregano/instrument.rkt b/oregano/instrument.rkt index c22175e..a28d24a 100644 --- a/oregano/instrument.rkt +++ b/oregano/instrument.rkt @@ -11,7 +11,7 @@ ;; TODO - remove. using "signal-slider" for testing (require "gui.rkt") -(run-super-collider) +;(run-super-collider) (define current-node-id 1000) diff --git a/oregano/main.rkt b/oregano/main.rkt index 74584e1..d90374e 100644 --- a/oregano/main.rkt +++ b/oregano/main.rkt @@ -1,16 +1,17 @@ #lang racket -(require "instrument.rkt" +(require "system.rkt" + "instrument.rkt" "gui.rkt" - "sample.rkt" - "system.rkt") + "sample.rkt" + "routing.rkt") ;; setup (require rsc3) ;; FIXME - not running (display "Hello! from main.rkt\n") -(run-super-collider) +;(run-super-collider) ;; show osc messages on server @@ -21,6 +22,7 @@ (provide (all-from-out "instrument.rkt" "gui.rkt" - "sample.rkt")) + "sample.rkt" + "routing.rkt")) diff --git a/oregano/system.rkt b/oregano/system.rkt index 8d7f96b..269d738 100644 --- a/oregano/system.rkt +++ b/oregano/system.rkt @@ -15,9 +15,10 @@ (process "./start_server_linux.sh") (sleep 0.5) (if (system "ps -e | grep scsynth > /dev/null") - (display "OK") - (display "Error"))))) + (display "OK\n") + (display "Error\n"))))) ('macosx 1) ('windows 1) (else 1))) +(run-super-collider) \ No newline at end of file diff --git a/rsc3/examples/moog-filter.rkt b/rsc3/examples/moog-filter.rkt index 29c596b..4f7a763 100644 --- a/rsc3/examples/moog-filter.rkt +++ b/rsc3/examples/moog-filter.rkt @@ -26,7 +26,7 @@ |# -(with-sc3 reset) +(reset) #| (let* ((x (mouse-x kr 220 440 0 0.1))