Re-added support for .NET Framework 4.0 (Windows XP)

LAGonauta · Aug 10, 2019 · 0c929e7 · 0c929e7
1 parent 46321d9
commit 0c929e7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/ASIORecAndPlay/ASIORecAndPlay.csproj b/ASIORecAndPlay/ASIORecAndPlay.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>ASIORecAndPlay</RootNamespace>
     <AssemblyName>ASIORecAndPlay</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

diff --git a/ASIORecAndPlay/App.config b/ASIORecAndPlay/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     </startup>
 </configuration>
diff --git a/ASIORecAndPlay/ChannelMapping.cs b/ASIORecAndPlay/ChannelMapping.cs
@@ -3,6 +3,12 @@
 
 namespace ASIORecAndPlay
 {
+  internal struct Mapping
+  {
+    public int inputChannel;
+    public int outputChannel;
+  }
+
   internal class ChannelMapping
   {
     private IDictionary<int, int> channelMapping;
@@ -63,12 +69,12 @@ public bool Remove(int outputChannel)
     /// Gets an ordered enumerable of a copy the mapping, ordered by input channel.
     /// </summary>
     /// <returns></returns>
-    public IEnumerable<(int inputChannel, int outputChannel)> GetMappingList()
+    public IEnumerable<Mapping> GetMappingList()
     {
       lock (_lock)
       {
         return channelMapping
-        .Select(e => (inputChannel: e.Value, outputChannel: e.Key))
+        .Select(e => new Mapping { inputChannel = e.Value, outputChannel = e.Key })
         .OrderBy(e => e.inputChannel).ToList();
       }
     }

diff --git a/ASIORecAndPlay/MainWindow.xaml.cs b/ASIORecAndPlay/MainWindow.xaml.cs
@@ -40,12 +40,12 @@ public partial class MainWindow : Window
 
     private void DispatchStatusText(object buffer)
     {
-      Application.Current.Dispatcher.Invoke(() => UpdateText($"Buffered time: {((RecAndPlay)buffer).BufferedDuration().TotalMilliseconds.ToString()} ms."));
+      Application.Current.Dispatcher.Invoke(new Action(() => UpdateText($"Buffered time: {((RecAndPlay)buffer).BufferedDuration().TotalMilliseconds.ToString()} ms.")));
     }
 
     private void DispatchPlaybackMeters(object buffer)
     {
-      Application.Current.Dispatcher.Invoke(() => UpdateMeter(((RecAndPlay)buffer).PlaybackAudioValue));
+      Application.Current.Dispatcher.Invoke(new Action(() => UpdateMeter(((RecAndPlay)buffer).PlaybackAudioValue)));
     }
 
     private void UpdateText(string message)
@@ -309,7 +309,7 @@ private void OnButtonBeginClick(object sender, RoutedEventArgs e)
       {
         statusTextTimer.Dispose();
         audioMeterTimer.Dispose();
-        Application.Current.Dispatcher.Invoke(() => UpdateText("Stopped."));
+        Application.Current.Dispatcher.Invoke(new Action(() => UpdateText("Stopped.")));
         Stop();
       }
     }
@@ -319,10 +319,10 @@ private void Stop()
       if (running)
       {
         statusTextTimer.Dispose();
-        Application.Current.Dispatcher.Invoke(() => UpdateText("Stopped."));
+        Application.Current.Dispatcher.Invoke(new Action(() => UpdateText("Stopped.")));
 
         audioMeterTimer.Dispose();
-        Application.Current.Dispatcher.Invoke(() => UpdateMeter(new VolumeMeterChannels()));
+        Application.Current.Dispatcher.Invoke(new Action(() => UpdateMeter(new VolumeMeterChannels())));
 
         running = false;
         UI_ButtonBegin.Content = "Start";

diff --git a/ASIORecAndPlay/RecAndPlay.cs b/ASIORecAndPlay/RecAndPlay.cs
@@ -24,7 +24,7 @@ internal class RecAndPlay : IDisposable
     public bool Valid { get; private set; }
     public bool CalculateRMS { get; set; }
 
-    private IEnumerable<(int inputChannel, int outputChannel)> channelMapping;
+    private IEnumerable<Mapping> channelMapping;
     private int firstInputChannel, lastInputChannel, numOutputChannels;
 
     public RecAndPlay(AsioOut recordingDevice, IWavePlayer playingDevice, ChannelMapping channelMapping, ChannelLayout? forcedNumOutputChannels = null)
@@ -143,7 +143,7 @@ private void OnAudioAvailable(object sender, AsioAudioAvailableEventArgs e)
       var mappings = channelMapping;
       if (mappings.Count() > 0)
       {
-        foreach (var map in mappings.Select(item => (inputChannel: item.inputChannel - firstInputChannel, outputChannel: item.outputChannel)))
+        foreach (var map in mappings.Select(item => new Mapping { inputChannel = item.inputChannel - firstInputChannel, outputChannel = item.outputChannel }))
         {
           for (int sampleNumber = 0; sampleNumber < e.SamplesPerBuffer; ++sampleNumber)
           {
@@ -211,7 +211,6 @@ private float GetRMSVolume(int samplesPerChannel, int channelNumber)
       return (float)Math.Sqrt(sum / samplesPerChannel);
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private unsafe int GetInputSampleInt32LSB(IntPtr inputBuffer, int n)
     {
       return *((int*)inputBuffer + n);