CodecFactory now supports upper case fileextensions(fixes #103). The …

…flac decoder will now skip all ID3v2 tags(not just the first one).
filoe · Jun 5, 2016 · de9f32f · de9f32f
1 parent 5de8517
commit de9f32f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CSCore/Codecs/CodecFactory.cs b/CSCore/Codecs/CodecFactory.cs
@@ -150,7 +150,7 @@ public IWaveSource GetCodec(string filename)
             {
                 try
                 {
-                    if (codecEntry.Value.FileExtensions.Contains(extension))
+                    if (codecEntry.Value.FileExtensions.Any(x => x.Equals(extension, StringComparison.OrdinalIgnoreCase)))
                         return codecEntry.Value.GetCodecAction(File.OpenRead(filename));
                 }
                 catch (Exception ex)

diff --git a/CSCore/Codecs/FLAC/FlacFile.cs b/CSCore/Codecs/FLAC/FlacFile.cs
@@ -107,7 +107,9 @@ public FlacFile(Stream stream, FlacPreScanMode scanFlag,
             _stream = stream;
 
             //skip ID3v2
-            ID3v2.SkipTag(stream);
+            while (ID3v2.SkipTag(stream))
+            {
+            }
 
             //read fLaC sync
             var beginSync = new byte[4];

diff --git a/CSCore/Codecs/FLAC/FlacPreScan.cs b/CSCore/Codecs/FLAC/FlacPreScan.cs
@@ -87,7 +87,7 @@ private List<FlacFrameInformation> RunScan(FlacMetadataStreamInfo streamInfo)
 
         private void RaiseScanFinished(List<FlacFrameInformation> frames)
         {
-            EventHandler<FlacPreScanFinishedEventArgs> handler = this.ScanFinished;
+            EventHandler<FlacPreScanFinishedEventArgs> handler = ScanFinished;
             if (handler != null)
                 handler(this, new FlacPreScanFinishedEventArgs(frames));
         }