some code cleanup of DMO

Chronophobe · Jan 31, 2017 · d557ac4 · d557ac4
1 parent 42ebd73
commit d557ac4
Show file tree

Hide file tree

Showing 40 changed files with 89 additions and 200 deletions.
diff --git a/NAudio/Dmo/AudioMediaSubtypes.cs b/NAudio/Dmo/AudioMediaSubtypes.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoDescriptor.cs b/NAudio/Dmo/DmoDescriptor.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {
@@ -15,7 +13,7 @@ public class DmoDescriptor
         public string Name { get; private set; }
 
         /// <summary>
-        /// Clsid
+        /// CLSID
         /// </summary>
         public Guid Clsid { get; private set; }
 
@@ -24,8 +22,8 @@ public class DmoDescriptor
         /// </summary>
         public DmoDescriptor(string name, Guid clsid)
         {
-            this.Name = name;
-            this.Clsid = clsid;
+            Name = name;
+            Clsid = clsid;
         }
     }
 }
diff --git a/NAudio/Dmo/DmoEnumFlags.cs b/NAudio/Dmo/DmoEnumFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoEnumerator.cs b/NAudio/Dmo/DmoEnumerator.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo
@@ -40,13 +39,13 @@ public static IEnumerable<DmoDescriptor> GetAudioDecoderNames()
         private static IEnumerable<DmoDescriptor> GetDmos(Guid category)
         {
             IEnumDmo enumDmo;
-            int hresult = DmoInterop.DMOEnum(ref category, DmoEnumFlags.None, 0, null, 0, null, out enumDmo);
+            var hresult = DmoInterop.DMOEnum(ref category, DmoEnumFlags.None, 0, null, 0, null, out enumDmo);
             Marshal.ThrowExceptionForHR(hresult);
-            Guid guid;
             int itemsFetched;
-            IntPtr namePointer;
             do
             {
+                Guid guid;
+                IntPtr namePointer;
                 enumDmo.Next(1, out guid, out namePointer, out itemsFetched);
 
                 if (itemsFetched == 1)

diff --git a/NAudio/Dmo/DmoGuids.cs b/NAudio/Dmo/DmoGuids.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoHResults.cs b/NAudio/Dmo/DmoHResults.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoInputDataBufferFlags.cs b/NAudio/Dmo/DmoInputDataBufferFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoInputStatusFlags.cs b/NAudio/Dmo/DmoInputStatusFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoInterop.cs b/NAudio/Dmo/DmoInterop.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 

diff --git a/NAudio/Dmo/DmoMediaType.cs b/NAudio/Dmo/DmoMediaType.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NAudio.Wave;
 using System.Runtime.InteropServices;
-using System.Diagnostics;
 
 namespace NAudio.Dmo
 {
@@ -26,26 +23,17 @@ public struct DmoMediaType
         /// <summary>
         /// Major type
         /// </summary>
-        public Guid MajorType
-        {
-            get { return majortype; }
-        }
+        public Guid MajorType => majortype;
 
         /// <summary>
         /// Major type name
         /// </summary>
-        public string MajorTypeName
-        {
-            get { return MediaTypes.GetMediaTypeName(majortype); }
-        }
+        public string MajorTypeName => MediaTypes.GetMediaTypeName(majortype);
 
         /// <summary>
         /// Subtype
         /// </summary>
-        public Guid SubType
-        {
-            get { return subtype; }
-        }
+        public Guid SubType => subtype;
 
         /// <summary>
         /// Subtype name
@@ -65,26 +53,17 @@ public string SubTypeName
         /// <summary>
         /// Fixed size samples
         /// </summary>
-        public bool FixedSizeSamples
-        {
-            get { return bFixedSizeSamples; }
-        }
+        public bool FixedSizeSamples => bFixedSizeSamples;
 
         /// <summary>
         /// Sample size
         /// </summary>
-        public int SampleSize
-        {
-            get { return lSampleSize; }
-        }
+        public int SampleSize => lSampleSize;
 
         /// <summary>
         /// Format type
         /// </summary>
-        public Guid FormatType
-        {
-            get { return formattype; }
-        }
+        public Guid FormatType => formattype;
 
         /// <summary>
         /// Format type name
@@ -97,18 +76,15 @@ public string FormatTypeName
                 {
                     return "None";
                 }
-                else if (formattype == Guid.Empty)
+                if (formattype == Guid.Empty)
                 {
                     return "Null";
                 }
-                else if(formattype == DmoMediaTypeGuids.FORMAT_WaveFormatEx)
+                if(formattype == DmoMediaTypeGuids.FORMAT_WaveFormatEx)
                 {
                     return "WaveFormatEx";
                 }
-                else
-                {
-                    return FormatType.ToString();
-                }
+                return FormatType.ToString();
             }
         }
 
@@ -121,10 +97,7 @@ public WaveFormat GetWaveFormat()
             {                
                 return WaveFormat.MarshalFromPtr(pbFormat);
             }
-            else
-            {
-                throw new InvalidOperationException("Not a WaveFormat type");
-            }
+            throw new InvalidOperationException("Not a WaveFormat type");
         }
 
         /// <summary>
@@ -133,12 +106,12 @@ public WaveFormat GetWaveFormat()
         /// <param name="waveFormat">Wave format structure</param>
         public void SetWaveFormat(WaveFormat waveFormat)
         {
-            this.majortype = MediaTypes.MEDIATYPE_Audio;
+            majortype = MediaTypes.MEDIATYPE_Audio;
 
-            WaveFormatExtensible wfe = waveFormat as WaveFormatExtensible;
+            var wfe = waveFormat as WaveFormatExtensible;
             if (wfe != null)
             {
-                this.subtype = wfe.SubFormat;
+                subtype = wfe.SubFormat;
             }
             else
             {
@@ -154,11 +127,11 @@ public void SetWaveFormat(WaveFormat waveFormat)
                         subtype = AudioMediaSubtypes.WMMEDIASUBTYPE_MP3;
                         break;
                     default:
-                        throw new ArgumentException(String.Format("Not a supported encoding {0}", waveFormat.Encoding));
+                        throw new ArgumentException($"Not a supported encoding {waveFormat.Encoding}");
                 }
             }
-            this.bFixedSizeSamples = (this.SubType == AudioMediaSubtypes.MEDIASUBTYPE_PCM || this.SubType == AudioMediaSubtypes.MEDIASUBTYPE_IEEE_FLOAT);
-            this.formattype = DmoMediaTypeGuids.FORMAT_WaveFormatEx;
+            bFixedSizeSamples = SubType == AudioMediaSubtypes.MEDIASUBTYPE_PCM || SubType == AudioMediaSubtypes.MEDIASUBTYPE_IEEE_FLOAT;
+            formattype = DmoMediaTypeGuids.FORMAT_WaveFormatEx;
             if (cbFormat < Marshal.SizeOf(waveFormat))
                 throw new InvalidOperationException("Not enough memory assigned for a WaveFormat structure");
             //Debug.Assert(cbFormat >= ,"Not enough space");

diff --git a/NAudio/Dmo/DmoOutputDataBuffer.cs b/NAudio/Dmo/DmoOutputDataBuffer.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo

diff --git a/NAudio/Dmo/DmoOutputDataBufferFlags.cs b/NAudio/Dmo/DmoOutputDataBufferFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoPartialMediaType.cs b/NAudio/Dmo/DmoPartialMediaType.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoProcessOutputFlags.cs b/NAudio/Dmo/DmoProcessOutputFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/DmoSetTypeFlags.cs b/NAudio/Dmo/DmoSetTypeFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/IEnumDmo.cs b/NAudio/Dmo/IEnumDmo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo

diff --git a/NAudio/Dmo/IMediaBuffer.cs b/NAudio/Dmo/IMediaBuffer.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo

diff --git a/NAudio/Dmo/IMediaObject.cs b/NAudio/Dmo/IMediaObject.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo

diff --git a/NAudio/Dmo/IMediaParamInfo.cs b/NAudio/Dmo/IMediaParamInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo

diff --git a/NAudio/Dmo/IWMResamplerProps.cs b/NAudio/Dmo/IWMResamplerProps.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo

diff --git a/NAudio/Dmo/InputStreamInfoFlags.cs b/NAudio/Dmo/InputStreamInfoFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {

diff --git a/NAudio/Dmo/MediaBuffer.cs b/NAudio/Dmo/MediaBuffer.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using NAudio.Utils;
 
@@ -12,17 +10,17 @@ namespace NAudio.Dmo
     /// </summary>
     public class MediaBuffer : IMediaBuffer, IDisposable
     {
-        IntPtr buffer;
-        int length;
-        int maxLength;
+        private IntPtr buffer;
+        private int length;
+        private readonly int maxLength;
 
         /// <summary>
         /// Creates a new Media Buffer
         /// </summary>
         /// <param name="maxLength">Maximum length in bytes</param>
         public MediaBuffer(int maxLength)
         {
-            this.buffer = Marshal.AllocCoTaskMem(maxLength);
+            buffer = Marshal.AllocCoTaskMem(maxLength);
             this.maxLength = maxLength;
         }
 

diff --git a/NAudio/Dmo/MediaObject.cs b/NAudio/Dmo/MediaObject.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using NAudio.Utils;
 using System.Runtime.InteropServices;
 using NAudio.Wave;
@@ -13,9 +12,9 @@ namespace NAudio.Dmo
     /// </summary>
     public class MediaObject : IDisposable
     {
-        IMediaObject mediaObject;
-        int inputStreams;
-        int outputStreams;
+        private IMediaObject mediaObject;
+        private readonly int inputStreams;
+        private readonly int outputStreams;
 
         #region Construction
 

diff --git a/NAudio/Dmo/MediaObjectSizeInfo.cs b/NAudio/Dmo/MediaObjectSizeInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NAudio.Dmo
 {
@@ -17,12 +15,12 @@ public class MediaObjectSizeInfo
         /// <summary>
         /// Max Lookahead
         /// </summary>
-        public int MaxLookahead { get; private set; }
+        public int MaxLookahead { get; }
 
         /// <summary>
         /// Alignment
         /// </summary>
-        public int Alignment { get; private set; }
+        public int Alignment { get; }
 
         /// <summary>
         /// Media Object Size Info
@@ -39,8 +37,7 @@ public MediaObjectSizeInfo(int size, int maxLookahead, int alignment)
         /// </summary>        
         public override string ToString()
         {
-            return String.Format("Size: {0}, Alignment {1}, MaxLookahead {2}",
-                Size, Alignment, MaxLookahead);
+            return $"Size: {Size}, Alignment {Alignment}, MaxLookahead {MaxLookahead}";
         }
 
     }

diff --git a/NAudio/Dmo/MediaParamInfo.cs b/NAudio/Dmo/MediaParamInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace NAudio.Dmo