From 68f1a58f13997cf052241d6e1177dcbec9a109ec Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Sat, 29 Jun 2019 11:54:23 +0200
Subject: Update loopback backend to match API design

---
 backends/loopback.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'backends/loopback.c')

diff --git a/backends/loopback.c b/backends/loopback.c
index bb93a1f..083a312 100644
--- a/backends/loopback.c
+++ b/backends/loopback.c
@@ -6,14 +6,14 @@
 int init(){
 	backend loopback = {
 		.name = BACKEND_NAME,
-		.conf = backend_configure,
-		.create = backend_instance,
-		.conf_instance = backend_configure_instance,
-		.channel = backend_channel,
-		.handle = backend_set,
-		.process = backend_handle,
-		.start = backend_start,
-		.shutdown = backend_shutdown
+		.conf = loopback_configure,
+		.create = loopback_instance,
+		.conf_instance = loopback_configure_instance,
+		.channel = loopback_channel,
+		.handle = loopback_set,
+		.process = loopback_handle,
+		.start = loopback_start,
+		.shutdown = loopback_shutdown
 	};
 
 	//register backend
@@ -24,23 +24,23 @@ int init(){
 	return 0;
 }
 
-static int backend_configure(char* option, char* value){
+static int loopback_configure(char* option, char* value){
 	//intentionally ignored
 	return 0;
 }
 
-static int backend_configure_instance(instance* inst, char* option, char* value){
+static int loopback_configure_instance(instance* inst, char* option, char* value){
 	//intentionally ignored
 	return 0;
 }
 
-static instance* backend_instance(){
+static instance* loopback_instance(){
 	instance* i = mm_instance();
 	if(!i){
 		return NULL;
 	}
 
-	i->impl = calloc(1, sizeof(loopback_instance));
+	i->impl = calloc(1, sizeof(loopback_instance_data));
 	if(!i->impl){
 		fprintf(stderr, "Failed to allocate memory\n");
 		return NULL;
@@ -49,9 +49,9 @@ static instance* backend_instance(){
 	return i;
 }
 
-static channel* backend_channel(instance* inst, char* spec){
+static channel* loopback_channel(instance* inst, char* spec){
 	size_t u;
-	loopback_instance* data = (loopback_instance*) inst->impl;
+	loopback_instance_data* data = (loopback_instance_data*) inst->impl;
 
 	//find matching channel
 	for(u = 0; u < data->n; u++){
@@ -79,7 +79,7 @@ static channel* backend_channel(instance* inst, char* spec){
 	return mm_channel(inst, u, 1);
 }
 
-static int backend_set(instance* inst, size_t num, channel** c, channel_value* v){
+static int loopback_set(instance* inst, size_t num, channel** c, channel_value* v){
 	size_t n;
 	for(n = 0; n < num; n++){
 		mm_channel_event(c[n], v[n]);
@@ -87,19 +87,19 @@ static int backend_set(instance* inst, size_t num, channel** c, channel_value* v
 	return 0;
 }
 
-static int backend_handle(size_t num, managed_fd* fds){
+static int loopback_handle(size_t num, managed_fd* fds){
 	//no events generated here
 	return 0;
 }
 
-static int backend_start(){
+static int loopback_start(){
 	return 0;
 }
 
-static int backend_shutdown(){
+static int loopback_shutdown(){
 	size_t n, u, p;
 	instance** inst = NULL;
-	loopback_instance* data = NULL;
+	loopback_instance_data* data = NULL;
 
 	if(mm_backend_instances(BACKEND_NAME, &n, &inst)){
 		fprintf(stderr, "Failed to fetch instance list\n");
@@ -107,7 +107,7 @@ static int backend_shutdown(){
 	}
 
 	for(u = 0; u < n; u++){
-		data = (loopback_instance*) inst[u]->impl;
+		data = (loopback_instance_data*) inst[u]->impl;
 		for(p = 0; p < data->n; p++){
 			free(data->name[p]);
 		}
@@ -116,5 +116,7 @@ static int backend_shutdown(){
 	}
 
 	free(inst);
+
+	fprintf(stderr, "Loopback backend shut down\n");
 	return 0;
 }
-- 
cgit v1.2.3


From 1107a91861189d28d771d02d721d61b403aac38a Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Wed, 4 Dec 2019 01:21:14 +0100
Subject: Explicitly mark the backend init symbol visible

---
 backends/artnet.c   |  2 +-
 backends/artnet.h   |  2 +-
 backends/evdev.c    |  2 +-
 backends/evdev.h    |  2 +-
 backends/jack.c     |  4 +++-
 backends/jack.h     |  2 +-
 backends/loopback.c |  2 +-
 backends/loopback.h |  2 +-
 backends/lua.c      |  2 +-
 backends/lua.h      |  2 +-
 backends/maweb.c    |  2 +-
 backends/maweb.h    |  2 +-
 backends/midi.c     |  2 +-
 backends/midi.h     |  2 +-
 backends/ola.cpp    |  2 +-
 backends/ola.h      |  2 +-
 backends/osc.c      |  2 +-
 backends/osc.h      |  2 +-
 backends/sacn.c     |  2 +-
 backends/sacn.h     |  2 +-
 backends/winmidi.c  |  2 +-
 backends/winmidi.h  |  2 +-
 midimonster.h       | 10 ++++++++++
 23 files changed, 34 insertions(+), 22 deletions(-)

(limited to 'backends/loopback.c')

diff --git a/backends/artnet.c b/backends/artnet.c
index e01ac94..8a62a43 100644
--- a/backends/artnet.c
+++ b/backends/artnet.c
@@ -41,7 +41,7 @@ static int artnet_listener(char* host, char* port){
 	return 0;
 }
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend artnet = {
 		.name = BACKEND_NAME,
 		.conf = artnet_configure,
diff --git a/backends/artnet.h b/backends/artnet.h
index f5aa745..cce11d1 100644
--- a/backends/artnet.h
+++ b/backends/artnet.h
@@ -3,7 +3,7 @@
 #endif
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int artnet_configure(char* option, char* value);
 static int artnet_configure_instance(instance* instance, char* option, char* value);
 static instance* artnet_instance();
diff --git a/backends/evdev.c b/backends/evdev.c
index b19cda8..dd2231b 100644
--- a/backends/evdev.c
+++ b/backends/evdev.c
@@ -24,7 +24,7 @@ static struct {
 	.detect = 0
 };
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend evdev = {
 		.name = BACKEND_NAME,
 		.conf = evdev_configure,
diff --git a/backends/evdev.h b/backends/evdev.h
index 48bd0ab..30ce892 100644
--- a/backends/evdev.h
+++ b/backends/evdev.h
@@ -8,7 +8,7 @@
  * disabled by building with -DEVDEV_NO_UINPUT
  */
 
-int init();
+MM_PLUGIN_API int init();
 static int evdev_configure(char* option, char* value);
 static int evdev_configure_instance(instance* instance, char* option, char* value);
 static instance* evdev_instance();
diff --git a/backends/jack.c b/backends/jack.c
index b3aacd4..e8a63bc 100644
--- a/backends/jack.c
+++ b/backends/jack.c
@@ -4,6 +4,8 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#define DEBUG
+
 #include "jack.h"
 #include <jack/midiport.h>
 #include <jack/metadata.h>
@@ -27,7 +29,7 @@ static struct /*_mmjack_backend_cfg*/ {
 	.jack_shutdown = 0
 };
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend mmjack = {
 		.name = BACKEND_NAME,
 		.conf = mmjack_configure,
diff --git a/backends/jack.h b/backends/jack.h
index dd59cd2..5598042 100644
--- a/backends/jack.h
+++ b/backends/jack.h
@@ -2,7 +2,7 @@
 #include <jack/jack.h>
 #include <pthread.h>
 
-int init();
+MM_PLUGIN_API int init();
 static int mmjack_configure(char* option, char* value);
 static int mmjack_configure_instance(instance* inst, char* option, char* value);
 static instance* mmjack_instance();
diff --git a/backends/loopback.c b/backends/loopback.c
index 083a312..0a45bde 100644
--- a/backends/loopback.c
+++ b/backends/loopback.c
@@ -3,7 +3,7 @@
 
 #define BACKEND_NAME "loopback"
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend loopback = {
 		.name = BACKEND_NAME,
 		.conf = loopback_configure,
diff --git a/backends/loopback.h b/backends/loopback.h
index c73ca20..a08417b 100644
--- a/backends/loopback.h
+++ b/backends/loopback.h
@@ -1,6 +1,6 @@
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int loopback_configure(char* option, char* value);
 static int loopback_configure_instance(instance* inst, char* option, char* value);
 static instance* loopback_instance();
diff --git a/backends/lua.c b/backends/lua.c
index 3555e72..0b47b2c 100644
--- a/backends/lua.c
+++ b/backends/lua.c
@@ -19,7 +19,7 @@ static int timer_fd = -1;
 static uint64_t last_timestamp;
 #endif
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend lua = {
 		#ifndef MMBACKEND_LUA_TIMERFD
 		.interval = lua_interval,
diff --git a/backends/lua.h b/backends/lua.h
index f2583a8..e187a8e 100644
--- a/backends/lua.h
+++ b/backends/lua.h
@@ -9,7 +9,7 @@
 	#define MMBACKEND_LUA_TIMERFD
 #endif
 
-int init();
+MM_PLUGIN_API int init();
 static int lua_configure(char* option, char* value);
 static int lua_configure_instance(instance* inst, char* option, char* value);
 static instance* lua_instance();
diff --git a/backends/maweb.c b/backends/maweb.c
index c495512..08156f2 100644
--- a/backends/maweb.c
+++ b/backends/maweb.c
@@ -72,7 +72,7 @@ static maweb_command_key cmdline_keys[] = {
 	{"GO_MINUS_SMALL", 50}, {"PAUSE_SMALL", 51}, {"GO_PLUS_SMALL", 52}
 };
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend maweb = {
 		.name = BACKEND_NAME,
 		.conf = maweb_configure,
diff --git a/backends/maweb.h b/backends/maweb.h
index 14e4755..9091cda 100644
--- a/backends/maweb.h
+++ b/backends/maweb.h
@@ -1,6 +1,6 @@
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int maweb_configure(char* option, char* value);
 static int maweb_configure_instance(instance* inst, char* option, char* value);
 static instance* maweb_instance();
diff --git a/backends/midi.c b/backends/midi.c
index cde278b..f380f59 100644
--- a/backends/midi.c
+++ b/backends/midi.c
@@ -23,7 +23,7 @@ static struct {
 	.detect = 0
 };
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend midi = {
 		.name = BACKEND_NAME,
 		.conf = midi_configure,
diff --git a/backends/midi.h b/backends/midi.h
index 6c3fcf9..b9934f1 100644
--- a/backends/midi.h
+++ b/backends/midi.h
@@ -1,6 +1,6 @@
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int midi_configure(char* option, char* value);
 static int midi_configure_instance(instance* instance, char* option, char* value);
 static instance* midi_instance();
diff --git a/backends/ola.cpp b/backends/ola.cpp
index 632cef7..d069a8c 100644
--- a/backends/ola.cpp
+++ b/backends/ola.cpp
@@ -11,7 +11,7 @@
 static ola::io::SelectServer* ola_select = NULL;
 static ola::OlaCallbackClient* ola_client = NULL;
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend ola = {
 		.name = BACKEND_NAME,
 		.conf = ola_configure,
diff --git a/backends/ola.h b/backends/ola.h
index c943d52..1637495 100644
--- a/backends/ola.h
+++ b/backends/ola.h
@@ -4,7 +4,7 @@ extern "C" {
 	#undef min
 	#undef max
 
-	int init();
+	MM_PLUGIN_API int init();
 	static int ola_configure(char* option, char* value);
 	static int ola_configure_instance(instance* instance, char* option, char* value);
 	static instance* ola_instance();
diff --git a/backends/osc.c b/backends/osc.c
index bffbba8..d9f9139 100644
--- a/backends/osc.c
+++ b/backends/osc.c
@@ -19,7 +19,7 @@ static struct {
 	.detect = 0
 };
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend osc = {
 		.name = BACKEND_NAME,
 		.conf = osc_configure,
diff --git a/backends/osc.h b/backends/osc.h
index dd5afb0..86be285 100644
--- a/backends/osc.h
+++ b/backends/osc.h
@@ -7,7 +7,7 @@
 #define OSC_RECV_BUF 8192
 #define OSC_XMIT_BUF 8192
 
-int init();
+MM_PLUGIN_API int init();
 static int osc_configure(char* option, char* value);
 static int osc_configure_instance(instance* inst, char* option, char* value);
 static instance* osc_instance();
diff --git a/backends/sacn.c b/backends/sacn.c
index 6e1b20b..d8b3eb3 100644
--- a/backends/sacn.c
+++ b/backends/sacn.c
@@ -31,7 +31,7 @@ static struct /*_sacn_global_config*/ {
 	.last_announce = 0
 };
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend sacn = {
 		.name = BACKEND_NAME,
 		.conf = sacn_configure,
diff --git a/backends/sacn.h b/backends/sacn.h
index 7af2a36..631d3a4 100644
--- a/backends/sacn.h
+++ b/backends/sacn.h
@@ -1,6 +1,6 @@
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int sacn_configure(char* option, char* value);
 static int sacn_configure_instance(instance* instance, char* option, char* value);
 static instance* sacn_instance();
diff --git a/backends/winmidi.c b/backends/winmidi.c
index ffca3b4..bda5401 100644
--- a/backends/winmidi.c
+++ b/backends/winmidi.c
@@ -23,7 +23,7 @@ static struct {
 
 //TODO receive feedback socket until EAGAIN
 
-int init(){
+MM_PLUGIN_API int init(){
 	backend winmidi = {
 		.name = BACKEND_NAME,
 		.conf = winmidi_configure,
diff --git a/backends/winmidi.h b/backends/winmidi.h
index e4abda1..ffa6a26 100644
--- a/backends/winmidi.h
+++ b/backends/winmidi.h
@@ -1,6 +1,6 @@
 #include "midimonster.h"
 
-int init();
+MM_PLUGIN_API int init();
 static int winmidi_configure(char* option, char* value);
 static int winmidi_configure_instance(instance* inst, char* option, char* value);
 static instance* winmidi_instance();
diff --git a/midimonster.h b/midimonster.h
index 3922b03..1192d6a 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 
+/* API call attributes and visibilities */
 #ifndef MM_API
 	#ifdef _WIN32
 		#define MM_API __attribute__((dllimport))
@@ -13,6 +14,15 @@
 	#endif
 #endif
 
+/* Some build systems may apply the -fvisibility=hidden parameter from the core build to the backends, so mark the init function visible */
+#ifndef MM_PLUGIN_API
+	#ifdef _WIN32
+		#define MM_PLUGIN_API __attribute__((dllexport))
+	#else
+		#define MM_PLUGIN_API __attribute__((visibility ("default")))
+	#endif
+#endif
+
 /* Straight-forward min / max macros */
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 #define min(a,b) (((a) < (b)) ? (a) : (b))
-- 
cgit v1.2.3


From 3eada28582b144519e95a44ee3adc3f46d39036e Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Thu, 5 Dec 2019 21:05:14 +0100
Subject: Add flags parameter to channel parser plugin API (Fixes #31)

---
 backends/artnet.c   |  2 +-
 backends/artnet.h   |  2 +-
 backends/evdev.c    |  2 +-
 backends/evdev.h    |  2 +-
 backends/jack.c     |  2 +-
 backends/jack.h     |  2 +-
 backends/loopback.c |  2 +-
 backends/loopback.h |  2 +-
 backends/lua.c      |  2 +-
 backends/lua.h      |  2 +-
 backends/maweb.c    |  2 +-
 backends/maweb.h    |  2 +-
 backends/midi.c     |  2 +-
 backends/midi.h     |  2 +-
 backends/ola.cpp    |  2 +-
 backends/ola.h      |  2 +-
 backends/osc.c      |  2 +-
 backends/osc.h      |  2 +-
 backends/sacn.c     |  2 +-
 backends/sacn.h     |  2 +-
 backends/winmidi.c  |  2 +-
 backends/winmidi.h  |  2 +-
 config.c            |  8 ++++----
 midimonster.h       | 15 ++++++++++++---
 24 files changed, 38 insertions(+), 29 deletions(-)

(limited to 'backends/loopback.c')

diff --git a/backends/artnet.c b/backends/artnet.c
index 8a62a43..57eb7b1 100644
--- a/backends/artnet.c
+++ b/backends/artnet.c
@@ -156,7 +156,7 @@ static int artnet_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static channel* artnet_channel(instance* inst, char* spec){
+static channel* artnet_channel(instance* inst, char* spec, uint8_t flags){
 	artnet_instance_data* data = (artnet_instance_data*) inst->impl;
 	char* spec_next = spec;
 	unsigned chan_a = strtoul(spec, &spec_next, 10);
diff --git a/backends/artnet.h b/backends/artnet.h
index cce11d1..f6a6709 100644
--- a/backends/artnet.h
+++ b/backends/artnet.h
@@ -7,7 +7,7 @@ MM_PLUGIN_API int init();
 static int artnet_configure(char* option, char* value);
 static int artnet_configure_instance(instance* instance, char* option, char* value);
 static instance* artnet_instance();
-static channel* artnet_channel(instance* instance, char* spec);
+static channel* artnet_channel(instance* instance, char* spec, uint8_t flags);
 static int artnet_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int artnet_handle(size_t num, managed_fd* fds);
 static int artnet_start();
diff --git a/backends/evdev.c b/backends/evdev.c
index dd2231b..0da5ae6 100644
--- a/backends/evdev.c
+++ b/backends/evdev.c
@@ -249,7 +249,7 @@ static int evdev_configure_instance(instance* inst, char* option, char* value) {
 	return 1;
 }
 
-static channel* evdev_channel(instance* inst, char* spec){
+static channel* evdev_channel(instance* inst, char* spec, uint8_t flags){
 #ifndef EVDEV_NO_UINPUT
 	evdev_instance_data* data = (evdev_instance_data*) inst->impl;
 #endif
diff --git a/backends/evdev.h b/backends/evdev.h
index 30ce892..6504416 100644
--- a/backends/evdev.h
+++ b/backends/evdev.h
@@ -12,7 +12,7 @@ MM_PLUGIN_API int init();
 static int evdev_configure(char* option, char* value);
 static int evdev_configure_instance(instance* instance, char* option, char* value);
 static instance* evdev_instance();
-static channel* evdev_channel(instance* instance, char* spec);
+static channel* evdev_channel(instance* instance, char* spec, uint8_t flags);
 static int evdev_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int evdev_handle(size_t num, managed_fd* fds);
 static int evdev_start();
diff --git a/backends/jack.c b/backends/jack.c
index 926f800..e7bed04 100644
--- a/backends/jack.c
+++ b/backends/jack.c
@@ -409,7 +409,7 @@ static int mmjack_parse_midispec(mmjack_channel_ident* ident, char* spec){
 	return 0;
 }
 
-static channel* mmjack_channel(instance* inst, char* spec){
+static channel* mmjack_channel(instance* inst, char* spec, uint8_t flags){
 	mmjack_instance_data* data = (mmjack_instance_data*) inst->impl;
 	mmjack_channel_ident ident = {
 		.label = 0
diff --git a/backends/jack.h b/backends/jack.h
index 5598042..a7f3e8b 100644
--- a/backends/jack.h
+++ b/backends/jack.h
@@ -6,7 +6,7 @@ MM_PLUGIN_API int init();
 static int mmjack_configure(char* option, char* value);
 static int mmjack_configure_instance(instance* inst, char* option, char* value);
 static instance* mmjack_instance();
-static channel* mmjack_channel(instance* inst, char* spec);
+static channel* mmjack_channel(instance* inst, char* spec, uint8_t flags);
 static int mmjack_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int mmjack_handle(size_t num, managed_fd* fds);
 static int mmjack_start();
diff --git a/backends/loopback.c b/backends/loopback.c
index 0a45bde..41e6f85 100644
--- a/backends/loopback.c
+++ b/backends/loopback.c
@@ -49,7 +49,7 @@ static instance* loopback_instance(){
 	return i;
 }
 
-static channel* loopback_channel(instance* inst, char* spec){
+static channel* loopback_channel(instance* inst, char* spec, uint8_t flags){
 	size_t u;
 	loopback_instance_data* data = (loopback_instance_data*) inst->impl;
 
diff --git a/backends/loopback.h b/backends/loopback.h
index a08417b..ee51c66 100644
--- a/backends/loopback.h
+++ b/backends/loopback.h
@@ -4,7 +4,7 @@ MM_PLUGIN_API int init();
 static int loopback_configure(char* option, char* value);
 static int loopback_configure_instance(instance* inst, char* option, char* value);
 static instance* loopback_instance();
-static channel* loopback_channel(instance* inst, char* spec);
+static channel* loopback_channel(instance* inst, char* spec, uint8_t flags);
 static int loopback_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int loopback_handle(size_t num, managed_fd* fds);
 static int loopback_start();
diff --git a/backends/lua.c b/backends/lua.c
index 0b47b2c..40e6613 100644
--- a/backends/lua.c
+++ b/backends/lua.c
@@ -330,7 +330,7 @@ static instance* lua_instance(){
 	return inst;
 }
 
-static channel* lua_channel(instance* inst, char* spec){
+static channel* lua_channel(instance* inst, char* spec, uint8_t flags){
 	size_t u;
 	lua_instance_data* data = (lua_instance_data*) inst->impl;
 
diff --git a/backends/lua.h b/backends/lua.h
index e187a8e..4ea5b0a 100644
--- a/backends/lua.h
+++ b/backends/lua.h
@@ -13,7 +13,7 @@ MM_PLUGIN_API int init();
 static int lua_configure(char* option, char* value);
 static int lua_configure_instance(instance* inst, char* option, char* value);
 static instance* lua_instance();
-static channel* lua_channel(instance* inst, char* spec);
+static channel* lua_channel(instance* inst, char* spec, uint8_t flags);
 static int lua_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int lua_handle(size_t num, managed_fd* fds);
 static int lua_start();
diff --git a/backends/maweb.c b/backends/maweb.c
index 08156f2..d008cc0 100644
--- a/backends/maweb.c
+++ b/backends/maweb.c
@@ -229,7 +229,7 @@ static instance* maweb_instance(){
 	return inst;
 }
 
-static channel* maweb_channel(instance* inst, char* spec){
+static channel* maweb_channel(instance* inst, char* spec, uint8_t flags){
 	maweb_instance_data* data = (maweb_instance_data*) inst->impl;
 	maweb_channel_data chan = {
 		0
diff --git a/backends/maweb.h b/backends/maweb.h
index 9091cda..05095f8 100644
--- a/backends/maweb.h
+++ b/backends/maweb.h
@@ -4,7 +4,7 @@ MM_PLUGIN_API int init();
 static int maweb_configure(char* option, char* value);
 static int maweb_configure_instance(instance* inst, char* option, char* value);
 static instance* maweb_instance();
-static channel* maweb_channel(instance* inst, char* spec);
+static channel* maweb_channel(instance* inst, char* spec, uint8_t flags);
 static int maweb_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int maweb_handle(size_t num, managed_fd* fds);
 static int maweb_start();
diff --git a/backends/midi.c b/backends/midi.c
index f380f59..92776ca 100644
--- a/backends/midi.c
+++ b/backends/midi.c
@@ -110,7 +110,7 @@ static int midi_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static channel* midi_channel(instance* inst, char* spec){
+static channel* midi_channel(instance* inst, char* spec, uint8_t flags){
 	midi_channel_ident ident = {
 		.label = 0
 	};
diff --git a/backends/midi.h b/backends/midi.h
index b9934f1..4e16f90 100644
--- a/backends/midi.h
+++ b/backends/midi.h
@@ -4,7 +4,7 @@ MM_PLUGIN_API int init();
 static int midi_configure(char* option, char* value);
 static int midi_configure_instance(instance* instance, char* option, char* value);
 static instance* midi_instance();
-static channel* midi_channel(instance* instance, char* spec);
+static channel* midi_channel(instance* instance, char* spec, uint8_t flags);
 static int midi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int midi_handle(size_t num, managed_fd* fds);
 static int midi_start();
diff --git a/backends/ola.cpp b/backends/ola.cpp
index d069a8c..c13e8f9 100644
--- a/backends/ola.cpp
+++ b/backends/ola.cpp
@@ -68,7 +68,7 @@ static int ola_configure_instance(instance* inst, char* option, char* value){
 	return 1;
 }
 
-static channel* ola_channel(instance* inst, char* spec){
+static channel* ola_channel(instance* inst, char* spec, uint8_t flags){
 	ola_instance_data* data = (ola_instance_data*) inst->impl;
 	char* spec_next = spec;
 	unsigned chan_a = strtoul(spec, &spec_next, 10);
diff --git a/backends/ola.h b/backends/ola.h
index 1637495..0c42bac 100644
--- a/backends/ola.h
+++ b/backends/ola.h
@@ -8,7 +8,7 @@ extern "C" {
 	static int ola_configure(char* option, char* value);
 	static int ola_configure_instance(instance* instance, char* option, char* value);
 	static instance* ola_instance();
-	static channel* ola_channel(instance* instance, char* spec);
+	static channel* ola_channel(instance* instance, char* spec, uint8_t flags);
 	static int ola_set(instance* inst, size_t num, channel** c, channel_value* v);
 	static int ola_handle(size_t num, managed_fd* fds);
 	static int ola_start();
diff --git a/backends/osc.c b/backends/osc.c
index d9f9139..757ad89 100644
--- a/backends/osc.c
+++ b/backends/osc.c
@@ -577,7 +577,7 @@ static instance* osc_instance(){
 	return inst;
 }
 
-static channel* osc_map_channel(instance* inst, char* spec){
+static channel* osc_map_channel(instance* inst, char* spec, uint8_t flags){
 	size_t u, p;
 	osc_instance_data* data = (osc_instance_data*) inst->impl;
 	osc_channel_ident ident = {
diff --git a/backends/osc.h b/backends/osc.h
index 86be285..6f3b923 100644
--- a/backends/osc.h
+++ b/backends/osc.h
@@ -11,7 +11,7 @@ MM_PLUGIN_API int init();
 static int osc_configure(char* option, char* value);
 static int osc_configure_instance(instance* inst, char* option, char* value);
 static instance* osc_instance();
-static channel* osc_map_channel(instance* inst, char* spec);
+static channel* osc_map_channel(instance* inst, char* spec, uint8_t flags);
 static int osc_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int osc_handle(size_t num, managed_fd* fds);
 static int osc_start();
diff --git a/backends/sacn.c b/backends/sacn.c
index d8b3eb3..2229b8a 100644
--- a/backends/sacn.c
+++ b/backends/sacn.c
@@ -198,7 +198,7 @@ static instance* sacn_instance(){
 	return inst;
 }
 
-static channel* sacn_channel(instance* inst, char* spec){
+static channel* sacn_channel(instance* inst, char* spec, uint8_t flags){
 	sacn_instance_data* data = (sacn_instance_data*) inst->impl;
 	char* spec_next = spec;
 
diff --git a/backends/sacn.h b/backends/sacn.h
index 631d3a4..1d3268c 100644
--- a/backends/sacn.h
+++ b/backends/sacn.h
@@ -4,7 +4,7 @@ MM_PLUGIN_API int init();
 static int sacn_configure(char* option, char* value);
 static int sacn_configure_instance(instance* instance, char* option, char* value);
 static instance* sacn_instance();
-static channel* sacn_channel(instance* instance, char* spec);
+static channel* sacn_channel(instance* instance, char* spec, uint8_t flags);
 static int sacn_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int sacn_handle(size_t num, managed_fd* fds);
 static int sacn_start();
diff --git a/backends/winmidi.c b/backends/winmidi.c
index b274c06..790257b 100644
--- a/backends/winmidi.c
+++ b/backends/winmidi.c
@@ -110,7 +110,7 @@ static instance* winmidi_instance(){
 	return i;
 }
 
-static channel* winmidi_channel(instance* inst, char* spec){
+static channel* winmidi_channel(instance* inst, char* spec, uint8_t flags){
 	char* next_token = NULL;
 	winmidi_channel_ident ident = {
 		.label = 0
diff --git a/backends/winmidi.h b/backends/winmidi.h
index 8c2d76b..985c46a 100644
--- a/backends/winmidi.h
+++ b/backends/winmidi.h
@@ -4,7 +4,7 @@ MM_PLUGIN_API int init();
 static int winmidi_configure(char* option, char* value);
 static int winmidi_configure_instance(instance* inst, char* option, char* value);
 static instance* winmidi_instance();
-static channel* winmidi_channel(instance* inst, char* spec);
+static channel* winmidi_channel(instance* inst, char* spec, uint8_t flags);
 static int winmidi_set(instance* inst, size_t num, channel** c, channel_value* v);
 static int winmidi_handle(size_t num, managed_fd* fds);
 static int winmidi_start();
diff --git a/config.c b/config.c
index 8e7e581..0b9173e 100644
--- a/config.c
+++ b/config.c
@@ -175,7 +175,7 @@ static int config_glob_scan(instance* inst, channel_spec* spec){
 	return 0;
 }
 
-static channel* config_glob_resolve(instance* inst, channel_spec* spec, uint64_t n){
+static channel* config_glob_resolve(instance* inst, channel_spec* spec, uint64_t n, uint8_t map_direction){
 	size_t glob = 0, glob_length;
 	ssize_t bytes = 0;
 	uint64_t current_value = 0;
@@ -216,7 +216,7 @@ static channel* config_glob_resolve(instance* inst, channel_spec* spec, uint64_t
 		}
 	}
 
-	result = inst->backend->channel(inst, resolved_spec);
+	result = inst->backend->channel(inst, resolved_spec, map_direction);
 	if(spec->globs && !result){
 		fprintf(stderr, "Failed to match multichannel evaluation %s to a channel\n", resolved_spec);
 	}
@@ -294,8 +294,8 @@ static int config_map(char* to_raw, char* from_raw){
 	//iterate, resolve globs and map
 	rv = 0;
 	for(n = 0; !rv && n < max(spec_from.channels, spec_to.channels); n++){
-		channel_from = config_glob_resolve(instance_from, &spec_from, min(n, spec_from.channels));
-		channel_to = config_glob_resolve(instance_to, &spec_to, min(n, spec_to.channels));
+		channel_from = config_glob_resolve(instance_from, &spec_from, min(n, spec_from.channels), mmchannel_input);
+		channel_to = config_glob_resolve(instance_to, &spec_to, min(n, spec_to.channels), mmchannel_output);
 		
 		if(!channel_from || !channel_to){
 			rv = 1;
diff --git a/midimonster.h b/midimonster.h
index 1192d6a..5ce0c73 100644
--- a/midimonster.h
+++ b/midimonster.h
@@ -87,8 +87,11 @@ struct _managed_fd;
  * 		Parse instance configuration from the user-supplied configuration
  * 		file. Returning a non-zero value fails config parsing.
  * 	* mmbackend_channel
- * 		Parse a channel-spec to be mapped to/from. Returning NULL signals an
- * 		out-of-memory condition and terminates the program.
+ * 		Parse a channel-spec to be mapped to/from. The `falgs` parameter supplies
+ * 		additional information to the parser, such as whether the channel is being
+ * 		queried for use as input (to the MIDIMonster core) and/or output
+ * 		(from the MIDIMonster core) channel (on a per-query basis).
+ * 		Returning NULL signals an out-of-memory condition and terminates the program.
  * 	* mmbackend_start
  * 		Called after all instances have been created and all mappings
  * 		have been set up. Only backends for which instances have been configured
@@ -121,7 +124,7 @@ struct _managed_fd;
  */
 typedef int (*mmbackend_handle_event)(struct _backend_instance* inst, size_t channels, struct _backend_channel** c, struct _channel_value* v);
 typedef struct _backend_instance* (*mmbackend_create_instance)();
-typedef struct _backend_channel* (*mmbackend_parse_channel)(struct _backend_instance* instance, char* spec);
+typedef struct _backend_channel* (*mmbackend_parse_channel)(struct _backend_instance* instance, char* spec, uint8_t flags);
 typedef void (*mmbackend_free_channel)(struct _backend_channel* c);
 typedef int (*mmbackend_configure)(char* option, char* value);
 typedef int (*mmbackend_configure_instance)(struct _backend_instance* instance, char* option, char* value);
@@ -130,6 +133,12 @@ typedef int (*mmbackend_start)();
 typedef uint32_t (*mmbackend_interval)();
 typedef int (*mmbackend_shutdown)();
 
+/* Bit masks for the `flags` parameter to mmbackend_parse_channel */
+typedef enum {
+	mmchannel_input = 0x1,
+	mmchannel_output = 0x2
+} mmbe_channel_flags;
+
 /* Channel event value, .normalised is used by backends to determine channel values */
 typedef struct _channel_value {
 	union {
-- 
cgit v1.2.3