lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* introduced SFMLClass type for all C pointers

Browse source 
* getNativePointer -> nativePointer property

- IpAddress.isValid
+ IpAddress.None

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1459 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
trass3r 2010-03-15 23:35:53 +00:00
parent 6b444d338e
commit cfedeee112
23 changed files with 317 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

20
DSFML/import/dsfml/audio/music.d
View file

@ -156,16 +156,16 @@ private:
extern(C)
{
void* function(cchar*) sfMusic_CreateFromFile;
void* function(byte*, size_t) sfMusic_CreateFromMemory;
void function(void*, int) sfMusic_SetLoop;
bool function(void*) sfMusic_GetLoop;
float function(void*) sfMusic_GetDuration;
void function(void*) sfMusic_Play;
void function(void*) sfMusic_Pause;
void function(void*) sfMusic_Stop;
uint function(void*) sfMusic_GetChannelsCount;
uint function(void*) sfMusic_GetSampleRate;
SFMLClass function(cchar*) sfMusic_CreateFromFile;
SFMLClass function(byte*, size_t) sfMusic_CreateFromMemory;
void function(SFMLClass, int) sfMusic_SetLoop;
bool function(SFMLClass) sfMusic_GetLoop;
float function(SFMLClass) sfMusic_GetDuration;
void function(SFMLClass) sfMusic_Play;
void function(SFMLClass) sfMusic_Pause;
void function(SFMLClass) sfMusic_Stop;
uint function(SFMLClass) sfMusic_GetChannelsCount;
uint function(SFMLClass) sfMusic_GetSampleRate;
}
static this()

20
DSFML/import/dsfml/audio/sound.d
View file

@ -114,7 +114,7 @@ class Sound : SoundSource!("sfSound")
throw new NullParameterException("NullParameterException : SoundBuffer is null.");
m_buffer = buffer;
sfSound_SetBuffer(m_ptr, buffer.getNativePointer);
sfSound_SetBuffer(m_ptr, buffer.nativePointer);
}
/**
@ -183,15 +183,15 @@ private:
extern (C)
{
typedef void function(void*) pf_sfSound_Play;
typedef void function(void*) pf_sfSound_Pause;
typedef void function(void*) pf_sfSound_Stop;
typedef void function(void*, void*) pf_sfSound_SetBuffer;
typedef void* function(void*) pf_sfSound_GetBuffer;
typedef void function(void*, int) pf_sfSound_SetLoop;
typedef int function(void*) pf_sfSound_GetLoop;
typedef float function(void*) pf_sfSound_GetPlayingOffset;
typedef void function(void*, float) pf_sfSound_SetPlayingOffset;
typedef void function(SFMLClass) pf_sfSound_Play;
typedef void function(SFMLClass) pf_sfSound_Pause;
typedef void function(SFMLClass) pf_sfSound_Stop;
typedef void function(SFMLClass, SFMLClass) pf_sfSound_SetBuffer;
typedef SFMLClass function(SFMLClass) pf_sfSound_GetBuffer;
typedef void function(SFMLClass, int) pf_sfSound_SetLoop;
typedef int function(SFMLClass) pf_sfSound_GetLoop;
typedef float function(SFMLClass) pf_sfSound_GetPlayingOffset;
typedef void function(SFMLClass, float) pf_sfSound_SetPlayingOffset;
static pf_sfSound_Play sfSound_Play;
static pf_sfSound_Pause sfSound_Pause;

22
DSFML/import/dsfml/audio/soundbuffer.d
View file

@ -178,7 +178,7 @@ class SoundBuffer : DSFMLObject
}
package:
this(void* ptr)
this(SFMLClass ptr)
{
super(ptr, true);
}
@ -187,16 +187,16 @@ private:
static extern(C)
{
void* function(cchar*) sfSoundBuffer_CreateFromFile;
void* function(const(byte)*, size_t) sfSoundBuffer_CreateFromMemory;
void* function(const(short)*, size_t, uint, uint) sfSoundBuffer_CreateFromSamples;
void function(void*) sfSoundBuffer_Destroy;
int function(void*, cchar*) sfSoundBuffer_SaveToFile;
short* function(void*) sfSoundBuffer_GetSamples;
size_t function(void*) sfSoundBuffer_GetSamplesCount;
uint function(void*) sfSoundBuffer_GetSampleRate;
uint function(void*) sfSoundBuffer_GetChannelsCount;
float function(void*) sfSoundBuffer_GetDuration;
SFMLClass function(cchar*) sfSoundBuffer_CreateFromFile;
SFMLClass function(const(byte)*, size_t) sfSoundBuffer_CreateFromMemory;
SFMLClass function(const(short)*, size_t, uint, uint) sfSoundBuffer_CreateFromSamples;
void function(SFMLClass) sfSoundBuffer_Destroy;
int function(SFMLClass, cchar*) sfSoundBuffer_SaveToFile;
short* function(SFMLClass) sfSoundBuffer_GetSamples;
size_t function(SFMLClass) sfSoundBuffer_GetSamplesCount;
uint function(SFMLClass) sfSoundBuffer_GetSampleRate;
uint function(SFMLClass) sfSoundBuffer_GetChannelsCount;
float function(SFMLClass) sfSoundBuffer_GetDuration;
}
mixin(loadFromSharedLib2("csfml-audio", "sfSoundBuffer",

6
DSFML/import/dsfml/audio/soundbufferrecorder.d
View file

@ -85,9 +85,9 @@ private:
extern (C)
{
typedef void* function() pf_sfSoundBufferRecorder_Create;
typedef void function(void*) pf_sfSoundBufferRecorder_Destroy;
typedef void* function(void*) pf_sfSoundBufferRecorder_GetBuffer;
typedef SFMLClass function() pf_sfSoundBufferRecorder_Create;
typedef void function(SFMLClass) pf_sfSoundBufferRecorder_Destroy;
typedef SFMLClass function(SFMLClass) pf_sfSoundBufferRecorder_GetBuffer;
static pf_sfSoundBufferRecorder_Create sfSoundBufferRecorder_Create;
static pf_sfSoundBufferRecorder_Destroy sfSoundBufferRecorder_Destroy;

12
DSFML/import/dsfml/audio/soundrecorder.d
View file

@ -146,7 +146,7 @@ protected:
init(true);
}
this(void* ptr)
this(SFMLClass ptr)
{
super(ptr);
@ -288,11 +288,11 @@ private:
static extern (C)
{
void* function(int function(void*), int function(short*, size_t, void*), void function(void*), void*) sfSoundRecorder_Create;
void function(void*) sfSoundRecorder_Destroy;
void function(void*, uint SampleRate) sfSoundRecorder_Start;
void function(void*) sfSoundRecorder_Stop;
uint function(void*) sfSoundRecorder_GetSampleRate;
SFMLClass function(int function(void*), int function(const(short)*, size_t, void*), void function(void*), void*) sfSoundRecorder_Create;
void function(SFMLClass) sfSoundRecorder_Destroy;
void function(SFMLClass, uint SampleRate) sfSoundRecorder_Start;
void function(SFMLClass) sfSoundRecorder_Stop;
uint function(SFMLClass) sfSoundRecorder_GetSampleRate;
int function() sfSoundRecorder_IsAvailable;
}

32
DSFML/import/dsfml/audio/soundsource.d
View file

@ -53,7 +53,7 @@ protected:
super(sfSoundSource_Create());
}
this(void* ptr)
this(SFMLClass ptr)
{
super(ptr);
}
@ -286,23 +286,23 @@ private:
static extern(C)
{
void* function() sfSoundSource_Create;
void function(void*) sfSoundSource_Destroy;
SFMLClass function() sfSoundSource_Create;
void function(SFMLClass) sfSoundSource_Destroy;
SoundStatus function(void*) sfSoundSource_GetStatus;
void function(void*, float) sfSoundSource_SetPitch;
void function(void*, float) sfSoundSource_SetVolume;
void function(void*, float, float, float) sfSoundSource_SetPosition;
float function(void*) sfSoundSource_GetPitch;
float function(void*) sfSoundSource_GetVolume;
void function(void*, float*, float*, float*) sfSoundSource_GetPosition;
float function(void*) sfSoundSource_GetMinDistance;
float function(void*) sfSoundSource_GetAttenuation;
void function(void*, float) sfSoundSource_SetMinDistance;
void function(void*, float) sfSoundSource_SetAttenuation;
SoundStatus function(SFMLClass) sfSoundSource_GetStatus;
void function(SFMLClass, float) sfSoundSource_SetPitch;
void function(SFMLClass, float) sfSoundSource_SetVolume;
void function(SFMLClass, float, float, float) sfSoundSource_SetPosition;
float function(SFMLClass) sfSoundSource_GetPitch;
float function(SFMLClass) sfSoundSource_GetVolume;
void function(SFMLClass, float*, float*, float*) sfSoundSource_GetPosition;
float function(SFMLClass) sfSoundSource_GetMinDistance;
float function(SFMLClass) sfSoundSource_GetAttenuation;
void function(SFMLClass, float) sfSoundSource_SetMinDistance;
void function(SFMLClass, float) sfSoundSource_SetAttenuation;
void function(void*, bool) sfSoundSource_SetRelativeToListener;
bool function(void*) sfSoundSource_IsRelativeToListener;
void function(SFMLClass, bool) sfSoundSource_SetRelativeToListener;
bool function(SFMLClass) sfSoundSource_IsRelativeToListener;
}
mixin(loadDerivedFromSharedLib("csfml-audio", "sfSoundSource", derivedClassName,

22
DSFML/import/dsfml/audio/soundstream.d
View file

@ -334,17 +334,17 @@ private:
alias void function(float, void*) sfSoundStreamSeekCallback;
alias int function (sfSoundStreamChunk*, void*) sfSoundStreamGetDataCallback;
alias void* function(sfSoundStreamGetDataCallback, sfSoundStreamSeekCallback, uint, uint, void*) pf_sfSoundStream_Create;
alias void function(void*) pf_sfSoundStream_Destroy;
alias void function(void*) pf_sfSoundStream_Play;
alias void function(void*) pf_sfSoundStream_Pause;
alias void function(void*) pf_sfSoundStream_Stop;
alias uint function(void*) pf_sfSoundStream_GetChannelsCount;
alias uint function(void*) pf_sfSoundStream_GetSampleRate;
alias float function(void*) pf_sfSoundStream_GetPlayingOffset;
alias void function(void*, float) pf_sfSoundStream_SetPlayingOffset;
alias int function(void*) pf_sfSoundStream_GetLoop;
alias void function(void*, int) pf_sfSoundStream_SetLoop;
alias SFMLClass function(sfSoundStreamGetDataCallback, sfSoundStreamSeekCallback, uint, uint, void*) pf_sfSoundStream_Create;
alias void function(SFMLClass) pf_sfSoundStream_Destroy;
alias void function(SFMLClass) pf_sfSoundStream_Play;
alias void function(SFMLClass) pf_sfSoundStream_Pause;
alias void function(SFMLClass) pf_sfSoundStream_Stop;
alias uint function(SFMLClass) pf_sfSoundStream_GetChannelsCount;
alias uint function(SFMLClass) pf_sfSoundStream_GetSampleRate;
alias float function(SFMLClass) pf_sfSoundStream_GetPlayingOffset;
alias void function(SFMLClass, float) pf_sfSoundStream_SetPlayingOffset;
alias int function(SFMLClass) pf_sfSoundStream_GetLoop;
alias void function(SFMLClass, int) pf_sfSoundStream_SetLoop;
static pf_sfSoundStream_Create sfSoundStream_Create;