clean up wrapper, minimize heap alloc

1 files changed, 9 insertions, 24 deletions

diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp
index 3643eb5..45647e8 100644
--- a/wrapper/wrapper.hpp
+++ b/wrapper/wrapper.hpp
@@ -1,43 +1,33 @@
 #pragma once
 
-#include <iostream>
-
 #include "wrapper_io.hpp"
 
-using namespace rawaccel;
 using namespace System;
 
 public ref class ManagedAccel
 {
-protected:
-	mouse_modifier* modifier_instance;
-    wrapper_io* driverWriter;
+	mouse_modifier* const modifier_instance;
+
 public:
-	ManagedAccel(mouse_modifier* accel)
-		: modifier_instance(accel)
-	{
-        driverWriter = new wrapper_io();
-	}
 
-    ManagedAccel(System::IntPtr args)
-    {
-        modifier_instance = new mouse_modifier(*reinterpret_cast<modifier_args*>(args.ToPointer()));
-        driverWriter = new wrapper_io();
-	}
+    ManagedAccel(System::IntPtr args) : 
+        modifier_instance(new mouse_modifier(*reinterpret_cast<modifier_args*>(args.ToPointer())))
+    {}
 
     // Empty constructor needed for serialization
-    ManagedAccel() {}
+    ManagedAccel() : modifier_instance(nullptr) {}
 
     virtual ~ManagedAccel()
     {
-        if (modifier_instance!= nullptr)
+        if (modifier_instance != nullptr)
         {
             delete modifier_instance;
         }
     }
+
     !ManagedAccel()
     {
-        if (modifier_instance!= nullptr)
+        if (modifier_instance != nullptr)
         {
             delete modifier_instance;
         }
@@ -60,10 +50,6 @@ public:
     property double Midpoint { double get(); }
     property double MinimumTime { double get(); }
     property double PowerScale { double get(); }
-    mouse_modifier* GetInstance()
-    {
-        return modifier_instance;
-    }
 
     Tuple<double, double>^ Accelerate(int x, int y, double time);
 
@@ -82,7 +68,6 @@ public:
         double midpoint,
         double gain_cap);
 
-
     void WriteToDriver();
 
     void ReadFromDriver();