update to use FftSharp 1.0.5

swharden · swharden · commit 3d88c9357ea9 · 2020-06-11T23:35:04.000-04:00
diff --git a/src/Spectrogram.MicrophoneDemo/Spectrogram.MicrophoneDemo.csproj b/src/Spectrogram.MicrophoneDemo/Spectrogram.MicrophoneDemo.csproj
@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FftSharp, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FftSharp.1.0.4\lib\netstandard2.0\FftSharp.dll</HintPath>
+    <Reference Include="FftSharp, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FftSharp.1.0.5\lib\netstandard2.0\FftSharp.dll</HintPath>
     </Reference>
     <Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
diff --git a/src/Spectrogram.MicrophoneDemo/packages.config b/src/Spectrogram.MicrophoneDemo/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FftSharp" version="1.0.4" targetFramework="net472" />
+  <package id="FftSharp" version="1.0.5" targetFramework="net472" />
   <package id="NAudio" version="1.10.0" targetFramework="net472" />
   <package id="System.Drawing.Common" version="4.7.0" targetFramework="net472" />
 </packages>
diff --git a/src/Spectrogram/Spectrogram.cs b/src/Spectrogram/Spectrogram.cs
@@ -3,7 +3,6 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
-using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
@@ -93,10 +92,10 @@ public double[][] Process()
 
             Parallel.For(0, newFftCount, newFftIndex =>
             {
-                Complex[] buffer = new Complex[settings.FftSize];
+                FftSharp.Complex[] buffer = new FftSharp.Complex[settings.FftSize];
                 int sourceIndex = newFftIndex * settings.StepSize;
                 for (int i = 0; i < settings.FftSize; i++)
-                    buffer[i] = new Complex(newAudio[sourceIndex + i] * settings.Window[i], 0);
+                    buffer[i].Real = newAudio[sourceIndex + i] * settings.Window[i];
 
                 FftSharp.Transform.FFT(buffer);
 
diff --git a/src/Spectrogram/Spectrogram.csproj b/src/Spectrogram/Spectrogram.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FftSharp" Version="1.0.4" />
+    <PackageReference Include="FftSharp" Version="1.0.5" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
 
