From 1a84e922ca64839d097049be8b5ae91f936f41c1 Mon Sep 17 00:00:00 2001 From: mwinter Date: Wed, 12 Jul 2023 00:00:03 +0200 Subject: [PATCH] proper labels and resetting of mixer on tab change --- openstagecontrol/mixer.json | 2 +- openstagecontrol/mixer_transport.json | 115 +++++++++++++++++++------- openstagecontrol/transport.json | 2 +- 3 files changed, 85 insertions(+), 34 deletions(-) diff --git a/openstagecontrol/mixer.json b/openstagecontrol/mixer.json index 45fe378..7efd741 100644 --- a/openstagecontrol/mixer.json +++ b/openstagecontrol/mixer.json @@ -7,7 +7,7 @@ "top": 0, "left": 0, "lock": false, - "id": "@{parent.variables.piece}/mixer", + "id": "mixer/@{parent.variables.piece}", "visible": true, "interaction": true, "comments": "", diff --git a/openstagecontrol/mixer_transport.json b/openstagecontrol/mixer_transport.json index 539deaf..0884c25 100644 --- a/openstagecontrol/mixer_transport.json +++ b/openstagecontrol/mixer_transport.json @@ -49,7 +49,7 @@ "lock": false, "id": "main_panel", "visible": true, - "interaction": true, + "interaction": "VAR{editable, true}", "comments": "", "width": "100%", "height": "100%", @@ -87,7 +87,7 @@ "ignoreDefaults": false, "bypass": false, "onCreate": "", - "onValue": "", + "onValue": "const pieces = ['berger', 'robinson', 'penrose', 'ammann', 'kari', 'jaendel']\nvar piece = pieces[value]\n/*\nstateSet(stateGet('mixer/' + piece + '/volume'))\nstateSet(stateGet('mixer/' + piece + '/pan'))\nstateSet(stateGet('mixer/' + piece + '/mute'))\nstateSet(stateGet('mixer/' + piece + '/volume_master'))\n*/\nstateSet(stateGet('mixer/' + piece))", "widgets": [], "tabs": [ { @@ -172,7 +172,7 @@ "top": 0, "left": 0, "lock": false, - "id": "transport", + "id": "transport/berger", "visible": true, "interaction": true, "comments": "", @@ -237,7 +237,7 @@ "top": 0, "left": 0, "lock": false, - "id": "mixer", + "id": "mixer/berger", "visible": true, "interaction": true, "comments": "", @@ -252,9 +252,12 @@ "piece": "berger", "quantity": 6, "labels": [ - "a", - "b", - "d" + "3b", + "2b", + "1b", + "3a", + "2a", + "1a" ] } }, @@ -348,7 +351,7 @@ "top": 0, "left": 0, "lock": false, - "id": "transport", + "id": "transport/robinson", "visible": true, "interaction": true, "comments": "", @@ -413,7 +416,7 @@ "top": 0, "left": 0, "lock": false, - "id": "mixer", + "id": "mixer/robinson", "visible": true, "interaction": true, "comments": "", @@ -428,9 +431,14 @@ "piece": "robinson", "quantity": 8, "labels": [ - "a", - "b", - "d" + "8", + "7", + "6", + "5", + "4", + "3", + "2", + "1" ] } }, @@ -524,7 +532,7 @@ "top": 0, "left": 0, "lock": false, - "id": "transport", + "id": "transport/penrose", "visible": true, "interaction": true, "comments": "", @@ -589,7 +597,7 @@ "top": 0, "left": 0, "lock": false, - "id": "mixer", + "id": "mixer/penrose", "visible": true, "interaction": true, "comments": "", @@ -604,9 +612,12 @@ "piece": "penrose", "quantity": 6, "labels": [ - "a", - "b", - "d" + "6", + "5", + "4", + "3", + "2", + "1" ] } }, @@ -700,7 +711,7 @@ "top": 0, "left": 0, "lock": false, - "id": "transport", + "id": "transport/ammann", "visible": true, "interaction": true, "comments": "", @@ -765,7 +776,7 @@ "top": 0, "left": 0, "lock": false, - "id": "mixer", + "id": "mixer/ammann", "visible": true, "interaction": true, "comments": "", @@ -780,9 +791,14 @@ "piece": "ammann", "quantity": 8, "labels": [ - "a", - "b", - "d" + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" ] } }, @@ -876,7 +892,7 @@ "top": 0, "left": 0, "lock": false, - "id": "transport", + "id": "transport/kari", "visible": true, "interaction": true, "comments": "", @@ -941,7 +957,7 @@ "top": 0, "left": 0, "lock": false, - "id": "mixer", + "id": "mixer/kari", "visible": true, "interaction": true, "comments": "", @@ -956,9 +972,13 @@ "piece": "kari", "quantity": 7, "labels": [ - "a", - "b", - "d" + "noise", + "bass", + "ensemble 5", + "ensemble 4", + "ensemble 3", + "ensemble 2", + "ensemble 1" ] } }, @@ -1052,7 +1072,7 @@ "top": 0, "left": 0, "lock": false, - "id": "transport", + "id": "transport/jaendel", "visible": true, "interaction": true, "comments": "", @@ -1117,7 +1137,7 @@ "top": 0, "left": 0, "lock": false, - "id": "mixer", + "id": "mixer/jaendel", "visible": true, "interaction": true, "comments": "", @@ -1132,9 +1152,40 @@ "piece": "jaendel", "quantity": 32, "labels": [ - "a", - "b", - "d" + "1L", + "1R", + "2L", + "2R", + "3L", + "3R", + "4L", + "4R", + "5L", + "5R", + "6L", + "6R", + "7L", + "7R", + "8L", + "8R", + "9L", + "9R", + "10L", + "10R", + "11L", + "11R", + "12L", + "12R", + "13L", + "13R", + "14L", + "14R", + "15L", + "15R", + "16L", + "16R", + "17L", + "17R" ] } }, diff --git a/openstagecontrol/transport.json b/openstagecontrol/transport.json index 28229f2..dcb7805 100644 --- a/openstagecontrol/transport.json +++ b/openstagecontrol/transport.json @@ -336,7 +336,7 @@ "ignoreDefaults": false, "bypass": true, "onCreate": "", - "onValue": "console.log(\"tempo/\" + getProp(\"parent\", \"variables\").piece)\nif(value === 1){\n send(false, \"/transport\", 1, getProp(\"parent\", \"variables\").piece, get(\"measure\"), get(\"beat\"), get(\"tempo/\" + getProp(\"parent\", \"variables\").piece));\n} else {\n send(false, \"/transport\", 0, getProp(\"parent\", \"variables\").piece, get(\"measure\"), get(\"beat\"), get(\"tempo/\" + getProp(\"parent\", \"variables\").piece));\n}" + "onValue": "console.log(\"tempo/\" + getProp(\"parent\", \"variables\").piece)\nif(value === 1){\n //setVar('main_panel', 'editable', false)\n send(false, \"/transport\", 1, getProp(\"parent\", \"variables\").piece, get(\"measure\"), get(\"beat\"), get(\"tempo/\" + getProp(\"parent\", \"variables\").piece));\n} else {\n //setVar('main_panel', 'editable', true)\n send(false, \"/transport\", 0, getProp(\"parent\", \"variables\").piece, get(\"measure\"), get(\"beat\"), get(\"tempo/\" + getProp(\"parent\", \"variables\").piece));\n}" } ], "tabs": []