aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--README.md1
-rw-r--r--backends/mqtt.md4
-rw-r--r--backends/osc.c3
-rw-r--r--backends/osc.md2
-rw-r--r--core/backend.c (renamed from backend.c)0
-rw-r--r--core/backend.h (renamed from backend.h)0
-rw-r--r--core/config.c (renamed from config.c)0
-rw-r--r--core/config.h (renamed from config.h)0
-rw-r--r--core/plugin.c (renamed from plugin.c)0
-rw-r--r--core/plugin.h (renamed from plugin.h)0
11 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index bda7bb1..9b95f1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
.PHONY: all clean run sanitize backends windows full backends-full install
-OBJS = config.o backend.o plugin.o
+OBJS = core/config.o core/backend.o core/plugin.o
PREFIX ?= /usr
PLUGIN_INSTALL = $(PREFIX)/lib/midimonster
@@ -11,7 +11,7 @@ GITVERSION = $(shell git describe)
CFLAGS ?= -g -Wall -Wpedantic
#CFLAGS += -DDEBUG
# Hide all non-API symbols for export
-CFLAGS += -fvisibility=hidden
+CFLAGS += -fvisibility=hidden -I./
midimonster: LDLIBS = -ldl
# Replace version string with current git-describe if possible
diff --git a/README.md b/README.md
index 2379691..f958b25 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
# The MIDIMonster
<img align="right" src="/MIDIMonster.svg?raw=true&sanitize=true" alt="MIDIMonster Logo" width="20%">
-[![Build Status](https://travis-ci.com/cbdevnet/midimonster.svg?branch=master)](https://travis-ci.com/cbdevnet/midimonster)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/15168/badge.svg)](https://scan.coverity.com/projects/15168)
[![IRC Channel](https://static.midimonster.net/hackint-badge.svg)](https://webirc.hackint.org/#irc://irc.hackint.org/#midimonster)
diff --git a/backends/mqtt.md b/backends/mqtt.md
index 6623438..85784ef 100644
--- a/backends/mqtt.md
+++ b/backends/mqtt.md
@@ -1,6 +1,6 @@
### The `mqtt` backend
-This backend provides input from and output to an message queueing telemetry transport (MQTT)
+This backend provides input from and output to a message queueing telemetry transport (MQTT)
broker. The MQTT protocol is used in lightweight sensor/actor applications, a wide selection
of smart home implementations and as a generic message bus in many other domains.
@@ -18,7 +18,7 @@ This backend does not take any global configuration.
| `host` | `mqtt://10.23.23.1` | none | Host or URI of the MQTT broker |
| `user` | `midimonster` | none | User name for broker authentication |
| `password` | `mm` | none | Password for broker authentication |
-| `clientid` | `MM-main` | random | MQTT client identifier (generated randomly at start) |
+| `clientid` | `MM-main` | random | MQTT client identifier (generated randomly at start if unset) |
| `protocol` | `3.1.1` | `5` | MQTT protocol version (`5` or `3.1.1`) to use for the connection |
The `host` option can be specified as an URI of the form `mqtt[s]://[username][:password]@host.domain[:port]`.
diff --git a/backends/osc.c b/backends/osc.c
index 5887a50..e8673bb 100644
--- a/backends/osc.c
+++ b/backends/osc.c
@@ -1,4 +1,5 @@
#define BACKEND_NAME "osc"
+//#define DEBUG
#include <string.h>
#include <ctype.h>
@@ -629,7 +630,7 @@ static channel* osc_map_channel(instance* inst, char* spec, uint8_t flags){
data->channel[u].out = calloc(data->channel[u].params, sizeof(osc_parameter_value));
}
else if(data->patterns){
- LOGPF("No pattern match found for %s", spec);
+ LOGPF("No preconfigured pattern match found for %s", spec);
}
if(!data->channel[u].path
diff --git a/backends/osc.md b/backends/osc.md
index 1446e06..61b3324 100644
--- a/backends/osc.md
+++ b/backends/osc.md
@@ -78,7 +78,7 @@ configuration.
#### Supported types & value ranges
OSC allows controls to have individual value ranges and supports different parameter types.
-The following types are currently supported by the MIDImonster:
+The following types are currently supported by the MIDIMonster:
* **i**: 32-bit signed integer
* **f**: 32-bit IEEE floating point
diff --git a/backend.c b/core/backend.c
index 16e095c..16e095c 100644
--- a/backend.c
+++ b/core/backend.c
diff --git a/backend.h b/core/backend.h
index 6a69508..6a69508 100644
--- a/backend.h
+++ b/core/backend.h
diff --git a/config.c b/core/config.c
index c1c3124..c1c3124 100644
--- a/config.c
+++ b/core/config.c
diff --git a/config.h b/core/config.h
index b96a866..b96a866 100644
--- a/config.h
+++ b/core/config.h
diff --git a/plugin.c b/core/plugin.c
index e7d8eba..e7d8eba 100644
--- a/plugin.c
+++ b/core/plugin.c
diff --git a/plugin.h b/core/plugin.h
index 64c557f..64c557f 100644
--- a/plugin.h
+++ b/core/plugin.h