diff --git a/CSCore.Ffmpeg/CSCore.Ffmpeg.csproj b/CSCore.Ffmpeg/CSCore.Ffmpeg.csproj index 7bc42864..48aeacab 100644 --- a/CSCore.Ffmpeg/CSCore.Ffmpeg.csproj +++ b/CSCore.Ffmpeg/CSCore.Ffmpeg.csproj @@ -1,83 +1,33 @@ - - - + + - Debug - AnyCPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E} - Library - Properties - CSCore.Ffmpeg CSCore.Ffmpeg - v3.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net451;netcoreapp2.0 + 1.0.0 + Florian R. + .NET Sound Library - FFmpeg Wrapper true - bin\Release\CSCore.Ffmpeg.XML + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - {c3dccfe3-dd3f-4eee-849b-33e355b1e064} - CSCore - + + + + + PreserveNewest @@ -107,7 +57,6 @@ - PreserveNewest @@ -135,12 +84,5 @@ - - + \ No newline at end of file diff --git a/CSCore.Ffmpeg/Properties/AssemblyInfo.cs b/CSCore.Ffmpeg/Properties/AssemblyInfo.cs index 69adc2a3..51645dde 100644 --- a/CSCore.Ffmpeg/Properties/AssemblyInfo.cs +++ b/CSCore.Ffmpeg/Properties/AssemblyInfo.cs @@ -1,18 +1,8 @@ using System; -using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("CSCore.Ffmpeg")] -[assembly: AssemblyDescription(".NET Sound Library - FFmpeg Wrapper")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSCore.Ffmpeg")] -[assembly: AssemblyCopyright("Florian R.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - [assembly: ComVisible(false)] [assembly: Guid("5de75590-74ff-4c8c-bb0c-26164ed01e3d")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: InternalsVisibleTo("CSCore.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100237314800493cdf9aabec35955e8928e3d5416ad1d223e8914e0e025ff9095b21bbb696235b9d3886b0edec26107ca0af49c3170fc08d117e8e9265ab371b157f2c2b27843d97c1d312850d10d1272c1d46d18f02ac56f46676cbe7946049b1b344db7154d35788fee27b3d581bd7d43e41813b10fd360a3fbfab9199d9e86a4")] diff --git a/CSCore.Test/CSCore.Test.csproj b/CSCore.Test/CSCore.Test.csproj index 43881930..bd1e1979 100644 --- a/CSCore.Test/CSCore.Test.csproj +++ b/CSCore.Test/CSCore.Test.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -8,7 +8,7 @@ Properties CSCore.Test CSCore.Test - v4.0 + v4.6.1 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -20,6 +20,7 @@ SAK SAK SAK + true @@ -31,6 +32,7 @@ 4 true AnyCPU + false pdbonly @@ -41,6 +43,7 @@ 4 true CS1591 + false true @@ -51,6 +54,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false bin\x64\Release\ @@ -62,6 +66,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false true @@ -72,6 +77,7 @@ x86 prompt MinimumRecommendedRules.ruleset + false bin\x86\Release\ @@ -83,6 +89,7 @@ x86 prompt MinimumRecommendedRules.ruleset + false true @@ -154,12 +161,6 @@ - - - {c3dccfe3-dd3f-4eee-849b-33e355b1e064} - CSCore - - ResXFileCodeGenerator @@ -175,6 +176,12 @@ + + + {c3dccfe3-dd3f-4eee-849b-33e355b1e064} + CSCore + + diff --git a/CSCore.Test/Properties/Resources.Designer.cs b/CSCore.Test/Properties/Resources.Designer.cs index ff505e29..e8ef7a1c 100644 --- a/CSCore.Test/Properties/Resources.Designer.cs +++ b/CSCore.Test/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace CSCore.Test.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/CSCore.sln b/CSCore.sln index 3b9a7cd9..1b5afc41 100644 --- a/CSCore.sln +++ b/CSCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSCore", "CSCore\CSCore.csproj", "{C3DCCFE3-DD3F-4EEE-849B-33E355B1E064}" ProjectSection(ProjectDependencies) = postProject @@ -238,6 +238,26 @@ Global {F8733117-DA1D-40DC-AEF8-98051B86E219}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {F8733117-DA1D-40DC-AEF8-98051B86E219}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F8733117-DA1D-40DC-AEF8-98051B86E219}.Release|Win32.ActiveCfg = Release|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Win32.ActiveCfg = Debug|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Any CPU.Build.0 = Release|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Win32.ActiveCfg = Release|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Win32.ActiveCfg = Debug|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Any CPU.Build.0 = Release|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Win32.ActiveCfg = Release|Any CPU {E0198A08-AAA8-4A76-B096-BBE72DA4F93B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0198A08-AAA8-4A76-B096-BBE72DA4F93B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0198A08-AAA8-4A76-B096-BBE72DA4F93B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -278,26 +298,6 @@ Global {2EDF3192-9107-4B7A-914A-EA25AFEB9F85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {2EDF3192-9107-4B7A-914A-EA25AFEB9F85}.Release|Mixed Platforms.Build.0 = Release|Any CPU {2EDF3192-9107-4B7A-914A-EA25AFEB9F85}.Release|Win32.ActiveCfg = Release|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Debug|Win32.ActiveCfg = Debug|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Any CPU.Build.0 = Release|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F4E6168A-B2CB-413C-AE0E-0D8B856B425E}.Release|Win32.ActiveCfg = Release|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Debug|Win32.ActiveCfg = Debug|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Any CPU.Build.0 = Release|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -318,10 +318,13 @@ Global {000B0B0B-A12D-4EED-A261-7F95422E386A} = {41D1D336-13B2-488B-8A85-C0F744035F8B} {529DEB01-14A3-4FEC-AD89-6D4D0DC433C3} = {41D1D336-13B2-488B-8A85-C0F744035F8B} {F8733117-DA1D-40DC-AEF8-98051B86E219} = {41D1D336-13B2-488B-8A85-C0F744035F8B} + {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1} = {41D1D336-13B2-488B-8A85-C0F744035F8B} {E0198A08-AAA8-4A76-B096-BBE72DA4F93B} = {41D1D336-13B2-488B-8A85-C0F744035F8B} {9CF28420-D689-46E6-B659-72520A515372} = {41D1D336-13B2-488B-8A85-C0F744035F8B} {571AC77A-7D3D-44CF-B0E7-08DF03D7B638} = {41D1D336-13B2-488B-8A85-C0F744035F8B} {2EDF3192-9107-4B7A-914A-EA25AFEB9F85} = {41D1D336-13B2-488B-8A85-C0F744035F8B} - {3CC0E6B1-1E96-4A07-8AE7-A7C7F47911B1} = {41D1D336-13B2-488B-8A85-C0F744035F8B} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {ECFF1897-FBBD-46F6-AAF9-43B814AF0675} EndGlobalSection EndGlobal diff --git a/CSCore/CSCore.csproj b/CSCore/CSCore.csproj index 25825485..9aeeffdb 100644 --- a/CSCore/CSCore.csproj +++ b/CSCore/CSCore.csproj @@ -1,22 +1,20 @@ - - - + + - Debug - AnyCPU - {C3DCCFE3-DD3F-4EEE-849B-33E355B1E064} - Library - Properties - CSCore CSCore - v3.5 - 512 - SAK - SAK - SAK - SAK - Client + net451;netstandard2.0;netcoreapp2.0 + 1.2.1.1 + true + + + Florian R. + .NET Sound Library + + + false + + true full @@ -25,13 +23,18 @@ TRACE;DEBUG;FLAC_DEBUG prompt 4 - true true bin\Debug\CSCore.XML AnyCPU 1573 MinimumRecommendedRules.ruleset + + + cscore.snk + true + false + pdbonly true @@ -39,585 +42,116 @@ TRACE prompt 4 - true bin\Release\CSCore.XML 1591 Off false true - - - OnOutputUpdated - + true bin\x64\Debug\ DEBUG;TRACE - true full x64 prompt MinimumRecommendedRules.ruleset + bin\x64\Release\ TRACE - true true pdbonly x64 prompt MinimumRecommendedRules.ruleset + true bin\x86\Debug\ DEBUG;TRACE - true full x86 prompt - MinimumRecommendedRules.ruleset + bin\x86\Release\ TRACE - true true pdbonly x86 prompt MinimumRecommendedRules.ruleset + - false - - - - + OnOutputUpdated + + + + + - - - - - - - + + + - + AudioSubTypes.tt - Code True True - + + AudioSubTypes.tt - - - - - - - - - - - - - - - - - - - - - + + + FlacFrame_GetBuffer.tt True True - FlacFrame_GetBuffer.tt - - - - - - - - - - - - - - - - - - - - - - - - - - + + True True FlacSubFrameLPC_Calculation.tt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + TextTemplatingFileGenerator AudioSubTypes.cs - - + + TextTemplatingFileGenerator FlacFrame_GetBuffer.cs - + + TextTemplatingFileGenerator FlacSubFrameLPC_Calculation.cs + + + + PreserveNewest + - + - + @echo off & setLocal EnableDELAYedeXpansion @@ -691,17 +225,6 @@ :EXIT_ERR set errorCode=-1 goto EXIT - - - - - + - \ No newline at end of file diff --git a/CSCore/Codecs/FLAC/Metadata/FlacMetadataFactory.cs b/CSCore/Codecs/FLAC/Metadata/FlacMetadataFactory.cs index 04fbad5a..1d243f0f 100644 --- a/CSCore/Codecs/FLAC/Metadata/FlacMetadataFactory.cs +++ b/CSCore/Codecs/FLAC/Metadata/FlacMetadataFactory.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.DirectoryServices; using System.IO; -using System.Linq; -using System.Text; namespace CSCore.Codecs.FLAC.Metadata { diff --git a/CSCore/Codecs/MP3/Mp3WebStream.cs b/CSCore/Codecs/MP3/Mp3WebStream.cs index e49563c0..6d0378e4 100644 --- a/CSCore/Codecs/MP3/Mp3WebStream.cs +++ b/CSCore/Codecs/MP3/Mp3WebStream.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.IO; using System.Net; -using System.Net.Configuration; using System.Reflection; using System.Threading; using CSCore.Utils; @@ -72,9 +71,10 @@ public Mp3WebStream(Uri address, bool async) throw new ArgumentNullException("address"); _address = address; + #if NET451 if (!SetAllowUnsafeHeaderParsing20()) throw new Exception("Setting allowed Unsafe-Header-Parsing failed."); - + #endif CreateStream(async); } @@ -399,11 +399,12 @@ private void CloseResponse() } } +#if NET451 //Copied from http://social.msdn.microsoft.com/forums/en-US/netfxnetcom/thread/ff098248-551c-4da9-8ba5-358a9f8ccc57/ private static bool SetAllowUnsafeHeaderParsing20() { //Get the assembly that contains the internal class - Assembly aNetAssembly = Assembly.GetAssembly(typeof (SettingsSection)); + Assembly aNetAssembly = Assembly.GetAssembly(typeof (System.Net.Configuration.SettingsSection)); if (aNetAssembly != null) { //Use the assembly in order to get the internal type for the internal class @@ -431,6 +432,7 @@ private static bool SetAllowUnsafeHeaderParsing20() } return false; } +#endif } } diff --git a/CSCore/Properties/AssemblyInfo.cs b/CSCore/Properties/AssemblyInfo.cs index 40b50fe5..b36ea215 100644 --- a/CSCore/Properties/AssemblyInfo.cs +++ b/CSCore/Properties/AssemblyInfo.cs @@ -1,22 +1,8 @@ using System; -using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("CSCore")] -[assembly: AssemblyDescription(".NET Sound Library")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CSCore")] -[assembly: AssemblyCopyright("Florian R.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - [assembly: ComVisible(false)] [assembly: Guid("7939b0f4-fed9-4dcf-bb59-a17505864c55")] -[assembly: AssemblyVersion("1.2.1.1")] -[assembly: AssemblyFileVersion("1.2.1.1")] - -[assembly:CLSCompliant(true)] [assembly: InternalsVisibleTo("CSCore.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100237314800493cdf9aabec35955e8928e3d5416ad1d223e8914e0e025ff9095b21bbb696235b9d3886b0edec26107ca0af49c3170fc08d117e8e9265ab371b157f2c2b27843d97c1d312850d10d1272c1d46d18f02ac56f46676cbe7946049b1b344db7154d35788fee27b3d581bd7d43e41813b10fd360a3fbfab9199d9e86a4")] diff --git a/CSCore/Tags/ID3/Frames/CommercialFrame.cs b/CSCore/Tags/ID3/Frames/CommercialFrame.cs index ad3cd812..b4f9c3de 100644 --- a/CSCore/Tags/ID3/Frames/CommercialFrame.cs +++ b/CSCore/Tags/ID3/Frames/CommercialFrame.cs @@ -18,7 +18,9 @@ public class CommercialFrame : Frame public string LogoMimeType { get; private set; } +#if !NETSTANDARD2_0 public System.Drawing.Image Image { get; private set; } +#endif public CommercialFrame(FrameHeader header) : base(header) @@ -59,7 +61,9 @@ protected override void Decode(byte[] content) var logoData = new byte[content.Length - offset]; Array.Copy(content, offset, logoData, 0, logoData.Length); + #if !NETSTANDARD2_0 Image = ID3Utils.DecodeImage(logoData, LogoMimeType); + #endif } } } diff --git a/CSCore/Tags/ID3/Frames/PictureFrame.cs b/CSCore/Tags/ID3/Frames/PictureFrame.cs index faabb7a8..8a919b88 100644 --- a/CSCore/Tags/ID3/Frames/PictureFrame.cs +++ b/CSCore/Tags/ID3/Frames/PictureFrame.cs @@ -1,7 +1,9 @@ using System; using System.ComponentModel; -using System.Drawing; +#if !NETSTANDARD2_0 +using System.Drawing; +#endif namespace CSCore.Tags.ID3.Frames { public class PictureFrame : Frame @@ -14,22 +16,21 @@ public class PictureFrame : Frame internal byte[] RawData { get; private set; } + #if !NETSTANDARD2_0 private Image _image; - + /// /// WARNING: If MimeType equals "-->" the picture will be downloaded from the web. /// Use GetURL() the get the url to the picture. If not, data, contained by the frame will /// be used. /// - public Image Image - { - get { return _image ?? (_image = DecodeImage()); } - } + public Image Image => _image ?? (_image = DecodeImage()); private Image DecodeImage() { return ID3Utils.DecodeImage(RawData, MimeType); } + #endif private ID3Version _version; diff --git a/CSCore/Tags/ID3/ID3Utils.cs b/CSCore/Tags/ID3/ID3Utils.cs index c174324a..cc091f5a 100644 --- a/CSCore/Tags/ID3/ID3Utils.cs +++ b/CSCore/Tags/ID3/ID3Utils.cs @@ -137,6 +137,7 @@ private static int SeekPreamble(byte[] buffer, int offset, int count, Encoding e public const string MimeURL = "-->"; + #if !NETSTANDARD2_0 public static System.Drawing.Image DecodeImage(byte[] rawdata, string mimetype) { Stream stream; @@ -153,6 +154,7 @@ public static System.Drawing.Image DecodeImage(byte[] rawdata, string mimetype) return Image.FromStream(stream); } + #endif public static string GetURL(byte[] RawData, string MimeType) { diff --git a/CSCore/Tags/ID3/ID3v2QuickInfo.cs b/CSCore/Tags/ID3/ID3v2QuickInfo.cs index 1d1c9834..ee9d7092 100644 --- a/CSCore/Tags/ID3/ID3v2QuickInfo.cs +++ b/CSCore/Tags/ID3/ID3v2QuickInfo.cs @@ -65,6 +65,8 @@ public string Comments } } + #if !NETSTANDARD2_0 + public System.Drawing.Image Image { get @@ -76,6 +78,8 @@ public System.Drawing.Image Image } } + #endif + public int? Year { get diff --git a/Samples/AdjustPosition/AdjustPosition.csproj b/Samples/AdjustPosition/AdjustPosition.csproj index b7c29254..3f5a88ad 100644 --- a/Samples/AdjustPosition/AdjustPosition.csproj +++ b/Samples/AdjustPosition/AdjustPosition.csproj @@ -9,8 +9,9 @@ Properties AdjustPosition AdjustPosition - v4.5 + v4.6.1 512 + AnyCPU diff --git a/Samples/AdjustPosition/app.config b/Samples/AdjustPosition/app.config index 8e156463..bae5d6d8 100644 --- a/Samples/AdjustPosition/app.config +++ b/Samples/AdjustPosition/app.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Samples/AudioPlayerSample/App.config b/Samples/AudioPlayerSample/App.config index 8e156463..bae5d6d8 100644 --- a/Samples/AudioPlayerSample/App.config +++ b/Samples/AudioPlayerSample/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Samples/AudioPlayerSample/AudioPlayerSample.csproj b/Samples/AudioPlayerSample/AudioPlayerSample.csproj index 28725ba1..9b772c5c 100644 --- a/Samples/AudioPlayerSample/AudioPlayerSample.csproj +++ b/Samples/AudioPlayerSample/AudioPlayerSample.csproj @@ -9,8 +9,9 @@ Properties AudioPlayerSample AudioPlayerSample - v4.5 + v4.6.1 512 + AnyCPU @@ -66,6 +67,7 @@ True Resources.resx + True SettingsSingleFileGenerator diff --git a/Samples/AudioPlayerSample/Properties/Resources.Designer.cs b/Samples/AudioPlayerSample/Properties/Resources.Designer.cs index d543a338..1da0aae3 100644 --- a/Samples/AudioPlayerSample/Properties/Resources.Designer.cs +++ b/Samples/AudioPlayerSample/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace AudioPlayerSample.Properties -{ - - +namespace AudioPlayerSample.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace AudioPlayerSample.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AudioPlayerSample.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Samples/AudioPlayerSample/Properties/Settings.Designer.cs b/Samples/AudioPlayerSample/Properties/Settings.Designer.cs index 557157f7..8ea14afd 100644 --- a/Samples/AudioPlayerSample/Properties/Settings.Designer.cs +++ b/Samples/AudioPlayerSample/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace AudioPlayerSample.Properties -{ - - +namespace AudioPlayerSample.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Samples/BiQuadFilterSample/BiQuadFilterSample.csproj b/Samples/BiQuadFilterSample/BiQuadFilterSample.csproj index adb4c22a..f4c8b880 100644 --- a/Samples/BiQuadFilterSample/BiQuadFilterSample.csproj +++ b/Samples/BiQuadFilterSample/BiQuadFilterSample.csproj @@ -9,8 +9,9 @@ Properties BiQuadFilterSample BiQuadFilterSample - v4.0 + v4.6.1 512 + AnyCPU @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -30,6 +32,7 @@ TRACE prompt 4 + false diff --git a/Samples/CSCoreWaveform/App.config b/Samples/CSCoreWaveform/App.config index 8e156463..d0feca6f 100644 --- a/Samples/CSCoreWaveform/App.config +++ b/Samples/CSCoreWaveform/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Samples/CSCoreWaveform/CSCoreWaveform.csproj b/Samples/CSCoreWaveform/CSCoreWaveform.csproj index 5d4be7ae..deeb43da 100644 --- a/Samples/CSCoreWaveform/CSCoreWaveform.csproj +++ b/Samples/CSCoreWaveform/CSCoreWaveform.csproj @@ -9,10 +9,11 @@ Properties CSCoreWaveform CSCoreWaveform - v4.5 + v4.5.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + AnyCPU diff --git a/Samples/CSCoreWaveform/Properties/Resources.Designer.cs b/Samples/CSCoreWaveform/Properties/Resources.Designer.cs index 00b1224d..4eea8e6e 100644 --- a/Samples/CSCoreWaveform/Properties/Resources.Designer.cs +++ b/Samples/CSCoreWaveform/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace CSCoreWaveform.Properties -{ - - +namespace CSCoreWaveform.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace CSCoreWaveform.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CSCoreWaveform.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Samples/CSCoreWaveform/Properties/Settings.Designer.cs b/Samples/CSCoreWaveform/Properties/Settings.Designer.cs index 8f5d9d83..906b5cb4 100644 --- a/Samples/CSCoreWaveform/Properties/Settings.Designer.cs +++ b/Samples/CSCoreWaveform/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace CSCoreWaveform.Properties -{ - - +namespace CSCoreWaveform.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Samples/ConvertWavToMp3/ConvertWavToMp3.csproj b/Samples/ConvertWavToMp3/ConvertWavToMp3.csproj index bd20f91c..63264e17 100644 --- a/Samples/ConvertWavToMp3/ConvertWavToMp3.csproj +++ b/Samples/ConvertWavToMp3/ConvertWavToMp3.csproj @@ -9,8 +9,9 @@ Properties ConvertWavToMp3 ConvertWavToMp3 - v3.5 + v4.6.1 512 + AnyCPU @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -30,6 +32,7 @@ TRACE prompt 4 + false diff --git a/Samples/EndpointAudioMeterSample/EndpointAudioMeterSample.csproj b/Samples/EndpointAudioMeterSample/EndpointAudioMeterSample.csproj index b0493d6c..d7f21544 100644 --- a/Samples/EndpointAudioMeterSample/EndpointAudioMeterSample.csproj +++ b/Samples/EndpointAudioMeterSample/EndpointAudioMeterSample.csproj @@ -9,7 +9,7 @@ Properties EndpointAudioMeterSample EndpointAudioMeterSample - v4.5 + v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/Samples/EndpointAudioMeterSample/Properties/Resources.Designer.cs b/Samples/EndpointAudioMeterSample/Properties/Resources.Designer.cs index 7d320822..d52da188 100644 --- a/Samples/EndpointAudioMeterSample/Properties/Resources.Designer.cs +++ b/Samples/EndpointAudioMeterSample/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace EndpointAudioMeterSample.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Samples/EndpointAudioMeterSample/Properties/Settings.Designer.cs b/Samples/EndpointAudioMeterSample/Properties/Settings.Designer.cs index cb2cd1af..93c01557 100644 --- a/Samples/EndpointAudioMeterSample/Properties/Settings.Designer.cs +++ b/Samples/EndpointAudioMeterSample/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace EndpointAudioMeterSample.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Samples/EndpointAudioMeterSample/app.config b/Samples/EndpointAudioMeterSample/app.config index 51278a45..3dbff35f 100644 --- a/Samples/EndpointAudioMeterSample/app.config +++ b/Samples/EndpointAudioMeterSample/app.config @@ -1,3 +1,3 @@ - + diff --git a/Samples/Equalizer/App.config b/Samples/Equalizer/App.config index c1fd8012..e8e81a28 100644 --- a/Samples/Equalizer/App.config +++ b/Samples/Equalizer/App.config @@ -2,5 +2,5 @@ - + diff --git a/Samples/Equalizer/EqualizerTest.csproj b/Samples/Equalizer/EqualizerTest.csproj index b8f0bbd1..6f5fd016 100644 --- a/Samples/Equalizer/EqualizerTest.csproj +++ b/Samples/Equalizer/EqualizerTest.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,13 +9,14 @@ Properties EqualizerTest EqualizerTest - v3.5 + v4.6.1 512 SAK SAK SAK SAK - Client + + AnyCPU @@ -26,6 +27,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -35,6 +37,7 @@ TRACE prompt 4 + false diff --git a/Samples/Equalizer/Properties/Resources.Designer.cs b/Samples/Equalizer/Properties/Resources.Designer.cs index 4f7b6c2c..d0b41e64 100644 --- a/Samples/Equalizer/Properties/Resources.Designer.cs +++ b/Samples/Equalizer/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace EqualizerTest.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Samples/Equalizer/Properties/Settings.Designer.cs b/Samples/Equalizer/Properties/Settings.Designer.cs index 8d4ba0b5..c5b02227 100644 --- a/Samples/Equalizer/Properties/Settings.Designer.cs +++ b/Samples/Equalizer/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace EqualizerTest.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Samples/FadingSample/FadingSample.csproj b/Samples/FadingSample/FadingSample.csproj index f6d8d4be..5b0b726e 100644 --- a/Samples/FadingSample/FadingSample.csproj +++ b/Samples/FadingSample/FadingSample.csproj @@ -9,8 +9,9 @@ Properties FadingSample FadingSample - v3.5 + v4.6.1 512 + AnyCPU @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -30,6 +32,7 @@ TRACE prompt 4 + false @@ -50,6 +53,9 @@ CSCore + + +