add keykit submodule, process stuff, event stuff

vizicist · Feb 3, 2023 · 805a07e · 805a07e
1 parent 5e18599
commit 805a07e
Show file tree

Hide file tree

Showing 24 changed files with 519 additions and 576 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "keykit"]
+	path = keykit
+	url = https://github.com/nosuchtim/keykit.git
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -23,11 +23,11 @@
             "args": []
         },
         {
-            "name": "palette stop bidule",
+            "name": "palette start gui",
             "type": "go",
             "request": "launch",
             "program": "${env:PALETTESOURCE}/cmd/palette/palette.go",
-            "args": ["stop","bidule"]
+            "args": ["start","gui"]
         },
         {
             "name": "palette gui",

diff --git a/cmd/palette/palette.go b/cmd/palette/palette.go
@@ -28,8 +28,8 @@ func main() {
 // Usage for controlling the "quadpro" (QuadPro) plugin
 func usage() string {
 	return `Commands:
-	palette start [ engine | gui | bidule | resolume ]
-	palette stop [ engine | gui | bidule | resolume ]
+	palette start [ all | engine | gui | bidule | resolume ]
+	palette stop [ all | engine | gui | bidule | resolume ]
 	palette version
 	palette {plugin}.{api} [ {argname} {argvalue} ] ...
 	`
@@ -92,7 +92,7 @@ func CliCommand(args []string) string {
 		case "resolume":
 			return doApi("quadpro.startprocess", "process", "resolume")
 
-		case "all":
+		case "", "all":
 			s1 := doStartEngine()
 			s2 := doApi("quadpro.startprocess", "process", "all")
 			return s1 + "\n" + s2
@@ -109,6 +109,13 @@ func CliCommand(args []string) string {
 
 		switch arg1 {
 
+		case "", "all":
+			_, err := engine.RemoteAPI("engine.stopall")
+			if err != nil {
+				return fmt.Sprintf("RemoteAPI: err=%s\n", err)
+			}
+			return ""
+
 		case "engine":
 			_, err := engine.RemoteAPI("engine.stop")
 			if err != nil {
@@ -125,11 +132,6 @@ func CliCommand(args []string) string {
 		case "resolume":
 			return doApi("quadpro.stopprocess", "process", "resolume")
 
-		case "all":
-			s1 := doApi("quadpro.stopprocess", "process", "all")
-			s2 := doApi("engine.stop")
-			return s1 + "\n" + s2
-
 		default:
 			return usage()
 		}
@@ -150,7 +152,7 @@ func CliCommand(args []string) string {
 	default:
 		words := strings.Split(api, ".")
 		if len(words) != 2 {
-			return "Invalid api format, expecting {plugin}.{api}"
+			return "Invalid api format, expecting {plugin}.{api}\n" + usage()
 		}
 		return doApi(api, args[1:]...)
 	}

diff --git a/data_omnisphere/config/paramdefs.json b/data_omnisphere/config/paramdefs.json
@@ -66,7 +66,7 @@
 
 "misc.cursorstyle": {"valuetype":"string", "min":"cursorstyle", "max":"cursorstyle", "init":"retrigger", "comment":"# Cursor playing style" },
 "misc.quantstyle": {"valuetype":"string", "min":"quantstyle", "max":"quantstyle", "init":"frets", "comment":"# Quantization style" },
-"misc.scale": {"valuetype":"string", "min":"scale", "max":"scale", "randmax":"newage", "init":"newage", "comment":"# Quantization style" },
+"misc.scale": {"valuetype":"string", "min":"scale", "max":"scale", "randmax":"newage", "init":"newage", "comment":"# scale name" },
 "misc.usescale": {"valuetype":"bool", "min":"false", "max":"true", "init":"true", "comment":"# Use Scale" },
 "misc.volstyle": {"valuetype":"string", "min":"volstyle", "max":"volstyle", "init":"pressure", "comment":"# Velocity style" },
 "misc.logic_sound": {"valuetype":"string", "min":"logic_sound", "max":"logic_sound", "init":"true", "comment":"# Sound Logic" },
@@ -77,7 +77,11 @@
 "misc.pitchfactor": {"valuetype": "float", "min": "0.1", "max": "10.0",  "init": "1.0",	"comment": "#" },
 "misc.generatesound": {"valuetype":"bool", "min":"false", "max":"true", "init":"true", "comment":"# Enable Sound" },
 "misc.generatevisual": {"valuetype":"bool", "min":"false", "max":"true", "init":"true", "comment":"# Enable Visual" },
+"misc.looping_fade": {"valuetype": "float", "min": "0.0", "max": "1.0",  "init": "0.5",	"comment": "# fade factor" },
+"misc.looping_on": {"valuetype":"bool", "min":"false", "max":"true", "init":"false", "comment":"# Looping is on" },
+"misc.looping_length": {"valuetype":"int", "min":"0", "max":"128", "init":"8", "comment":"# Loop length in beats" },
 
+"engine.oscoutput": {"valuetype":"bool", "min":"false", "max":"true", "init":"true", "comment":"#" },
 "engine.debug": {"valuetype":"string", "min":"debug", "max":"debug", "init":"", "comment":"# Debugging" },
 "engine.plugins": {"valuetype":"string", "min":"plugins", "max":"plugins", "init":"quadpro", "comment":"# Plugins to start" },
 "engine.guilevel": {"valuetype":"string", "min":"guilevel", "max":"guilevel", "init":"0", "comment":"# GUI level" },

diff --git a/data_omnisphere/config/paramenums.json b/data_omnisphere/config/paramenums.json
@@ -3,7 +3,7 @@
   "plugins": [ "", "quadpro" ],
   "guilevel": [ "0", "1", "2" ],
   "guiresize": [ "-800,0,800,1200", "100,100,800,1280", "" ],
-  "autostart": [ "gui,bidule,resolume", "bidule,resolume", "none" ],
+  "autostart": [ "gui", "none", "gui,bidule", "gui,resolume", "gui,bidule,resolume" ],
   "bidule": ["C:/Program Files/Plogue/Bidule/Bidule.exe", ""],
   "mmtt": ["kinect", "depthai", ""],
 	"destination": [ ".", "A", "B", "C", "D" ],

diff --git a/data_omnisphere/saved/patch/_Current.json b/data_omnisphere/saved/patch/_Current.json