mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 12:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

* changed SoundStream.onStart to onSeek

Browse Source 
* made network package compilable in D2
+ Vector2.max function to return the bigger member

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1354 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
trass3r 2010-01-13 17:42:05 +00:00
parent 40f13c7302
commit bf539551b9
9 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DSFML/import/dsfml/audio/sound.d
View File

@ -68,8 +68,8 @@ class Sound : SoundSource!("sfSound")
throw new NullParameterException("NullParameterException : SoundBuffer is null.");
super();
sfSound_SetBuffer(m_ptr, buffer.getNativePointer());
sfSound_SetLoop(m_ptr, loop);
setBuffer(buffer);
setLoop(loop);
setPitch(pitch);
setVolume(volume);
setPosition(x, y, z);

2
DSFML/import/dsfml/audio/soundsource.d
View File

@ -32,7 +32,7 @@ protected :
this(void* ptr)
{
super(ptr, true);
super(ptr);
}
////////////////////////////////////////////////////////////

14
DSFML/import/dsfml/audio/soundstream.d
View File

@ -199,7 +199,7 @@ protected:
m_channelsCount = channelsCount;
m_sampleRate = sampleRate;
m_ptr = sfSoundStream_Create(&externalOnGetData, &externalOnSeek, channelsCount, sampleRate, &m_id); // TODO: hack
super(sfSoundStream_Create(&externalOnGetData, &externalOnSeek, channelsCount, sampleRate, &m_id));
m_mutex = new Mutex();
@ -212,12 +212,9 @@ protected:
}
/**
* Called each time the stream restart
*
* Returns:
* false to abort the playback
* Called each time the stream is seeked
*/
abstract bool onStart();
abstract void onSeek();
/**
* Called each time the stream needs new data.
@ -233,16 +230,15 @@ protected:
private:
// Called sync when user calling play()
// FIXME: this needs to be transformed from OnStart to OnSeek
// TODO: check if it's correct that way
extern(C) static void externalOnSeek(float t, void* user)
{
int id;
if ((id = *cast(int*) user) in s_instances)
{
SoundStream temp = s_instances[id];
return (temp.m_flag = temp.onStart());
return (temp.onSeek());
}
// return true;
}
// C Thread callback (no allocation can be done)

24
DSFML/import/dsfml/network/ftp.d
View File

@ -173,7 +173,7 @@ class Ftp : DSFMLObject
typedef void function(void*) pf_sfFtpResponse_Destroy;
typedef int function(void*) pf_sfFtpResponse_IsOk;
typedef FtpStatus function(void*) pf_sfFtpResponse_GetStatus;
typedef char* function(void*) pf_sfFtpResponse_GetMessage;
typedef ichar* function(void*) pf_sfFtpResponse_GetMessage;
static pf_sfFtpResponse_Destroy sfFtpResponse_Destroy;
static pf_sfFtpResponse_IsOk sfFtpResponse_IsOk;
@ -222,7 +222,7 @@ class Ftp : DSFMLObject
extern (C)
{
typedef void function(void*) pf_sfFtpDirectoryResponse_Destroy;
typedef char* function(void*) pf_sfFtpDirectoryResponse_GetDirectory;
typedef ichar* function(void*) pf_sfFtpDirectoryResponse_GetDirectory;
static pf_sfFtpDirectoryResponse_Destroy sfFtpDirectoryResponse_Destroy;
static pf_sfFtpDirectoryResponse_GetDirectory sfFtpDirectoryResponse_GetDirectory;
@ -301,7 +301,7 @@ class Ftp : DSFMLObject
{
typedef void function(void*) pf_sfFtpListingResponse_Destroy;
typedef size_t function(void*) pf_sfFtpListingResponse_GetCount;
typedef char* function(void*, size_t) pf_sfFtpListingResponse_GetFilename;
typedef ichar* function(void*, size_t) pf_sfFtpListingResponse_GetFilename;
static pf_sfFtpListingResponse_Destroy sfFtpListingResponse_Destroy;
static pf_sfFtpListingResponse_GetCount sfFtpListingResponse_GetCount;
@ -542,19 +542,19 @@ private:
typedef void function(void*) pf_sfFtp_Destroy;
typedef void* function(void*, IPAddress, ushort, float) pf_sfFtp_Connect;
typedef void* function(void*) pf_sfFtp_LoginAnonymous;
typedef void* function(void*, char*, char*) pf_sfFtp_Login;
typedef void* function(void*, cchar*, cchar*) pf_sfFtp_Login;
typedef void* function(void*) pf_sfFtp_Disconnect;
typedef void* function(void*) pf_sfFtp_KeepAlive;
typedef void* function(void*) pf_sfFtp_GetWorkingDirectory;
typedef void* function(void*, char*) pf_sfFtp_GetDirectoryListing;
typedef void* function(void*, char*) pf_sfFtp_ChangeDirectory;
typedef void* function(void*, cchar*) pf_sfFtp_GetDirectoryListing;
typedef void* function(void*, cchar*) pf_sfFtp_ChangeDirectory;
typedef void* function(void*) pf_sfFtp_ParentDirectory;
typedef void* function(void*, char*) pf_sfFtp_MakeDirectory;
typedef void* function(void*, char*) pf_sfFtp_DeleteDirectory;
typedef void* function(void*, char*, char*) pf_sfFtp_RenameFile;
typedef void* function(void*, char*) pf_sfFtp_DeleteFile;
typedef void* function(void*, char*, char*, FtpTransferMode) pf_sfFtp_Download;
typedef void* function(void*, char*, char*, FtpTransferMode) pf_sfFtp_Upload;
typedef void* function(void*, cchar*) pf_sfFtp_MakeDirectory;
typedef void* function(void*, cchar*) pf_sfFtp_DeleteDirectory;
typedef void* function(void*, cchar*, cchar*) pf_sfFtp_RenameFile;
typedef void* function(void*, cchar*) pf_sfFtp_DeleteFile;
typedef void* function(void*, cchar*, cchar*, FtpTransferMode) pf_sfFtp_Download;
typedef void* function(void*, cchar*, cchar*, FtpTransferMode) pf_sfFtp_Upload;
static pf_sfFtp_Create sfFtp_Create;
static pf_sfFtp_Destroy sfFtp_Destroy;

12
DSFML/import/dsfml/network/http.d
View File

@ -162,11 +162,11 @@ class Http : DSFMLObject
extern (C)
{
typedef void function(void*) pf_sfHttpResponse_Destroy;
typedef char* function(void*, char*) pf_sfHttpResponse_GetField;
typedef ichar* function(void*, cchar*) pf_sfHttpResponse_GetField;
typedef HttpStatus function(void*) pf_sfHttpResponse_GetStatus;
typedef uint function(void*) pf_sfHttpResponse_GetMajorVersion;
typedef uint function(void*) pf_sfHttpResponse_GetMinorVersion;
typedef char* function(void*) pf_sfHttpResponse_GetBody;
typedef ichar* function(void*) pf_sfHttpResponse_GetBody;
static pf_sfHttpResponse_Destroy sfHttpResponse_Destroy;
static pf_sfHttpResponse_GetField sfHttpResponse_GetField;
@ -278,11 +278,11 @@ class Http : DSFMLObject
{
typedef void* function() pf_sfHttpRequest_Create;
typedef void function(void*) pf_sfHttpRequest_Destroy;
typedef void function(void*, char*, char*) pf_sfHttpRequest_SetField;
typedef void function(void*, cchar*, cchar*) pf_sfHttpRequest_SetField;
typedef void function(void*, HttpMethod) pf_sfHttpRequest_SetMethod;
typedef void function(void*, char*) pf_sfHttpRequest_SetURI;
typedef void function(void*, cchar*) pf_sfHttpRequest_SetURI;
typedef void function(void*, uint, uint) pf_sfHttpRequest_SetHttpVersion;
typedef void function(void*, char*) pf_sfHttpRequest_SetBody;
typedef void function(void*, cchar*) pf_sfHttpRequest_SetBody;
static pf_sfHttpRequest_Create sfHttpRequest_Create;
static pf_sfHttpRequest_Destroy sfHttpRequest_Destroy;
@ -374,7 +374,7 @@ private:
{
typedef void* function() pf_sfHttp_Create;
typedef void function(void*) pf_sfHttp_Destroy;
typedef void function(void*, char*, ushort) pf_sfHttp_SetHost;
typedef void function(void*, cchar*, ushort) pf_sfHttp_SetHost;
typedef void* function(void*, void*) pf_sfHttp_SendRequest;
static pf_sfHttp_Create sfHttp_Create;

2
DSFML/import/dsfml/network/ipaddress.d
View File

@ -134,7 +134,7 @@ private:
extern (C)
{
typedef IPAddress function(char*) pf_sfIPAddress_FromString;
typedef IPAddress function(cchar*) pf_sfIPAddress_FromString;
typedef IPAddress function(ubyte, ubyte, ubyte, ubyte) pf_sfIPAddress_FromBytes;
typedef IPAddress function(uint) pf_sfIPAddress_FromInteger;
typedef int function(IPAddress) pf_sfIPAddress_IsValid;

18
DSFML/import/dsfml/network/packet.d
View File

@ -130,7 +130,9 @@ class Packet : DSFMLObject
byte[] getData()
{
if (canRead)
return sfPacket_GetData(m_ptr)[0..getDataSize];
return sfPacket_GetData(m_ptr)[0..getDataSize()];
else
return null;
}
@ -253,20 +255,18 @@ private:
}
void internalGet(ref string data)
{
scope string temp = new char[sfPacket_GetDataSize(m_ptr)];
scope char[] temp = new char[sfPacket_GetDataSize(m_ptr)];
sfPacket_ReadString(m_ptr, temp.ptr);
size_t l = fromStringz(temp.ptr).length;
data = new char[l];
data[] = temp[0 .. l];
data = cast(string) temp[0 .. l];
}
void internalGet(ref wstring data)
{
scope wstring temp = new wchar[sfPacket_GetDataSize(m_ptr)];
scope wchar[] temp = new wchar[sfPacket_GetDataSize(m_ptr)];
sfPacket_ReadWideString(m_ptr, temp.ptr);
size_t l = fromStringz(temp.ptr).length;
data = new wchar[l];
data[] = temp[0 .. l];
data = cast(wstring) temp[0 .. l];
}
void internalSet(bool data)
@ -345,8 +345,8 @@ private:
typedef void function(void*, uint) pf_sfPacket_WriteUint32;
typedef void function(void*, float) pf_sfPacket_WriteFloat;
typedef void function(void*, double) pf_sfPacket_WriteDouble;
typedef void function(void*, char*) pf_sfPacket_WriteString;
typedef void function(void*, wchar*) pf_sfPacket_WriteWideString;
typedef void function(void*, cchar*) pf_sfPacket_WriteString;
typedef void function(void*, cwchar*) pf_sfPacket_WriteWideString;
static pf_sfPacket_Create sfPacket_Create;
static pf_sfPacket_Destroy sfPacket_Destroy;

12
DSFML/import/dsfml/network/sockettcp.d
View File

@ -128,8 +128,12 @@ class SocketTCP : DSFMLObject
* Status code
*/
SocketStatus send(byte[] data)
in
{
assert(data && data.length);
}
body
{
if (data && data.length > 0)
return cast(SocketStatus)sfSocketTCP_Send(m_ptr, data.ptr, data.length);
}
@ -149,8 +153,12 @@ class SocketTCP : DSFMLObject
*
*/
SocketStatus receive(byte[] data, out size_t sizeReceived)
in
{
assert(data && data.length);
}
body
{
if (data && data.length > 0)
return cast(SocketStatus)sfSocketTCP_Receive(m_ptr, data.ptr, data.length, &sizeReceived);
}

5
DSFML/import/dsfml/system/vector2.d
View File

@ -103,6 +103,11 @@ struct Vector2(T)
{
return (x == other.x) && (y == other.y);
}
T max()
{
return (x>y) ? x : y;
}
}
version (UnitTest)