aboutsummaryrefslogtreecommitdiffhomepage
path: root/backends/maweb.c
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2019-08-12 20:58:04 +0200
committercbdev <cb@cbcdn.com>2019-08-12 20:58:04 +0200
commitbad0fdac1e725b4b2efbbbfff4cef74c2e05efb8 (patch)
tree4a600f429ed92efe2959e5a3b8c223e32e9d2b4c /backends/maweb.c
parentcc3aa7d8c1d680e75374a0c296a34d66a919f201 (diff)
downloadmidimonster-bad0fdac1e725b4b2efbbbfff4cef74c2e05efb8.tar.gz
midimonster-bad0fdac1e725b4b2efbbbfff4cef74c2e05efb8.tar.bz2
midimonster-bad0fdac1e725b4b2efbbbfff4cef74c2e05efb8.zip
Fix maweb button execs
Diffstat (limited to 'backends/maweb.c')
-rw-r--r--backends/maweb.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/backends/maweb.c b/backends/maweb.c
index be4c2ac..38d3d69 100644
--- a/backends/maweb.c
+++ b/backends/maweb.c
@@ -218,10 +218,15 @@ static channel* maweb_channel(instance* inst, char* spec){
next_token += 5;
}
else if(!strncmp(next_token, "button", 6)){
- ident.fields.type = exec_fader;
+ ident.fields.type = exec_button;
next_token += 6;
}
ident.fields.index = strtoul(next_token, NULL, 10);
+
+ //fix up the identifiers for button execs
+ if(ident.fields.index > 100){
+ ident.fields.index -= 100;
+ }
}
else{
for(n = 0; n < sizeof(cmdline_keys) / sizeof(char*); n++){
@@ -568,6 +573,26 @@ static int maweb_set(instance* inst, size_t num, channel** c, channel_value* v){
fprintf(stderr, "maweb out %s\n", xmit_buffer);
maweb_send_frame(inst, ws_text, (uint8_t*) xmit_buffer, strlen(xmit_buffer));
break;
+ case exec_button:
+ snprintf(xmit_buffer, sizeof(xmit_buffer),
+ "{\"requestType\":\"playbacks_userInput\","
+ //"\"cmdline\":\"\","
+ "\"execIndex\":%d,"
+ "\"pageIndex\":%d,"
+ "\"buttonId\":%d,"
+ "\"pressed\":%s,"
+ "\"released\":%s,"
+ "\"type\":0,"
+ "\"session\":%ld"
+ "}", ident.fields.index + 100,
+ ident.fields.page,
+ 0,
+ (v[n].normalised > 0.9) ? "true" : "false",
+ (v[n].normalised > 0.9) ? "false" : "true",
+ data->session);
+ fprintf(stderr, "maweb out %s\n", xmit_buffer);
+ maweb_send_frame(inst, ws_text, (uint8_t*) xmit_buffer, strlen(xmit_buffer));
+ break;
case cmdline_button:
snprintf(xmit_buffer, sizeof(xmit_buffer),
"{\"keyname\":\"%s\","