Updated to the new graphics API

This commit is contained in:
Laurent Gomila committed 2012-01-29 11:29:09 +01:00
1 parent 06997db9e8
commit 44670984af
51 files changed
+4607 -2573

No files matched your search

+23 -23
View File
@@ -39,35 +39,35 @@ class sfSoundStreamImpl : public sf::SoundStream
{
public :
sfSoundStreamImpl(sfSoundStreamGetDataCallback OnGetData,
sfSoundStreamSeekCallback OnSeek,
unsigned int ChannelsCount,
unsigned int SampleRate,
void* UserData) :
myGetDataCallback(OnGetData),
mySeekCallback (OnSeek),
myUserData (UserData)
sfSoundStreamImpl(sfSoundStreamGetDataCallback onGetData,
sfSoundStreamSeekCallback onSeek,
unsigned int channelCount,
unsigned int sampleRate,
void* userData) :
myGetDataCallback(onGetData),
mySeekCallback (onSeek),
myUserData (userData)
{
Initialize(ChannelsCount, SampleRate);
Initialize(channelCount, sampleRate);
}
private :
virtual bool OnGetData(Chunk& Data)
virtual bool OnGetData(Chunk& data)
{
sfSoundStreamChunk Chunk = {NULL, 0};
bool Continue = (myGetDataCallback(&Chunk, myUserData) == sfTrue);
sfSoundStreamChunk chunk = {NULL, 0};
bool ok = (myGetDataCallback(&chunk, myUserData) == sfTrue);
Data.Samples = Chunk.Samples;
Data.NbSamples = Chunk.NbSamples;
data.Samples = chunk.Samples;
data.SampleCount = chunk.SampleCount;
return Continue;
return ok;
}
virtual void OnSeek(sfUint32 TimeOffset)
virtual void OnSeek(sfUint32 timeOffset)
{
if (mySeekCallback)
mySeekCallback(TimeOffset, myUserData);
mySeekCallback(timeOffset, myUserData);
}
sfSoundStreamGetDataCallback myGetDataCallback;
@@ -81,12 +81,12 @@ private :
////////////////////////////////////////////////////////////
struct sfSoundStream
{
sfSoundStream(sfSoundStreamGetDataCallback OnGetData,
sfSoundStreamSeekCallback OnSeek,
unsigned int ChannelsCount,
unsigned int SampleRate,
void* UserData) :
This(OnGetData, OnSeek, ChannelsCount, SampleRate, UserData)
sfSoundStream(sfSoundStreamGetDataCallback onGetData,
sfSoundStreamSeekCallback onSeek,
unsigned int channelCount,
unsigned int sampleRate,
void* userData) :
This(onGetData, onSeek, channelCount, sampleRate, userData)
{
}