Merge branch 'master' into rtpmidi

1 files changed, 4 insertions, 21 deletions

diff --git a/backends/lua.c b/backends/lua.c
index 40e6613..2ce40f5 100644
--- a/backends/lua.c
+++ b/backends/lua.c
@@ -428,17 +428,10 @@ static int lua_handle(size_t num, managed_fd* fds){
 	return 0;
 }
 
-static int lua_start(){
-	size_t n, u, p;
-	instance** inst = NULL;
+static int lua_start(size_t n, instance** inst){
+	size_t u, p;
 	lua_instance_data* data = NULL;
 
-	//fetch all defined instances
-	if(mm_backend_instances(BACKEND_NAME, &n, &inst)){
-		fprintf(stderr, "Failed to fetch instance list\n");
-		return 1;
-	}
-
 	//resolve channels to their handler functions
 	for(u = 0; u < n; u++){
 		data = (lua_instance_data*) inst[u]->impl;
@@ -457,8 +450,6 @@ static int lua_start(){
 		}
 	}
 
-	free(inst);
-
 	#ifdef MMBACKEND_LUA_TIMERFD
 	//register the timer with the core
 	fprintf(stderr, "Lua backend registering 1 descriptor to core\n");
@@ -469,17 +460,10 @@ static int lua_start(){
 	return 0;
 }
 
-static int lua_shutdown(){
-	size_t n, u, p;
-	instance** inst = NULL;
+static int lua_shutdown(size_t n, instance** inst){
+	size_t u, p;
 	lua_instance_data* data = NULL;
 
-	//fetch all instances
-	if(mm_backend_instances(BACKEND_NAME, &n, &inst)){
-		fprintf(stderr, "Failed to fetch instance list\n");
-		return 1;
-	}
-
 	for(u = 0; u < n; u++){
 		data = (lua_instance_data*) inst[u]->impl;
 		//stop the interpreter
@@ -495,7 +479,6 @@ static int lua_shutdown(){
 		free(inst[u]->impl);
 	}
 
-	free(inst);
 	//free module-global data
 	free(timer);
 	timer = NULL;