Make tuner show full semitone up/down. Revert to .NET 6 for VST3 plugin.

mikeoliphant · Jul 23, 2024 · 7d2406f · 7d2406f
1 parent 762e265
commit 7d2406f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/StompboxHost/StompboxHost.csproj b/StompboxHost/StompboxHost.csproj
@@ -11,8 +11,8 @@
 		<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="AudioPlugSharp" Version="0.6.1" />
-		<PackageReference Include="AudioPlugSharpHost" Version="0.6.1" />
+		<PackageReference Include="AudioPlugSharp" Version="0.6.3" />
+		<PackageReference Include="AudioPlugSharpHost" Version="0.6.3" />
 		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
 		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
 	</ItemGroup>

diff --git a/StompboxPlugin/StompboxPlugin.csproj b/StompboxPlugin/StompboxPlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFramework>net6.0-windows</TargetFramework>
 		<OutputType>Library</OutputType>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<UseWindowsForms>true</UseWindowsForms>
@@ -13,7 +13,7 @@
 		<ProjectReference Include="..\UnmanagedBridge\UnmanagedBridge.vcxproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="AudioPlugSharp" Version="0.6.1" />
+		<PackageReference Include="AudioPlugSharp" Version="0.6.3" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
 		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />

diff --git a/StompboxPlugin/UnmanagedAudioPlugin.cs b/StompboxPlugin/UnmanagedAudioPlugin.cs
@@ -37,8 +37,6 @@ public override bool Enabled
             set
             {
                 UnmanagedWrapper.SetEnabled(value);
-
-                //GuitarSimPlugin.Instance.SendCommand("SetParam " + ID + " Enabled " + (value ? "1" : "0"));
             }
         }
 

diff --git a/StompboxShared/Interface/TunerInterface.cs b/StompboxShared/Interface/TunerInterface.cs
@@ -265,14 +265,14 @@ void UpdateTuner(double value)
                 tunerFrequencyDisplay.StringBuilder.AppendNumber((int)Math.Round((newPitch - (float)integer) * 10));
                 tunerFrequencyDisplay.StringBuilder.Append("Hz");
 
-                int cents = (int)Math.Round(1200 * Math.Log(newPitch / currentPitchCenter, 2));
+                double centsOffset = 1200 * Math.Log(newPitch / currentPitchCenter, 2);
 
                 tunerCentsDisplay.StringBuilder.Clear();
 
-                if (cents != 0)
-                    tunerCentsDisplay.StringBuilder.Append((cents > 0) ? "+" : "-");
+                if (centsOffset != 0)
+                    tunerCentsDisplay.StringBuilder.Append((centsOffset > 0) ? "+" : "-");
 
-                tunerCentsDisplay.StringBuilder.AppendNumber(Math.Abs(cents));
+                tunerCentsDisplay.StringBuilder.AppendNumber(Math.Abs((int)Math.Round(centsOffset)));
             }
 
             if (lastClosestNote != (int)closestNote.Note)
@@ -291,16 +291,16 @@ void UpdateTuner(double value)
 
             double offset = (step / 2);
 
-            double range = .03 / (currentPitchCenter / 83.0);   // Set range based on pitch (smaller range for higher frequencies)
-
             int lastX = -1;
             int lastY = -1;
 
             foreach (double pitch in pitchHistory)
             {
                 if (pitch > 0)
                 {
-                    double y = ((double)tunerImageHeight / 2) + (((1.0 - (pitch / currentPitchCenter)) / range) * ((double)tunerImageHeight / 2));
+                    double centsOffset = 1200 * Math.Log(pitch / currentPitchCenter, 2);
+
+                    double y = ((double)tunerImageHeight / 2) + ((-centsOffset / 100) * (double)tunerImageHeight);
 
                     double xOffset = offset;
                     double yOffset = y;
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,8 +37,6 @@ public override bool Enabled @@
                 set
                 {
                     UnmanagedWrapper.SetEnabled(value);
-                    //GuitarSimPlugin.Instance.SendCommand("SetParam " + ID + " Enabled " + (value ? "1" : "0"));
                 }
             }
@@ Expand Down @@