improved error message for channel index out of range #208

naudio · Jul 22, 2017 · 8b8ff19 · 8b8ff19
1 parent 17c8ca2
commit 8b8ff19
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/NAudio/CoreAudioApi/AudioMeterInformationChannels.cs b/NAudio/CoreAudioApi/AudioMeterInformationChannels.cs
@@ -30,7 +30,7 @@ namespace NAudio.CoreAudioApi
     /// </summary>
     public class AudioMeterInformationChannels
     {
-        readonly IAudioMeterInformation audioMeterInformation;
+        private readonly IAudioMeterInformation audioMeterInformation;
 
         /// <summary>
         /// Metering Channel Count
@@ -54,8 +54,14 @@ public float this[int index]
         {
             get
             {
+                var channels = Count;
+                if (index >= channels)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(index),
+                        $"Peak index cannot be greater than number of channels ({channels})");
+                }
                 var peakValues = new float[Count];
-                GCHandle Params = GCHandle.Alloc(peakValues, GCHandleType.Pinned);
+                var Params = GCHandle.Alloc(peakValues, GCHandleType.Pinned);
                 Marshal.ThrowExceptionForHR(audioMeterInformation.GetChannelsPeakValues(peakValues.Length, Params.AddrOfPinnedObject()));
                 Params.Free();
                 return peakValues[index];