1 files changed, 10 insertions, 67 deletions
diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index d6f7990..37f67f8 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -15,48 +15,6 @@ using grapher.Models.Serialized;
 
 namespace grapher
 {
-    public enum accel_mode 
-    {
-        linear=1, classic, natural, logarithmic, sigmoid, power, naturalgain, sigmoidgain, noaccel
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct vec2d 
-    {
-        public double x;
-        public double y;
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct accel_args
-    {
-        public double offset;
-        public double accel;
-        public double limit;
-        public double exponent;
-        public double midpoint;
-        public double power_scale;
-        public double gain_cap;
-        public vec2d weight;
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct accel_fn_args
-    {
-        public accel_args acc_args;
-        public int accel_mode;
-        public double time_min;
-        public vec2d cap;
-    }
-
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct modifier_args
-    {
-        public double degrees;
-        public vec2d sens;
-        public accel_fn_args acc_fn_args;
-    }
-
     public partial class RawAcceleration : Form
     {
 
@@ -66,32 +24,17 @@ namespace grapher
         public RawAcceleration()
         {
             InitializeComponent();
-            modifier_args args;
-
-            args.degrees = 0;
-            args.sens.x = 1;
-            args.sens.y = 1;
-            args.acc_fn_args.acc_args.offset = 0;
-            args.acc_fn_args.acc_args.accel = 0.01;
-            args.acc_fn_args.acc_args.limit = 2;
-            args.acc_fn_args.acc_args.exponent = 1;
-            args.acc_fn_args.acc_args.midpoint = 0;
-            args.acc_fn_args.acc_args.power_scale = 1;
-            args.acc_fn_args.acc_args.weight.x = 1;
-            args.acc_fn_args.acc_args.weight.y = 1;
-            args.acc_fn_args.acc_args.gain_cap = 0;
-            args.acc_fn_args.accel_mode = (int)accel_mode.natural;
-            args.acc_fn_args.time_min = 0.4;
-            args.acc_fn_args.cap.x = 0;
-            args.acc_fn_args.cap.y = 0;
-
-            IntPtr args_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(args));
-            Marshal.StructureToPtr(args, args_ptr, false);
 
-            var managedAcceleration = new ManagedAccel(args_ptr);
-
-            Marshal.FreeHGlobal(args_ptr);
+            ManagedAccel activeAccel = null;
 
+            try
+            {
+                activeAccel = ManagedAccel.GetActiveAccel();
+            }
+            catch (DriverNotInstalledException)
+            {
+                throw;
+            }
 
             var accelCharts = new AccelCharts(
                                 this,
@@ -205,7 +148,7 @@ namespace grapher
                 new Field(PollRateTextBox.TextBox, this, AccelCalculator.DefaultPollRate));
 
             var settings = new SettingsManager(
-                managedAcceleration,
+                activeAccel,
                 accelCalculator.DPI,
                 accelCalculator.PollRate,
                 AutoWriteMenuItem);