aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/lua.c17
-rw-r--r--backends/lua.h2
-rw-r--r--backends/lua.md10
-rw-r--r--backends/python.c65
-rw-r--r--backends/python.h3
-rw-r--r--backends/python.md8
6 files changed, 77 insertions, 28 deletions
diff --git a/backends/lua.c b/backends/lua.c
index e7ba9f9..498a037 100644
--- a/backends/lua.c
+++ b/backends/lua.c
@@ -308,6 +308,11 @@ static int lua_configure_instance(instance* inst, char* option, char* value){
}
return 0;
}
+ else if(!strcmp(option, "default-handler")){
+ free(data->default_handler);
+ data->default_handler = strdup(value);
+ return 0;
+ }
LOGPF("Unknown instance configuration parameter %s for instance %s", option, inst->name);
return 1;
@@ -461,7 +466,8 @@ static int lua_start(size_t n, instance** inst){
data = (lua_instance_data*) inst[u]->impl;
for(p = 0; p < data->channels; p++){
//exclude reserved names
- if(strcmp(data->channel_name[p], "output")
+ if(!data->default_handler
+ && strcmp(data->channel_name[p], "output")
&& strcmp(data->channel_name[p], "input_value")
&& strcmp(data->channel_name[p], "output_value")
&& strcmp(data->channel_name[p], "input_channel")
@@ -473,6 +479,14 @@ static int lua_start(size_t n, instance** inst){
data->reference[p] = LUA_NOREF;
}
}
+ else if(data->default_handler){
+ lua_getglobal(data->interpreter, data->default_handler);
+ data->reference[p] = luaL_ref(data->interpreter, LUA_REGISTRYINDEX);
+ if(data->reference[p] == LUA_REFNIL){
+ data->reference[p] = LUA_NOREF;
+ LOGPF("Failed to resolve default handler function %s on instance %s", data->default_handler, inst[u]->name);
+ }
+ }
}
}
@@ -504,6 +518,7 @@ static int lua_shutdown(size_t n, instance** inst){
free(data->reference);
free(data->input);
free(data->output);
+ free(data->default_handler);
free(inst[u]->impl);
}
diff --git a/backends/lua.h b/backends/lua.h
index ebe2046..743f978 100644
--- a/backends/lua.h
+++ b/backends/lua.h
@@ -29,6 +29,8 @@ typedef struct /*_lua_instance_data*/ {
double* input;
double* output;
lua_State* interpreter;
+
+ char* default_handler;
} lua_instance_data;
typedef struct /*_lua_interval_callback*/ {
diff --git a/backends/lua.md b/backends/lua.md
index db4cf39..96e53c8 100644
--- a/backends/lua.md
+++ b/backends/lua.md
@@ -6,7 +6,8 @@ and manipulate events using the Lua scripting language.
Every instance has its own interpreter state which can be loaded with custom handler scripts.
To process incoming channel events, the MIDIMonster calls corresponding Lua functions (if they exist)
-with the value (as a Lua `number` type) as parameter.
+with the value (as a Lua `number` type) as parameter. Alternatively, a designated default channel handler
+may be supplied in the configuration.
The following functions are provided within the Lua interpreter for interaction with the MIDIMonster
@@ -42,9 +43,10 @@ The `lua` backend does not take any global configuration.
#### Instance configuration
-| Option | Example value | Default value | Description |
-|---------------|-----------------------|-----------------------|-----------------------|
-| `script` | `script.lua` | none | Lua source file (relative to configuration file)|
+| Option | Example value | Default value | Description |
+|-----------------------|-----------------------|-----------------------|-----------------------|
+| `script` | `script.lua` | none | Lua source file (relative to configuration file) |
+| `default-handler` | `handler` | none | Name of a function to be called as handler for all incoming channels (instead of the per-channel handlers) |
A single instance may have multiple `script` options specified, which will all be read cumulatively.
diff --git a/backends/python.c b/backends/python.c
index 70c2548..735e838 100644
--- a/backends/python.c
+++ b/backends/python.c
@@ -378,6 +378,11 @@ static int python_configure_instance(instance* inst, char* option, char* value){
PyEval_ReleaseThread(data->interpreter);
return 0;
}
+ else if(!strcmp(option, "default-handler")){
+ free(data->default_handler);
+ data->default_handler = strdup(value);
+ return 0;
+ }
LOGPF("Unknown instance parameter %s for instance %s", option, inst->name);
return 1;
@@ -600,38 +605,56 @@ static int python_handle(size_t num, managed_fd* fds){
return 0;
}
+static PyObject* python_resolve_symbol(char* spec_raw){
+ char* module_name = NULL, *object_name = NULL, *spec = strdup(spec_raw);
+ PyObject* module = NULL, *result = NULL;
+
+ module = PyImport_AddModule("__main__");
+ object_name = spec;
+ module_name = strchr(object_name, '.');
+ if(module_name){
+ *module_name = 0;
+ //returns borrowed reference
+ module = PyImport_AddModule(object_name);
+
+ if(!module){
+ LOGPF("Module %s for symbol %s.%s is not loaded", object_name, object_name, module_name + 1);
+ return NULL;
+ }
+
+ object_name = module_name + 1;
+
+ //returns new reference
+ result = PyObject_GetAttrString(module, object_name);
+ }
+
+ free(spec);
+ return result;
+}
+
static int python_start(size_t n, instance** inst){
python_instance_data* data = NULL;
- PyObject* module = NULL;
size_t u, p;
- char* module_name = NULL, *channel_name = NULL;
//resolve channel references to handler functions
for(u = 0; u < n; u++){
data = (python_instance_data*) inst[u]->impl;
+ DBGPF("Starting up instance %s", inst[u]->name);
//switch to interpreter
PyEval_RestoreThread(data->interpreter);
- for(p = 0; p < data->channels; p++){
- module = PyImport_AddModule("__main__");
- channel_name = data->channel[p].name;
- module_name = strchr(channel_name, '.');
- if(module_name){
- *module_name = 0;
- //returns borrowed reference
- module = PyImport_AddModule(channel_name);
-
- if(!module){
- LOGPF("Module %s for qualified channel %s.%s is not loaded on instance %s", channel_name, channel_name, module_name + 1, inst[u]->name);
- return 1;
- }
- *module_name = '.';
- channel_name = module_name + 1;
- }
+ if(data->default_handler){
+ data->handler = python_resolve_symbol(data->default_handler);
+ }
- //returns new reference
- data->channel[p].handler = PyObject_GetAttrString(module, channel_name);
+ for(p = 0; p < data->channels; p++){
+ if(!strchr(data->channel[p].name, '.') && data->handler){
+ data->channel[p].handler = data->handler;
+ }
+ else{
+ data->channel[p].handler = python_resolve_symbol(data->channel[p].name);
+ }
}
//release interpreter
@@ -654,6 +677,7 @@ static int python_shutdown(size_t n, instance** inst){
Py_XDECREF(data->channel[p].handler);
}
free(data->channel);
+ free(data->default_handler);
//do not free data here, needed for shutting down interpreters
}
@@ -675,6 +699,7 @@ static int python_shutdown(size_t n, instance** inst){
for(p = 0; p <intervals; p++){
Py_XDECREF(interval[p].reference);
}
+ Py_XDECREF(data->handler);
DBGPF("Shutting down interpreter for instance %s", inst[u]->name);
//swap to interpreter and end it, GIL is held after this but state is NULL
diff --git a/backends/python.h b/backends/python.h
index 8ca12f9..a40098b 100644
--- a/backends/python.h
+++ b/backends/python.h
@@ -41,4 +41,7 @@ typedef struct /*_python_instance_data*/ {
size_t channels;
mmpython_channel* channel;
mmpython_channel* current_channel;
+
+ char* default_handler;
+ PyObject* handler;
} python_instance_data;
diff --git a/backends/python.md b/backends/python.md
index f06e504..6852a79 100644
--- a/backends/python.md
+++ b/backends/python.md
@@ -6,6 +6,7 @@ to route, generate and manipulate channel events using the Python 3 scripting la
Every instance has its own interpreter, which can be loaded with multiple Python modules.
These modules may contain member functions accepting a single `float` parameter, which can
then be used as target channels. For each incoming event, the handler function is called.
+Channels in the global scope may be assigned a default handler function.
Python modules may also register `socket` objects (and an associated callback function) with
the MIDIMonster core, which will then alert the module when there is data ready to be read.
@@ -67,9 +68,10 @@ The `python` backend does not take any global configuration.
#### Instance configuration
-| Option | Example value | Default value | Description |
-|---------------|-----------------------|-----------------------|-----------------------------------------------|
-| `module` | `my_handlers.py` | none | (Path to) Python module source file, relative to configuration file location |
+| Option | Example value | Default value | Description |
+|-----------------------|-----------------------|-----------------------|-----------------------------------------------|
+| `module` | `my_handlers.py` | none | (Path to) Python module source file, relative to configuration file location |
+| `default-handler` | `mu_handlers.default` | none | Function to be called as handler for all top-level channels (not belonging to a module) |
A single instance may have multiple `module` options specified. This will make all handlers available within their
module namespaces (see the section on channel specification).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:26:39 +0000