aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2018-02-18 21:38:10 +0100
committercbdev <cb@cbcdn.com>2018-02-18 21:38:10 +0100
commit0bf1abc7d0183206e51f620a5546f554683b1739 (patch)
tree9b2332388949414cf5a552dbed8400bc67efb56e
parentc583ba3961db8636f15252809209136f59dfc3a2 (diff)
parente789b856fa34597bb2078cefb3a43357633e66ea (diff)
downloadmidimonster-0bf1abc7d0183206e51f620a5546f554683b1739.tar.gz
midimonster-0bf1abc7d0183206e51f620a5546f554683b1739.tar.bz2
midimonster-0bf1abc7d0183206e51f620a5546f554683b1739.zip
Merge branch 'master' into uinputuinput
-rw-r--r--midimonster.c4
-rw-r--r--osc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/midimonster.c b/midimonster.c
index c8a0109..eb5510c 100644
--- a/midimonster.c
+++ b/midimonster.c
@@ -146,7 +146,7 @@ void fds_free(){
int mm_channel_event(channel* c, channel_value v){
size_t u, p;
-
+
//find mapped channels
for(u = 0; u < mappings; u++){
if(map[u].from == c){
@@ -305,7 +305,7 @@ int main(int argc, char** argv){
secondary->n = 0;
}
}
-
+
rv = EXIT_SUCCESS;
bail:
//free all data
diff --git a/osc.c b/osc.c
index 018e040..6bfd209 100644
--- a/osc.c
+++ b/osc.c
@@ -779,7 +779,7 @@ static int backend_start(){
}
}
- fprintf(stderr, "OSC backend registering %zu descriptors to core\n", fds);
+ fprintf(stderr, "OSC backend registered %zu descriptors to core\n", fds);
free(inst);
return 0;