fna-workbench

fna-workbench Commit Details


Date:2016-01-26 20:54:34 (9 years 7 months ago)
Author:Ethan Lee
Branch:master
Commit:ffc6f8dd72acffd01b3ce84bcb966a5c462168cd
Parents: 6f66a333fc8220d857f97960820bbb5d1a95b9ba
Message:DynamicSoundEffectInstance - SetFloatBufferEXT with offset/count IALDevice - Offsets are now read in SetBufferData Submodules - Update SDL2# and OpenAL#
Changes:

File differences

gendarme/openal.ignore
9898
9999
100100
101
101102
102103
103104
......
262263
263264
264265
266
265267
266268
267269
M: System.Void OpenAL.AL10::alDeleteBuffers(System.IntPtr,System.UInt32[])␊
M: System.Void OpenAL.AL10::alDeleteBuffers(System.IntPtr,System.UInt32&)␊
M: System.Boolean OpenAL.AL10::alIsBuffer(System.UInt32)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.IntPtr,System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.Byte[],System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.Int16[],System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.Single[],System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alDeleteBuffers(System.IntPtr,System.UInt32[])␊
M: System.Void OpenAL.AL10::alDeleteBuffers(System.IntPtr,System.UInt32&)␊
M: System.Boolean OpenAL.AL10::alIsBuffer(System.UInt32)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.IntPtr,System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.Byte[],System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.Int16[],System.IntPtr,System.IntPtr)␊
M: System.Void OpenAL.AL10::alBufferData(System.UInt32,System.Int32,System.Single[],System.IntPtr,System.IntPtr)␊
gendarme/sdl2.ignore
167167
168168
169169
170
171170
172171
173172
......
470469
471470
472471
472
473473
474474
475475
......
571571
572572
573573
574
574575
575576
576577
......
923924
924925
925926
927
926928
927929
928930
......
10681070
10691071
10701072
1071
10721073
10731074
10741075
......
13481349
13491350
13501351
1352
13511353
13521354
13531355
......
14871489
14881490
14891491
1492
14901493
14911494
14921495
M: System.Int32 SDL2.SDL::SDL_LockTexture(System.IntPtr,SDL2.SDL/SDL_Rect&,System.IntPtr&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_LockTexture(System.IntPtr,System.IntPtr,System.IntPtr&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_QueryTexture(System.IntPtr,System.UInt32&,System.Int32&,System.Int32&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_QueryTexturePixels(System.IntPtr,System.IntPtr&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_RenderClear(System.IntPtr)␊
M: System.Int32 SDL2.SDL::SDL_RenderCopy(System.IntPtr,System.IntPtr,SDL2.SDL/SDL_Rect&,SDL2.SDL/SDL_Rect&)␊
M: System.Int32 SDL2.SDL::SDL_RenderCopy(System.IntPtr,System.IntPtr,System.IntPtr,SDL2.SDL/SDL_Rect&)␊
M: SDL2.SDL/SDL_bool SDL2.SDL::SDL_GetWindowWMInfo(System.IntPtr,SDL2.SDL/SDL_SysWMinfo&)␊
M: System.String SDL2.SDL::SDL_GetBasePath()␊
M: System.String SDL2.SDL::SDL_GetPrefPath(System.String,System.String)␊
M: SDL2.SDL/SDL_PowerState SDL2.SDL::SDL_GetPowerInfo(System.Int32&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_GetCPUCount()␊
M: System.Int32 SDL2.SDL::SDL_GetSystemRAM()␊
T: SDL2.SDL/SDL_bool␊
T: SDL2.SDL/INTERNAL_android_wminfo␊
T: SDL2.SDL/INTERNAL_SysWMDriverUnion␊
T: SDL2.SDL/SDL_SysWMinfo␊
T: SDL2.SDL/SDL_PowerState␊
T: SDL2.SDL_image␊
M: System.Void SDL2.SDL_image::SDL_IMAGE_VERSION(SDL2.SDL/SDL_version&)␊
M: SDL2.SDL/SDL_version SDL2.SDL_image::IMG_LinkedVersion()␊
T: SDL2.SDL/INTERNAL_android_wminfo␊
T: SDL2.SDL/INTERNAL_SysWMDriverUnion␊
T: SDL2.SDL/SDL_SysWMinfo␊
T: SDL2.SDL/SDL_PowerState␊
T: SDL2.SDL_image/IMG_InitFlags␊
T: SDL2.SDL_mixer/MIX_InitFlags␊
T: SDL2.SDL_mixer/Mix_Fading␊
M: System.Int32 SDL2.SDL::SDL_LockTexture(System.IntPtr,SDL2.SDL/SDL_Rect&,System.IntPtr&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_LockTexture(System.IntPtr,System.IntPtr,System.IntPtr&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_QueryTexture(System.IntPtr,System.UInt32&,System.Int32&,System.Int32&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_QueryTexturePixels(System.IntPtr,System.IntPtr&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_RenderClear(System.IntPtr)␊
M: System.Int32 SDL2.SDL::SDL_RenderCopy(System.IntPtr,System.IntPtr,SDL2.SDL/SDL_Rect&,SDL2.SDL/SDL_Rect&)␊
M: System.Int32 SDL2.SDL::SDL_RenderCopy(System.IntPtr,System.IntPtr,System.IntPtr,SDL2.SDL/SDL_Rect&)␊
M: SDL2.SDL/SDL_bool SDL2.SDL::SDL_GetWindowWMInfo(System.IntPtr,SDL2.SDL/SDL_SysWMinfo&)␊
M: System.String SDL2.SDL::SDL_GetBasePath()␊
M: System.String SDL2.SDL::SDL_GetPrefPath(System.String,System.String)␊
M: SDL2.SDL/SDL_PowerState SDL2.SDL::SDL_GetPowerInfo(System.Int32&,System.Int32&)␊
M: System.Int32 SDL2.SDL::SDL_GetCPUCount()␊
M: System.Int32 SDL2.SDL::SDL_GetSystemRAM()␊
M: System.IntPtr SDL2.SDL_image::INTERNAL_IMG_LinkedVersion()␊
T: SDL2.SDL/SDL_TextureAccess␊
T: SDL2.SDL/SDL_TextureModulate␊
T: SDL2.SDL/SDL_Scancode␊
T: SDL2.SDL/SDL_PowerState␊
T: SDL2.SDL_mixer/Mix_Fading␊
␊
R: Gendarme.Rules.Naming.DoNotUseReservedInEnumValueNamesRule␊
lib/OpenAL-CS
1
1
Subproject commit 1babf1e4baf88d843b98bf1ff7d651a2a1e7e36d␊
Subproject commit bd9bc29f4949274aa12f081dc2b9ae8179071fa1␊
lib/SDL2-CS
1
1
Subproject commit 9b6f16a23821fadd22da5eb81810410a301c81a3␊
Subproject commit cceef27e502483e5b89f779d315e8ac315b07ba6␊
src/Audio/DynamicSoundEffectInstance.cs
163163
164164
165165
166
166
167
167168
168169
169170
......
344345
345346
346347
347
348348
349349
350
351
352
353
354
350355
351356
352357
......
364369
365370
366371
372
373
367374
368375
369376
␉␉␉AudioDevice.ALDevice.SetBufferData(␊
␉␉␉␉newBuf,␊
␉␉␉␉channels,␊
␉␉␉␉buffer, // TODO: offset -flibit␊
␉␉␉␉buffer,␊
␉␉␉␉offset,␊
␉␉␉␉count,␊
␉␉␉␉sampleRate␊
␉␉␉);␊
␊
␉␉#region Public FNA Extension Methods␊
␊
␉␉/* THIS IS AN EXTENSION OF THE XNA4 API! */␊
␉␉public void SubmitFloatBufferEXT(float[] buffer)␊
␉␉{␊
␉␉␉SubmitFloatBufferEXT(buffer, 0, buffer.Length);␊
␉␉}␊
␊
␉␉public void SubmitFloatBufferEXT(float[] buffer, int offset, int count)␊
␉␉{␊
␉␉␉/* Float samples are the typical format received from decoders.␊
␉␉␉ * We currently use this for the VideoPlayer.␊
␉␉␉ * -flibit␊
␉␉␉␉newBuf,␊
␉␉␉␉channels,␊
␉␉␉␉buffer,␊
␉␉␉␉offset,␊
␉␉␉␉count,␊
␉␉␉␉sampleRate␊
␉␉␉);␊
␊
src/Audio/IALDevice.cs
3737
3838
3939
40
4041
4142
4243
......
4445
4546
4647
48
49
4750
4851
4952
␉␉␉IALBuffer buffer,␊
␉␉␉AudioChannels channels,␊
␉␉␉byte[] data,␊
␉␉␉int offset,␊
␉␉␉int count,␊
␉␉␉int sampleRate␊
␉␉);␊
␉␉␉IALBuffer buffer,␊
␉␉␉AudioChannels channels,␊
␉␉␉float[] data,␊
␉␉␉int offset,␊
␉␉␉int count,␊
␉␉␉int sampleRate␊
␉␉);␊
␊
src/Audio/NullDevice.cs
9292
9393
9494
95
9596
9697
9798
......
102103
103104
104105
106
107
105108
106109
107110
␉␉␉IALBuffer buffer,␊
␉␉␉AudioChannels channels,␊
␉␉␉byte[] data,␊
␉␉␉int offset,␊
␉␉␉int count,␊
␉␉␉int sampleRate␊
␉␉) {␊
␉␉␉IALBuffer buffer,␊
␉␉␉AudioChannels channels,␊
␉␉␉float[] data,␊
␉␉␉int offset,␊
␉␉␉int count,␊
␉␉␉int sampleRate␊
␉␉) {␊
␉␉␉// No-op, duh.␊
src/Audio/OpenALDevice.cs
327327
328328
329329
330
330331
331332
332333
334
333335
334336
335337
336
338
337339
338340
339341
342
340343
341344
342345
......
346349
347350
348351
352
353
349354
350355
356
351357
352358
353359
354
355
360
361
356362
357363
364
358365
359366
360367
␉␉␉IALBuffer buffer,␊
␉␉␉AudioChannels channels,␊
␉␉␉byte[] data,␊
␉␉␉int offset,␊
␉␉␉int count,␊
␉␉␉int sampleRate␊
␉␉) {␊
␉␉␉GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);␊
␉␉␉AL10.alBufferData(␊
␉␉␉␉(buffer as OpenALBuffer).Handle,␊
␉␉␉␉XNAToShort[(int) channels],␊
␉␉␉␉data, // TODO: offset -flibit␊
␉␉␉␉handle.AddrOfPinnedObject() + offset,␊
␉␉␉␉(IntPtr) count,␊
␉␉␉␉(IntPtr) sampleRate␊
␉␉␉);␊
␉␉␉handle.Free();␊
#if VERBOSE_AL_DEBUGGING␊
␉␉␉CheckALError();␊
#endif␊
␉␉␉IALBuffer buffer,␊
␉␉␉AudioChannels channels,␊
␉␉␉float[] data,␊
␉␉␉int offset,␊
␉␉␉int count,␊
␉␉␉int sampleRate␊
␉␉) {␊
␉␉␉GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);␊
␉␉␉AL10.alBufferData(␊
␉␉␉␉(buffer as OpenALBuffer).Handle,␊
␉␉␉␉XNAToFloat[(int) channels],␊
␉␉␉␉data,␊
␉␉␉␉(IntPtr) (data.Length * 4),␊
␉␉␉␉handle.AddrOfPinnedObject() + offset,␊
␉␉␉␉(IntPtr) (count * 4),␊
␉␉␉␉(IntPtr) sampleRate␊
␉␉␉);␊
␉␉␉handle.Free();␊
#if VERBOSE_AL_DEBUGGING␊
␉␉␉CheckALError();␊
#endif␊

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.14798s using 13 queries.