diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | backends/Makefile | 8 | ||||
| -rw-r--r-- | backends/midi.c | 3 | ||||
| -rw-r--r-- | backends/osc.md | 2 | ||||
| -rw-r--r-- | backends/sacn.c | 2 |
5 files changed, 8 insertions, 9 deletions
@@ -101,7 +101,7 @@ install: install -m 0644 configs/* "$(DESTDIR)$(EXAMPLES)" ifdef DEFAULT_CFG # Only install the default configuration if it is not already present to avoid overwriting it -ifeq (,$(wildcard $(DEFAULT_CFG))) +ifeq (,$(wildcard $(DESTDIR)$(DEFAULT_CFG))) install -Dm 0644 monster.cfg "$(DESTDIR)$(DEFAULT_CFG)" endif endif diff --git a/backends/Makefile b/backends/Makefile index 35782ab..72ba776 100644 --- a/backends/Makefile +++ b/backends/Makefile @@ -18,11 +18,11 @@ SYSTEM := $(shell uname -s) # Generate debug symbols unless overridden CFLAGS ?= -g -CPPFLAGS ?= -g +CXXFLAGS ?= -g # All backends are shared libraries CFLAGS += -fPIC -I../ -Wall -Wpedantic -CPPFLAGS += -fPIC -I../ +CXXFLAGS += -fPIC -I../ LDFLAGS += -shared # Build Linux backends if possible @@ -82,7 +82,7 @@ midi.so: LDLIBS = -lasound evdev.so: CFLAGS += $(shell pkg-config --cflags libevdev || echo "-DBUILD_ERROR=\"Missing pkg-config data for libevdev\"") evdev.so: LDLIBS = $(shell pkg-config --libs libevdev || echo "-DBUILD_ERROR=\"Missing pkg-config data for libevdev\"") ola.so: LDLIBS = -lola -ola.so: CPPFLAGS += -Wno-write-strings +ola.so: CXXFLAGS += -std=c++11 -Wno-write-strings # The pkg-config name for liblua5.3 is subject to discussion. I prefer 'lua5.3' (which works on Debian and OSX), # but Arch requires 'lua53' which works on Debian, too, but breaks on OSX. @@ -108,7 +108,7 @@ python.dll: LDLIBS += -L../ -lpython3 $(CC) $(CFLAGS) $< $(ADDITIONAL_OBJS) -o $@ $(LDFLAGS) $(LDLIBS) %.so :: %.cpp %.h - $(CXX) $(CPPFLAGS) $< $(ADDITIONAL_OBJS) -o $@ $(LDFLAGS) $(LDLIBS) + $(CXX) $(CXXFLAGS) $< $(ADDITIONAL_OBJS) -o $@ $(LDFLAGS) $(LDLIBS) # This is the actual first named target, and thus the default all: $(BACKEND_LIB) $(BACKENDS) diff --git a/backends/midi.c b/backends/midi.c index 4bf846a..a5f953e 100644 --- a/backends/midi.c +++ b/backends/midi.c @@ -247,8 +247,7 @@ static int midi_set(instance* inst, size_t num, channel** c, channel_value* v){ } break; case pitchbend: - //TODO check whether this actually works that well - midi_tx(data->port, ident.fields.type, ident.fields.channel, ident.fields.control, (v[u].normalised * 16383.0) - 8192); + midi_tx(data->port, ident.fields.type, ident.fields.channel, ident.fields.control, (int16_t) (v[u].normalised * 16383.0) - 8192); break; default: midi_tx(data->port, ident.fields.type, ident.fields.channel, ident.fields.control, v[u].normalised * 127.0); diff --git a/backends/osc.md b/backends/osc.md index 61b3324..939c742 100644 --- a/backends/osc.md +++ b/backends/osc.md @@ -30,7 +30,7 @@ This is done by specifying *patterns* in the instance configuration using an ass ``` The pattern will be matched only against the local part (that is, the path excluding any configured instance root). -Patterns may contain the following expressions (conforming to the [OSC pattern matching specification](http://opensoundcontrol.org/spec-1_0)): +Patterns may contain the following expressions (conforming to the [OSC pattern matching specification](https://opensoundcontrol.stanford.edu/spec-1_0.html)): * `?` matches any single legal character * `*` matches zero or more legal characters * A comma-separated list of strings inside curly braces `{}` matches any of the strings diff --git a/backends/sacn.c b/backends/sacn.c index 4e01402..3c0cdab 100644 --- a/backends/sacn.c +++ b/backends/sacn.c @@ -314,7 +314,7 @@ static int sacn_transmit(instance* inst, sacn_output_universe* output){ .sequence = data->data.last_seq++, .options = 0, .universe = htobe16(data->uni), - .flags = htobe16(0x7000 | 0x0205), + .flags = htobe16(0x7000 | 0x020b), .vector = DMP_SET_PROPERTY, .format = 0xA1, .startcode_offset = 0, |