fix KEYOUT

vizicist · Feb 5, 2023 · f274da2 · f274da2
1 parent d319d18
commit f274da2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 77 deletions.
diff --git a/data_omnisphere/config/paramenums.json b/data_omnisphere/config/paramenums.json
@@ -12,7 +12,7 @@
 	"quantstyle": [ "none", "frets", "fixed", "pressure" ],
 	"volstyle": [ "fixed", "pressure" ],
   "shape": [ "line", "triangle", "square", "circle" ],
-  "midiinput": [ "" ],
+  "midiinput": [ "microKEY2 Air", "" ],
   "movedir": [ "cursor", "left", "right", "up", "down", "random", "random90", "updown", "leftright" ],
   "rotangdir": [ "right", "left", "random" ],
   "mirror": [ "none", "vertical", "horizontal", "four" ],

diff --git a/data_omnisphere/keykit/liblocal/keylib.k b/data_omnisphere/keykit/liblocal/keylib.k
@@ -1,8 +1,8 @@
-#library keylocal.k keylocal
-#library keylocal.k localprerc
-#library keylocal.k localpostrc
 #library palette.k palette_kill
 #library palette.k palette_listen
 #library palette.k palette_listen_task
 #library palette.k palette_send
 #library palette.k palette_test
+#library keylocal.k keylocal
+#library keylocal.k localprerc
+#library keylocal.k localpostrc
diff --git a/data_omnisphere/keykit/liblocal/keylocal.k b/data_omnisphere/keykit/liblocal/keylocal.k
@@ -18,7 +18,7 @@ function keylocal() {
 	addpostrc(global(localpostrc))
 
 	# Inittask = remotecons(4444)  # would start remote console on port 4444
-	# Inittask = palette_listen()
+	Inittask = palette_listen()
 }
 
 function localprerc() {

diff --git a/engine/input.go b/engine/input.go
diff --git a/engine/process.go b/engine/process.go
@@ -267,7 +267,14 @@ func KeykitProcessInfo() *ProcessInfo {
 	if keyoutput == "" {
 		keyoutput = DefaultKeykitOutput
 	}
-	os.Setenv("KEYOUTPUT", keyoutput)
+	os.Setenv("KEYOUT", keyoutput)
+
+	// Allow parameter to override keyoutput
+	keyallow := TheEngine.Get("engine.keyallow")
+	if keyallow == "" {
+		keyallow = "127.0.0.1"
+	}
+	os.Setenv("KEYALLOW", keyallow)
 
 	// Allow parameter to override path to key.exe
 	fullpath := TheEngine.Get("engine.keykit")

diff --git a/engine/router.go b/engine/router.go
@@ -3,7 +3,6 @@ package engine
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -80,15 +79,17 @@ func NewRouter(cm *CursorManager) *Router {
 	r.midiInputChan = make(chan MidiEvent)
 	// r.recordingOn = false
 
-	r.myHostname = os.Getenv("PALETTE_HOSTNAME")
-	if r.myHostname == "" {
-		hostname, err := os.Hostname()
-		if err != nil {
-			LogError(err)
-			hostname = "unknown"
+	/*
+		r.myHostname = os.Getenv("PALETTE_HOSTNAME")
+		if r.myHostname == "" {
+			hostname, err := os.Hostname()
+			if err != nil {
+				LogError(err)
+				hostname = "unknown"
+			}
+			r.myHostname = hostname
 		}
-		r.myHostname = hostname
-	}
+	*/
 
 	// By default, the engine handles Cursor events internally.
 	// However, if publishcursor is set, it ONLY publishes them,