Skip to content

Commit c455f89

Browse files
markheathmarkheath
committed
updating for 2.2 release
1 parent 80526a2 commit c455f89

File tree

21 files changed

+364
-36
lines changed

21 files changed

+364
-36
lines changed

‎NAudio.Asio/NAudio.Asio.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<Version>2.1.0</Version>
6+
<Version>2.2.0</Version>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<Authors>Mark Heath</Authors>

‎NAudio.Core/NAudio.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Authors>Mark Heath</Authors>
6-
<Version>2.1.0</Version>
6+
<Version>2.2.0</Version>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<SignAssembly>true</SignAssembly>

‎NAudio.Core/Utils/NativeMethods.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,22 @@ namespace NAudio.Utils
88
/// </summary>
99
public static class NativeMethods
1010
{
11+
/// <summary>
12+
/// Loads a DLL
13+
/// </summary>
1114
[DllImport("kernel32.dll")]
1215
public static extern IntPtr LoadLibrary(string dllToLoad);
1316

17+
/// <summary>
18+
/// Get procedure address
19+
/// </summary>
1420
[DllImport("kernel32.dll")]
1521
public static extern IntPtr GetProcAddress(IntPtr hModule, string procedureName);
1622

23+
24+
/// <summary>
25+
/// Free a library
26+
/// </summary>
1727
[DllImport("kernel32.dll")]
1828
public static extern bool FreeLibrary(IntPtr hModule);
1929
}

‎NAudio.Core/Wave/WaveFormats/AudioMediaSubtypes.cs‎

Lines changed: 215 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,83 +3,291 @@
33

44
namespace NAudio.Dmo
55
{
6+
/// <summary>
7+
/// Audio Media Subtypes
8+
/// </summary>
69
public class AudioMediaSubtypes
710
{
811
// https://msdn.microsoft.com/en-us/library/windows/desktop/dd317599(v=vs.85).aspx
12+
13+
/// <summary>
14+
/// PCM
15+
/// </summary>
916
public static readonly Guid MEDIASUBTYPE_PCM = new Guid("00000001-0000-0010-8000-00AA00389B71"); // PCM audio.
17+
/// <summary>
18+
/// PCM Audio obsolete
19+
/// </summary>
1020
public static readonly Guid MEDIASUBTYPE_PCMAudioObsolete = new Guid("e436eb8a-524f-11ce-9f53-0020af0ba770"); // Obsolete. Do not use.
21+
/// <summary>
22+
/// MPEG1 Packet
23+
/// </summary>
1124
public static readonly Guid MEDIASUBTYPE_MPEG1Packet = new Guid("e436eb80-524f-11ce-9f53-0020af0ba770"); // MPEG1 Audio packet.
25+
/// <summary>
26+
/// MPEG1 Payload
27+
/// </summary>
1228
public static readonly Guid MEDIASUBTYPE_MPEG1Payload = new Guid("e436eb81-524f-11ce-9f53-0020af0ba770"); // MPEG1 Audio Payload.
29+
/// <summary>
30+
/// MPEG2 Audio
31+
/// </summary>
1332
public static readonly Guid MEDIASUBTYPE_MPEG2_AUDIO = new Guid("e06d802b-db46-11cf-b4d1-00805f6cbbea"); // MPEG-2 audio data
33+
/// <summary>
34+
/// DVD audio data
35+
/// </summary>
1436
public static readonly Guid MEDIASUBTYPE_DVD_LPCM_AUDIO = new Guid("e06d8032-db46-11cf-b4d1-00805f6cbbea"); // DVD audio data
37+
/// <summary>
38+
/// DRM Audio
39+
/// </summary>
1540
public static readonly Guid MEDIASUBTYPE_DRM_Audio = new Guid("00000009-0000-0010-8000-00aa00389b71"); // Corresponds to WAVE_FORMAT_DRM.
41+
/// <summary>
42+
/// IEEE Float
43+
/// </summary>
1644
public static readonly Guid MEDIASUBTYPE_IEEE_FLOAT = new Guid("00000003-0000-0010-8000-00aa00389b71"); // Corresponds to WAVE_FORMAT_IEEE_FLOAT
45+
/// <summary>
46+
/// Dolby AC3
47+
/// </summary>
1748
public static readonly Guid MEDIASUBTYPE_DOLBY_AC3 = new Guid("e06d802c-db46-11cf-b4d1-00805f6cbbea"); // Dolby data
49+
/// <summary>
50+
/// Dolby AC3 SPDIF
51+
/// </summary>
1852
public static readonly Guid MEDIASUBTYPE_DOLBY_AC3_SPDIF = new Guid("00000092-0000-0010-8000-00aa00389b71"); // Dolby AC3 over SPDIF.
53+
/// <summary>
54+
/// RAW Sport
55+
/// </summary>
1956
public static readonly Guid MEDIASUBTYPE_RAW_SPORT = new Guid("00000240-0000-0010-8000-00aa00389b71"); // Equivalent to MEDIASUBTYPE_DOLBY_AC3_SPDIF.
57+
/// <summary>
58+
/// SPDIF TAG 241h
59+
/// </summary>
2060
public static readonly Guid MEDIASUBTYPE_SPDIF_TAG_241h = new Guid("00000241-0000-0010-8000-00aa00389b71"); // Equivalent to MEDIASUBTYPE_DOLBY_AC3_SPDIF.
2161

2262

2363
// http://msdn.microsoft.com/en-us/library/dd757532%28VS.85%29.aspx
64+
/// <summary>
65+
/// I420
66+
/// </summary>
2467
public static readonly Guid MEDIASUBTYPE_I420 = new Guid("30323449-0000-0010-8000-00AA00389B71");
68+
/// <summary>
69+
/// IYUV
70+
/// </summary>
2571
public static readonly Guid MEDIASUBTYPE_IYUV = new Guid("56555949-0000-0010-8000-00AA00389B71");
72+
/// <summary>
73+
/// RGB1
74+
/// </summary>
2675
public static readonly Guid MEDIASUBTYPE_RGB1 = new Guid("e436eb78-524f-11ce-9f53-0020af0ba770");
76+
/// <summary>
77+
/// RGB24
78+
/// </summary>
2779
public static readonly Guid MEDIASUBTYPE_RGB24 = new Guid("e436eb7d-524f-11ce-9f53-0020af0ba770");
80+
/// <summary>
81+
/// RGB32
82+
/// </summary>
2883
public static readonly Guid MEDIASUBTYPE_RGB32 = new Guid("e436eb7e-524f-11ce-9f53-0020af0ba770");
84+
/// <summary>
85+
/// RGB4
86+
/// </summary>
2987
public static readonly Guid MEDIASUBTYPE_RGB4 = new Guid("e436eb79-524f-11ce-9f53-0020af0ba770");
88+
/// <summary>
89+
/// RGB555
90+
/// </summary>
3091
public static readonly Guid MEDIASUBTYPE_RGB555 = new Guid("e436eb7c-524f-11ce-9f53-0020af0ba770");
92+
/// <summary>
93+
/// RGB565
94+
/// </summary>
3195
public static readonly Guid MEDIASUBTYPE_RGB565 = new Guid("e436eb7b-524f-11ce-9f53-0020af0ba770");
96+
/// <summary>
97+
/// RGB8
98+
/// </summary>
3299
public static readonly Guid MEDIASUBTYPE_RGB8 = new Guid("e436eb7a-524f-11ce-9f53-0020af0ba770");
100+
/// <summary>
101+
/// UYVY
102+
/// </summary>
33103
public static readonly Guid MEDIASUBTYPE_UYVY = new Guid("59565955-0000-0010-8000-00AA00389B71");
104+
/// <summary>
105+
/// Video Image
106+
/// </summary>
34107
public static readonly Guid MEDIASUBTYPE_VIDEOIMAGE = new Guid("1d4a45f2-e5f6-4b44-8388-f0ae5c0e0c37");
108+
/// <summary>
109+
/// YUY2
110+
/// </summary>
35111
public static readonly Guid MEDIASUBTYPE_YUY2 = new Guid("32595559-0000-0010-8000-00AA00389B71");
112+
/// <summary>
113+
/// YV12
114+
/// </summary>
36115
public static readonly Guid MEDIASUBTYPE_YV12 = new Guid("31313259-0000-0010-8000-00AA00389B71");
116+
/// <summary>
117+
/// YVU9
118+
/// </summary>
37119
public static readonly Guid MEDIASUBTYPE_YVU9 = new Guid("39555659-0000-0010-8000-00AA00389B71");
120+
/// <summary>
121+
/// YVYU
122+
/// </summary>
38123
public static readonly Guid MEDIASUBTYPE_YVYU = new Guid("55595659-0000-0010-8000-00AA00389B71");
124+
/// <summary>
125+
/// MPEG2 Video
126+
/// </summary>
39127
public static readonly Guid WMFORMAT_MPEG2Video = new Guid("e06d80e3-db46-11cf-b4d1-00805f6cbbea");
128+
/// <summary>
129+
/// SCcript
130+
/// </summary>
40131
public static readonly Guid WMFORMAT_Script = new Guid("5C8510F2-DEBE-4ca7-BBA5-F07A104F8DFF");
132+
/// <summary>
133+
/// Video Info
134+
/// </summary>
41135
public static readonly Guid WMFORMAT_VideoInfo = new Guid("05589f80-c356-11ce-bf01-00aa0055595a");
136+
/// <summary>
137+
/// WAVEFORMATEX
138+
/// </summary>
42139
public static readonly Guid WMFORMAT_WaveFormatEx = new Guid("05589f81-c356-11ce-bf01-00aa0055595a");
140+
/// <summary>
141+
/// Webstream
142+
/// </summary>
43143
public static readonly Guid WMFORMAT_WebStream = new Guid("da1e6b13-8359-4050-b398-388e965bf00c");
144+
/// <summary>
145+
/// ACELP net
146+
/// </summary>
44147
public static readonly Guid WMMEDIASUBTYPE_ACELPnet = new Guid("00000130-0000-0010-8000-00AA00389B71");
148+
/// <summary>
149+
/// Base
150+
/// </summary>
45151
public static readonly Guid WMMEDIASUBTYPE_Base = new Guid("00000000-0000-0010-8000-00AA00389B71");
152+
/// <summary>
153+
/// DRM
154+
/// </summary>
46155
public static readonly Guid WMMEDIASUBTYPE_DRM = new Guid("00000009-0000-0010-8000-00AA00389B71");
156+
/// <summary>
157+
/// MP3
158+
/// </summary>
47159
public static readonly Guid WMMEDIASUBTYPE_MP3 = new Guid("00000055-0000-0010-8000-00AA00389B71");
160+
/// <summary>
161+
/// MP43
162+
/// </summary>
48163
public static readonly Guid WMMEDIASUBTYPE_MP43 = new Guid("3334504D-0000-0010-8000-00AA00389B71");
164+
/// <summary>
165+
/// MP4S
166+
/// </summary>
49167
public static readonly Guid WMMEDIASUBTYPE_MP4S = new Guid("5334504D-0000-0010-8000-00AA00389B71");
168+
/// <summary>
169+
/// M4S2
170+
/// </summary>
50171
public static readonly Guid WMMEDIASUBTYPE_M4S2 = new Guid("3253344D-0000-0010-8000-00AA00389B71");
172+
/// <summary>
173+
/// P422
174+
/// </summary>
51175
public static readonly Guid WMMEDIASUBTYPE_P422 = new Guid("32323450-0000-0010-8000-00AA00389B71");
176+
/// <summary>
177+
/// MPEG2 Video
178+
/// </summary>
52179
public static readonly Guid WMMEDIASUBTYPE_MPEG2_VIDEO = new Guid("e06d8026-db46-11cf-b4d1-00805f6cbbea");
180+
/// <summary>
181+
/// MSS1
182+
/// </summary>
53183
public static readonly Guid WMMEDIASUBTYPE_MSS1 = new Guid("3153534D-0000-0010-8000-00AA00389B71");
184+
/// <summary>
185+
/// MSS2
186+
/// </summary>
54187
public static readonly Guid WMMEDIASUBTYPE_MSS2 = new Guid("3253534D-0000-0010-8000-00AA00389B71");
188+
/// <summary>
189+
/// PCM
190+
/// </summary>
55191
public static readonly Guid WMMEDIASUBTYPE_PCM = new Guid("00000001-0000-0010-8000-00AA00389B71");
192+
/// <summary>
193+
/// WebStream
194+
/// </summary>
56195
public static readonly Guid WMMEDIASUBTYPE_WebStream = new Guid("776257d4-c627-41cb-8f81-7ac7ff1c40cc");
196+
/// <summary>
197+
/// WM Audio Lossless
198+
/// </summary>
57199
public static readonly Guid WMMEDIASUBTYPE_WMAudio_Lossless = new Guid("00000163-0000-0010-8000-00AA00389B71");
200+
/// <summary>
201+
/// WM Audio V2
202+
/// </summary>
58203
public static readonly Guid WMMEDIASUBTYPE_WMAudioV2 = new Guid("00000161-0000-0010-8000-00AA00389B71");
204+
/// <summary>
205+
/// WM Audio V7
206+
/// </summary>
59207
public static readonly Guid WMMEDIASUBTYPE_WMAudioV7 = new Guid("00000161-0000-0010-8000-00AA00389B71");
208+
/// <summary>
209+
/// WM Audio V8
210+
/// </summary>
60211
public static readonly Guid WMMEDIASUBTYPE_WMAudioV8 = new Guid("00000161-0000-0010-8000-00AA00389B71");
212+
/// <summary>
213+
/// WM Audio V9
214+
/// </summary>
61215
public static readonly Guid WMMEDIASUBTYPE_WMAudioV9 = new Guid("00000162-0000-0010-8000-00AA00389B71");
216+
/// <summary>
217+
/// WMSP1
218+
/// </summary>
62219
public static readonly Guid WMMEDIASUBTYPE_WMSP1 = new Guid("0000000A-0000-0010-8000-00AA00389B71");
220+
/// <summary>
221+
/// WMV1
222+
/// </summary>
63223
public static readonly Guid WMMEDIASUBTYPE_WMV1 = new Guid("31564D57-0000-0010-8000-00AA00389B71");
224+
/// <summary>
225+
/// WMV2
226+
/// </summary>
64227
public static readonly Guid WMMEDIASUBTYPE_WMV2 = new Guid("32564D57-0000-0010-8000-00AA00389B71");
228+
/// <summary>
229+
/// WMV3
230+
/// </summary>
65231
public static readonly Guid WMMEDIASUBTYPE_WMV3 = new Guid("33564D57-0000-0010-8000-00AA00389B71");
232+
/// <summary>
233+
/// WMVA
234+
/// </summary>
66235
public static readonly Guid WMMEDIASUBTYPE_WMVA = new Guid("41564D57-0000-0010-8000-00AA00389B71");
236+
/// <summary>
237+
/// WMVP
238+
/// </summary>
67239
public static readonly Guid WMMEDIASUBTYPE_WMVP = new Guid("50564D57-0000-0010-8000-00AA00389B71");
240+
/// <summary>
241+
/// WMVP2
242+
/// </summary>
68243
public static readonly Guid WMMEDIASUBTYPE_WVP2 = new Guid("32505657-0000-0010-8000-00AA00389B71");
244+
/// <summary>
245+
/// Audio
246+
/// </summary>
69247
public static readonly Guid WMMEDIATYPE_Audio = new Guid("73647561-0000-0010-8000-00AA00389B71");
248+
/// <summary>
249+
/// File Transfer
250+
/// </summary>
70251
public static readonly Guid WMMEDIATYPE_FileTransfer = new Guid("D9E47579-930E-4427-ADFC-AD80F290E470");
252+
/// <summary>
253+
/// Image
254+
/// </summary>
71255
public static readonly Guid WMMEDIATYPE_Image = new Guid("34A50FD8-8AA5-4386-81FE-A0EFE0488E31");
256+
/// <summary>
257+
/// Script
258+
/// </summary>
72259
public static readonly Guid WMMEDIATYPE_Script = new Guid("73636d64-0000-0010-8000-00AA00389B71");
260+
/// <summary>
261+
/// Text
262+
/// </summary>
73263
public static readonly Guid WMMEDIATYPE_Text = new Guid("9BBA1EA7-5AB2-4829-BA57-0940209BCF3E");
264+
/// <summary>
265+
/// Video
266+
/// </summary>
74267
public static readonly Guid WMMEDIATYPE_Video = new Guid("73646976-0000-0010-8000-00AA00389B71");
268+
/// <summary>
269+
/// Two strings
270+
/// </summary>
75271
public static readonly Guid WMSCRIPTTYPE_TwoStrings = new Guid("82f38a70-c29f-11d1-97ad-00a0c95ea850");
76272

77273

78274
// others?
275+
/// <summary>
276+
/// Wave
277+
/// </summary>
79278
public static readonly Guid MEDIASUBTYPE_WAVE = new Guid("e436eb8b-524f-11ce-9f53-0020af0ba770");
279+
/// <summary>
280+
/// AU
281+
/// </summary>
80282
public static readonly Guid MEDIASUBTYPE_AU = new Guid("e436eb8c-524f-11ce-9f53-0020af0ba770");
283+
/// <summary>
284+
/// AIFF
285+
/// </summary>
81286
public static readonly Guid MEDIASUBTYPE_AIFF = new Guid("e436eb8d-524f-11ce-9f53-0020af0ba770");
82287

288+
/// <summary>
289+
/// Audio Subtypes
290+
/// </summary>
83291
public static readonly Guid[] AudioSubTypes = {
84292
MEDIASUBTYPE_PCM,
85293
MEDIASUBTYPE_PCMAudioObsolete,
@@ -96,6 +304,9 @@ public class AudioMediaSubtypes
96304
WMMEDIASUBTYPE_MP3,
97305
};
98306

307+
/// <summary>
308+
/// Audio subtype names
309+
/// </summary>
99310
public static readonly string[] AudioSubTypeNames = {
100311
"PCM",
101312
"PCM Obsolete",
@@ -111,6 +322,10 @@ public class AudioMediaSubtypes
111322
"SPDIF_TAG_241h",
112323
"MP3"
113324
};
325+
326+
/// <summary>
327+
/// Get Audio Subtype Name
328+
/// </summary>
114329
public static string GetAudioSubtypeName(Guid subType)
115330
{
116331
for (int index = 0; index < AudioSubTypes.Length; index++)

0 commit comments

Comments
 (0)