aboutsummaryrefslogtreecommitdiffhomepage
path: root/backends
diff options
context:
space:
mode:
Diffstat (limited to 'backends')
-rw-r--r--backends/maweb.c1
-rw-r--r--backends/maweb.md13
-rw-r--r--backends/midi.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/backends/maweb.c b/backends/maweb.c
index be356d0..450c388 100644
--- a/backends/maweb.c
+++ b/backends/maweb.c
@@ -121,7 +121,6 @@ static int channel_comparator(const void* raw_a, const void* raw_b){
return a->index - b->index;
}
return a->type - b->type;
-
}
//if either one is not an exec, sort by type first, index second
if(a->type != b->type){
diff --git a/backends/maweb.md b/backends/maweb.md
index a18cde4..5b996a9 100644
--- a/backends/maweb.md
+++ b/backends/maweb.md
@@ -2,7 +2,8 @@
This backend connects directly with the integrated *MA Web Remote* of MA Lighting consoles and OnPC
instances (GrandMA2 / GrandMA2 OnPC / GrandMA Dot2 / GrandMA Dot2 OnPC).
-It grants read-write access to the console's playback controls as well as write access to the command line.
+It grants read-write access to the console's playback controls as well as write access to most command
+line and control keys.
#### Setting up the console
@@ -30,10 +31,10 @@ Web Remote. Set a web remote password using the option below the activation sett
The per-instance command line mode may be one of `remote`, `console` or `downgrade`. The first option handles
command keys with a "virtual" commandline belonging to the Web Remote connection. Any commands entered are
-not visible on the main console. The `console` mode is only available with GrandMA2 remotes and injects the
-key events into the main console's command line. When connected to a dot2 console, the use of commandline keys
-will not be possible. With the `downgrade` mode, keys are handled on the console if possible, falling back to
-remote handling if not.
+not visible on the main console. The `console` mode is only available with GrandMA2 remotes and injects key events
+into the main console. This mode also supports additional hardkeys that are only available on GrandMA consoles.
+When connected to a dot2 console while this mode is active, the use of commandline keys will not be possible.
+With the `downgrade` mode, keys are handled on the console if possible, falling back to remote handling if not.
#### Channel specification
@@ -101,7 +102,7 @@ The following keys are mappable in all commandline modes and work on all console
| `CUE` | `EXEC` | `FIXTURE` | `GROUP` | `GO_MINUS` | `PAUSE` |
| `GO_PLUS` | | | | | |
-The following keys only work in the `remote` or `downgrade` commandline mode, but on all consoles
+The following keys only work when keys are being handled with a virtual command line
| Web | Remote | specific | | |
|---------------|-----------------------|-------------------------------|---------------|-----------------------|
diff --git a/backends/midi.c b/backends/midi.c
index 65ce48a..d9ac698 100644
--- a/backends/midi.c
+++ b/backends/midi.c
@@ -358,7 +358,7 @@ static int midi_start(){
//connect to the sequencer
if(snd_seq_open(&sequencer, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0){
fprintf(stderr, "Failed to open ALSA sequencer\n");
- return 0;
+ goto bail;
}
snd_seq_nonblock(sequencer, 1);
@@ -367,7 +367,7 @@ static int midi_start(){
//update the sequencer client name
if(snd_seq_set_client_name(sequencer, sequencer_name ? sequencer_name : "MIDIMonster") < 0){
fprintf(stderr, "Failed to set MIDI client name to %s\n", sequencer_name);
- return 1;
+ goto bail;
}
//create all ports