audio.engine.test: cleanup using

[factor.git] / vm / mvm.cpp

diff --git a/vm/mvm.cpp b/vm/mvm.cpp
index dda2d66255b964ae739573ff40f01b2c87679a54..e2a85454f073198d84e636299f42591f0c868590 100644 (file)
--- a/vm/mvm.cpp
+++ b/vm/mvm.cpp
@@ -1,29 +1,31 @@
-#include "master.cpp"
+#include "master.hpp"
 
-namespace factor
-{
+namespace factor {
+
+std::map<THREADHANDLE, factor_vm*> thread_vms;
 
 struct startargs {
-       int argc;
-       vm_char **argv;
+  int argc;
+  vm_char** argv;
 };
 
 // arg must be new'ed because we're going to delete it!
-void *start_standalone_factor_thread(void *arg) 
-{
-       factor_vm *newvm = new_factor_vm();
-       startargs *args = (startargs*) arg;
-       int argc = args->argc; vm_char **argv = args->argv;
-       delete args;
-       newvm->start_standalone_factor(argc, argv);
-       return 0;
+void* start_standalone_factor_thread(void* arg) {
+  factor_vm* newvm = new_factor_vm();
+  startargs* args = (startargs*)arg;
+  int argc = args->argc;
+  vm_char** argv = args->argv;
+  delete args;
+  newvm->start_standalone_factor(argc, argv);
+  return 0;
 }
 
-VM_C_API THREADHANDLE start_standalone_factor_in_new_thread(int argc, vm_char **argv)
-{
-       startargs *args = new startargs;
-       args->argc = argc; args->argv = argv; 
-       return start_thread(start_standalone_factor_thread,args);
+VM_C_API THREADHANDLE start_standalone_factor_in_new_thread(int argc,
+                                                            vm_char** argv) {
+  startargs* args = new startargs;
+  args->argc = argc;
+  args->argv = argv;
+  return start_thread(start_standalone_factor_thread, args);
 }
 
 }