MediaFoundationReader the default for AudioFileReader to use for MP3s…

… going forwards
naudio · May 10, 2022 · d66e682 · d66e682
1 parent a01a0a6
commit d66e682
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/NAudio/AudioFileReader.cs b/NAudio/AudioFileReader.cs
@@ -55,7 +55,10 @@ private void CreateReaderStream(string fileName)
             }
             else if (fileName.EndsWith(".mp3", StringComparison.OrdinalIgnoreCase))
             {
-                readerStream = new Mp3FileReader(fileName);
+                if (Environment.OSVersion.Version.Major < 6)
+                    readerStream = new Mp3FileReader(fileName);
+                else // make MediaFoundationReader the default for MP3 going forwards
+                    readerStream = new MediaFoundationReader(fileName);
             }
             else if (fileName.EndsWith(".aiff", StringComparison.OrdinalIgnoreCase) || fileName.EndsWith(".aif", StringComparison.OrdinalIgnoreCase))
             {

diff --git a/NAudioDemo/AudioPlaybackDemo/DirectSoundOutPlugin.cs b/NAudioDemo/AudioPlaybackDemo/DirectSoundOutPlugin.cs
@@ -38,7 +38,7 @@ public bool IsAvailable
 
         public int Priority
         {
-            get { return 2; } 
+            get { return 3; } 
         }
     }
 }
diff --git a/NAudioDemo/AudioPlaybackDemo/WasapiOutPlugin.cs b/NAudioDemo/AudioPlaybackDemo/WasapiOutPlugin.cs
@@ -38,7 +38,7 @@ public bool IsAvailable
 
         public int Priority
         {
-            get { return 3; }
+            get { return 1; }
         }
     }
 }
diff --git a/NAudioDemo/AudioPlaybackDemo/WasapiOutSettingsPanel.cs b/NAudioDemo/AudioPlaybackDemo/WasapiOutSettingsPanel.cs
@@ -25,16 +25,24 @@ private void InitialiseWasapiControls()
             var enumerator = new MMDeviceEnumerator();
             var endPoints = enumerator.EnumerateAudioEndPoints(DataFlow.Render, DeviceState.Active);
             var comboItems = new List<WasapiDeviceComboItem>();
+            var defaultEndPoint = enumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+
             foreach (var endPoint in endPoints)
             {
                 var comboItem = new WasapiDeviceComboItem();
                 comboItem.Description = string.Format("{0} ({1})", endPoint.FriendlyName, endPoint.DeviceFriendlyName);
                 comboItem.Device = endPoint;
                 comboItems.Add(comboItem);
+
             }
             comboBoxWaspai.DisplayMember = "Description";
             comboBoxWaspai.ValueMember = "Device";
             comboBoxWaspai.DataSource = comboItems;
+            var defaultItemIndex = comboItems.FindIndex(ci => ci.Device.ID == defaultEndPoint.ID);
+            if (defaultItemIndex != -1)
+            comboBoxWaspai.SelectedIndex = defaultItemIndex;
+
+
         }
 
         public MMDevice SelectedDevice { get { return (MMDevice)comboBoxWaspai.SelectedValue; } }

diff --git a/NAudioDemo/AudioPlaybackDemo/WaveOutPlugin.cs b/NAudioDemo/AudioPlaybackDemo/WaveOutPlugin.cs
@@ -51,7 +51,7 @@ public bool IsAvailable
 
         public int Priority
         {
-            get { return 1; } 
+            get { return 2; } 
         }
     }
 }
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,6 @@
 ### 2.1 (29 Apr 2022)
 
+ * `AudioFileReader` will use `MediaFoundationReader` as the default for MP3s
  * Minimum supported Win 10 version is now uap10.0.18362 (SDK version 1903)
  * `IWavePlayer` now has an `OuputWaveFormat` property
  * `WasapiCapture` and `WasapiLoopbackCapture` support sample rate conversion so you can capture at a sample rate of your choice