Config.hpp   Config.hpp 
skipping to change at line 52 skipping to change at line 52
#elif defined(linux) || defined(__linux) #elif defined(linux) || defined(__linux)
// Linux // Linux
#define SFML_SYSTEM_LINUX #define SFML_SYSTEM_LINUX
#elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || define d(Macintosh) #elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || define d(Macintosh)
// MacOS // MacOS
#define SFML_SYSTEM_MACOS #define SFML_SYSTEM_MACOS
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
// FreeBSD // FreeBSD
#define SFML_SYSTEM_FREEBSD #define SFML_SYSTEM_FREEBSD
#else #else
// Unsupported system // Unsupported system
#error This operating system is not supported by SFML library #error This operating system is not supported by SFML library
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Event.hpp   Event.hpp 
skipping to change at line 144 skipping to change at line 144
F8, F8,
F9, F9,
F10, F10,
F11, F11,
F12, F12,
F13, F13,
F14, F14,
F15, F15,
Pause, Pause,
Count // For internal use Count // Keep last -- total number of keyboard keys
}; };
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Definition of button codes for mouse events /// Definition of button codes for mouse events
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
namespace Mouse namespace Mouse
{ {
enum Button enum Button
{ {
Left, Left,
Right, Right,
Middle, Middle,
XButton1, XButton1,
XButton2, XButton2,
Count // For internal use ButtonCount // Keep last -- total number of mouse buttons
}; };
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Definition of joystick axis for joystick events /// Definition of joystick axis for joystick events
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
namespace Joy namespace Joy
{ {
enum Axis enum Axis
{ {
AxisX, AxisX,
AxisY, AxisY,
AxisZ, AxisZ,
AxisR, AxisR,
AxisU, AxisU,
AxisV, AxisV,
AxisPOV, AxisPOV,
Count // For internal use AxisCount // Keep last -- total number of joystick axis
};
enum
{
Count = 4, ///< Total number of supported joysticks
ButtonCount = 32 ///< Total number of supported joystick buttons
}; };
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Event defines a system event and its parameters /// Event defines a system event and its parameters
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
class Event class Event
{ {
public : public :
skipping to change at line 285 skipping to change at line 291
KeyPressed, KeyPressed,
KeyReleased, KeyReleased,
MouseWheelMoved, MouseWheelMoved,
MouseButtonPressed, MouseButtonPressed,
MouseButtonReleased, MouseButtonReleased,
MouseMoved, MouseMoved,
MouseEntered, MouseEntered,
MouseLeft, MouseLeft,
JoyButtonPressed, JoyButtonPressed,
JoyButtonReleased, JoyButtonReleased,
JoyMoved JoyMoved,
Count // Keep last -- total number of event types
}; };
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
EventType Type; ///< Type of the event EventType Type; ///< Type of the event
union union
{ {
KeyEvent Key; KeyEvent Key;
 End of changes. 4 change blocks. 
4 lines changed or deleted 12 lines changed or added


 Image.hpp   Image.hpp 
skipping to change at line 39 skipping to change at line 39
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Resource.hpp> #include <SFML/System/Resource.hpp>
#include <SFML/Graphics/Color.hpp> #include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/Rect.hpp> #include <SFML/Graphics/Rect.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
namespace sf namespace sf
{ {
class RenderImage;
class RenderWindow; class RenderWindow;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Image is the low-level class for loading and /// Image is the low-level class for loading and
/// manipulating images /// manipulating images
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
class SFML_API Image : public Resource<Image> class SFML_API Image : public Resource<Image>
{ {
public : public :
skipping to change at line 254 skipping to change at line 253
/// ///
/// \return True if image smoothing is enabled /// \return True if image smoothing is enabled
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool IsSmooth() const; bool IsSmooth() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Convert a subrect expressed in pixels, into float /// Convert a subrect expressed in pixels, into float
/// texture coordinates /// texture coordinates
/// ///
/// \param Rect : Sub-rectangle of image to convert /// \param Rect : Sub-rectangle of image to convert
/// \param Adjust : Pass true to apply the half-texel adjustment
/// ///
/// \return Texture coordinates corresponding to the sub-rectangle /// \return Texture coordinates corresponding to the sub-rectangle
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
FloatRect GetTexCoords(const IntRect& Rect, bool Adjust = true) const; FloatRect GetTexCoords(const IntRect& Rect) const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get a valid texture size according to hardware support /// Get a valid texture size according to hardware support
/// ///
/// \param Size : Size to convert /// \param Size : Size to convert
/// ///
/// \return Valid nearest size (greater than or equal to specified size ) /// \return Valid nearest size (greater than or equal to specified size )
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static unsigned int GetValidTextureSize(unsigned int Size); static unsigned int GetValidTextureSize(unsigned int Size);
skipping to change at line 284 skipping to change at line 282
/// ///
/// \param Other : instance to assign /// \param Other : instance to assign
/// ///
/// \return Reference to the image /// \return Reference to the image
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Image& operator =(const Image& Other); Image& operator =(const Image& Other);
private : private :
friend class RenderImage;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Create the OpenGL texture /// Create the OpenGL texture
/// ///
/// \return True if texture has been successfully created /// \return True if texture has been successfully created
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool CreateTexture(); bool CreateTexture();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Make sure the texture in video memory is updated with the /// Make sure the texture in video memory is updated with the
 End of changes. 4 change blocks. 
6 lines changed or deleted 2 lines changed or added


 Input.hpp   Input.hpp 
skipping to change at line 120 skipping to change at line 120
private : private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// /see WindowListener::OnEvent /// /see WindowListener::OnEvent
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void OnEvent(const Event& EventReceived); virtual void OnEvent(const Event& EventReceived);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Reset all the states
///
////////////////////////////////////////////////////////////
void ResetStates();
////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool myKeys[Key::Count]; ///< Array containing the state of bool myKeys[Key::Count]; ///< Array conta
all keyboard keys ining the state of all keyboard keys
bool myMouseButtons[Mouse::Count]; ///< Array containing the state of bool myMouseButtons[Mouse::ButtonCount]; ///< Array conta
all mouse buttons ining the state of all mouse buttons
bool myJoystickButtons[2][16]; ///< Array containing the state of int myMouseX; ///< Mouse posit
all joysticks buttons ion on X
int myMouseX; ///< Mouse position on X int myMouseY; ///< Mouse posit
int myMouseY; ///< Mouse position on Y ion on Y
float myJoystickAxis[2][Joy::Count]; ///< Joysticks position on each ax bool myJoystickButtons[Joy::Count][Joy::ButtonCount]; ///< Array conta
is ining the state of all joysticks buttons
float myJoystickAxis[Joy::Count][Joy::AxisCount]; ///< Joysticks p
osition on each axis
}; };
} // namespace sf } // namespace sf
#endif // SFML_INPUT_HPP #endif // SFML_INPUT_HPP
 End of changes. 2 change blocks. 
10 lines changed or deleted 18 lines changed or added


 Matrix3.inl   Matrix3.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFGE - Simple and Fast Game Engine // SFGE - Simple and Fast Multimedia Library
// Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Music.hpp   Music.hpp 
skipping to change at line 57 skipping to change at line 57
{ {
public : public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Construct the music with a buffer size /// Construct the music with a buffer size
/// ///
/// \param BufferSize : Size of the internal buffer, expressed in numbe r of samples /// \param BufferSize : Size of the internal buffer, expressed in numbe r of samples
/// (ie. size taken by the music in memory) (44100 by default) /// (ie. size taken by the music in memory) (44100 by default)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Music(std::size_t BufferSize = 44100); explicit Music(std::size_t BufferSize = 44100);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Destructor /// Destructor
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
~Music(); ~Music();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Open a music file (doesn't play it -- call Play() for that) /// Open a music file (doesn't play it -- call Play() for that)
/// ///
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RenderWindow.hpp   RenderWindow.hpp 
skipping to change at line 59 skipping to change at line 59
/// Default constructor /// Default constructor
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
RenderWindow(); RenderWindow();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Construct the window /// Construct the window
/// ///
/// \param Mode : Video mode to use /// \param Mode : Video mode to use
/// \param Title : Title of the window /// \param Title : Title of the window
/// \param WindowStyle : Window style (Resize | Close by default) /// \param WindowStyle : Window style, see sf::Style (Resize | Close by default)
/// \param Params : Creation parameters (see default constructor f or default values) /// \param Params : Creation parameters (see default constructor f or default values)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
RenderWindow(VideoMode Mode, const std::string& Title, unsigned long Wi ndowStyle = Style::Resize | Style::Close, const WindowSettings& Params = Wi ndowSettings()); RenderWindow(VideoMode Mode, const std::string& Title, unsigned long Wi ndowStyle = Style::Resize | Style::Close, const WindowSettings& Params = Wi ndowSettings());
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Construct the window from an existing control /// Construct the window from an existing control
/// ///
/// \param Handle : Platform-specific handle of the control /// \param Handle : Platform-specific handle of the control
/// \param Params : Creation parameters (see default constructor for de fault values) /// \param Params : Creation parameters (see default constructor for de fault values)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SocketTCP.hpp   SocketTCP.hpp 
skipping to change at line 216 skipping to change at line 216
/// ///
/// \param Descriptor : System socket descriptor to use (0 by default - - create a new socket) /// \param Descriptor : System socket descriptor to use (0 by default - - create a new socket)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Create(SocketHelper::SocketType Descriptor = 0); void Create(SocketHelper::SocketType Descriptor = 0);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SocketHelper::SocketType mySocket; ///< Socket descriptor SocketHelper::SocketType mySocket; ///< Socket descriptor
std::vector<char> myPendingPacket; ///< Data of the current Uint32 myPendingHeader; ///< Data of the current
pending packet, if any (in non-blocking mode) pending packet header, if any
Int32 myPendingPacketSize; ///< Size of the current Uint32 myPendingHeaderSize; ///< Size of the current
pending packet, if any (in non-blocking mode) pending packet header, if any
std::vector<char> myPendingPacket; ///< Data of the current
pending packet, if any
Int32 myPendingPacketSize; ///< Size of the current
pending packet, if any
bool myIsBlocking; ///< Is the socket blocki ng or non-blocking ? bool myIsBlocking; ///< Is the socket blocki ng or non-blocking ?
}; };
} // namespace sf } // namespace sf
#endif // SFML_SOCKETTCP_HPP #endif // SFML_SOCKETTCP_HPP
 End of changes. 1 change blocks. 
4 lines changed or deleted 8 lines changed or added


 SocketUDP.hpp   SocketUDP.hpp 
skipping to change at line 217 skipping to change at line 217
/// \param Descriptor : System socket descriptor to use (0 by default - - create a new socket) /// \param Descriptor : System socket descriptor to use (0 by default - - create a new socket)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Create(SocketHelper::SocketType Descriptor = 0); void Create(SocketHelper::SocketType Descriptor = 0);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SocketHelper::SocketType mySocket; ///< Socket identifier SocketHelper::SocketType mySocket; ///< Socket identifier
unsigned short myPort; ///< Port to which the so cket is bound unsigned short myPort; ///< Port to which the so cket is bound
std::vector<char> myPendingPacket; ///< Data of the current Uint32 myPendingHeader; ///< Data of the current
pending packet, if any (in non-blocking mode) pending packet header, if any
Int32 myPendingPacketSize; ///< Size of the current Uint32 myPendingHeaderSize; ///< Size of the current
pending packet, if any (in non-blocking mode) pending packet header, if any
std::vector<char> myPendingPacket; ///< Data of the current
pending packet, if any
Int32 myPendingPacketSize; ///< Size of the current
pending packet, if any
bool myIsBlocking; ///< Is the socket blocki ng or non-blocking ? bool myIsBlocking; ///< Is the socket blocki ng or non-blocking ?
}; };
} // namespace sf } // namespace sf
#endif // SFML_SOCKETUDP_HPP #endif // SFML_SOCKETUDP_HPP
 End of changes. 1 change blocks. 
4 lines changed or deleted 8 lines changed or added


 Sound.hpp   Sound.hpp 
skipping to change at line 74 skipping to change at line 74
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Construct the sound from its parameters /// Construct the sound from its parameters
/// ///
/// \param Buffer : Sound buffer to play (NULL by default) /// \param Buffer : Sound buffer to play (NULL by default)
/// \param Loop : Loop flag (false by default) /// \param Loop : Loop flag (false by default)
/// \param Pitch : Value of the pitch (1 by default) /// \param Pitch : Value of the pitch (1 by default)
/// \param Volume : Volume (100 by default) /// \param Volume : Volume (100 by default)
/// \param Position : Position (0, 0, 0 by default) /// \param Position : Position (0, 0, 0 by default)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sound(const SoundBuffer& Buffer, bool Loop = false, float Pitch = 1.f, float Volume = 100.f, const Vector3f& Position = Vector3f(0, 0, 0)); explicit Sound(const SoundBuffer& Buffer, bool Loop = false, float Pitc h = 1.f, float Volume = 100.f, const Vector3f& Position = Vector3f(0, 0, 0) );
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Copy constructor /// Copy constructor
/// ///
/// \param Copy : Instance to copy /// \param Copy : Instance to copy
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sound(const Sound& Copy); Sound(const Sound& Copy);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
skipping to change at line 290 skipping to change at line 290
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Assignment operator /// Assignment operator
/// ///
/// \param Other : Instance to assign /// \param Other : Instance to assign
/// ///
/// \return Reference to the sound /// \return Reference to the sound
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sound& operator =(const Sound& Other); Sound& operator =(const Sound& Other);
////////////////////////////////////////////////////////////
/// Reset the internal buffer
///
/// This function is for internal use only, you don't have
/// to use it.
///
////////////////////////////////////////////////////////////
void ResetBuffer();
private : private :
friend class SoundStream; friend class SoundStream;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int mySource; ///< OpenAL source identifier unsigned int mySource; ///< OpenAL source identifier
ResourcePtr<SoundBuffer> myBuffer; ///< Sound buffer bound to the sourc e ResourcePtr<SoundBuffer> myBuffer; ///< Sound buffer bound to the sourc e
}; };
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added


 SoundBuffer.hpp   SoundBuffer.hpp 
skipping to change at line 35 skipping to change at line 35
#ifndef SFML_SOUNDBUFFER_HPP #ifndef SFML_SOUNDBUFFER_HPP
#define SFML_SOUNDBUFFER_HPP #define SFML_SOUNDBUFFER_HPP
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/System/Resource.hpp> #include <SFML/System/Resource.hpp>
#include <SFML/Audio/AudioResource.hpp> #include <SFML/Audio/AudioResource.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
#include <set>
namespace sf namespace sf
{ {
class Sound;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// SoundBuffer is the low-level for loading and manipulating /// SoundBuffer is the low-level for loading and manipulating
/// sound buffers /// sound buffers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
class SFML_API SoundBuffer : public AudioResource, public Resource<SoundBuf fer> class SFML_API SoundBuffer : public AudioResource, public Resource<SoundBuf fer>
{ {
public : public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Default constructor /// Default constructor
skipping to change at line 177 skipping to change at line 180
/// ///
/// \param ChannelsCount : Number of channels /// \param ChannelsCount : Number of channels
/// \param SampleRate : Sample rate /// \param SampleRate : Sample rate
/// ///
/// \return True on success /// \return True on success
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Update(unsigned int ChannelsCount, unsigned int SampleRate); bool Update(unsigned int ChannelsCount, unsigned int SampleRate);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Add a sound to the list of sounds that use this buffer
///
/// \param Instance : Sound object to attach
///
////////////////////////////////////////////////////////////
void AttachSound(Sound* Instance) const;
////////////////////////////////////////////////////////////
/// Remove a sound from the list of sounds that use this buffer
///
/// \param Instance : Sound object to detach
///
////////////////////////////////////////////////////////////
void DetachSound(Sound* Instance) const;
////////////////////////////////////////////////////////////
// Types
////////////////////////////////////////////////////////////
typedef std::set<Sound*> SoundList; ///< Set of unique sound instances
////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int myBuffer; ///< OpenAL buffer identifier unsigned int myBuffer; ///< OpenAL buffer identifier
std::vector<Int16> mySamples; ///< Samples buffer std::vector<Int16> mySamples; ///< Samples buffer
float myDuration; ///< Sound duration, in seconds float myDuration; ///< Sound duration, in seconds
mutable SoundList mySounds; ///< List of sounds that are using this buffer
}; };
} // namespace sf } // namespace sf
#endif // SFML_SOUNDBUFFER_HPP #endif // SFML_SOUNDBUFFER_HPP
 End of changes. 4 change blocks. 
0 lines changed or deleted 25 lines changed or added


 SoundStream.hpp   SoundStream.hpp 
skipping to change at line 188 skipping to change at line 188
/// ///
/// \return True to continue playback, false to stop /// \return True to continue playback, false to stop
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual bool OnGetData(Chunk& Data) = 0; virtual bool OnGetData(Chunk& Data) = 0;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Fill a new buffer with audio data, and push it to the /// Fill a new buffer with audio data, and push it to the
/// playing queue /// playing queue
/// ///
/// \param Buffer : Buffer to fill /// \param Buffer : Number of the buffer to fill (in [0, BuffersCount])
/// ///
/// \return True if the derived class has requested to stop /// \return True if the derived class has requested to stop
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool FillAndPushBuffer(unsigned int Buffer); bool FillAndPushBuffer(unsigned int BufferNum);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Fill the buffers queue with all available buffers /// Fill the buffers queue with all available buffers
/// ///
/// \return True if the derived class has requested to stop /// \return True if the derived class has requested to stop
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool FillQueue(); bool FillQueue();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Clear the queue of any remaining buffers /// Clear the queue of any remaining buffers
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void ClearQueue(); void ClearQueue();
enum {BuffersCount = 3}; enum {BuffersCount = 3};
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool myIsStreaming; ///< Streaming state (true = pla bool myIsStreaming; ///< Streaming state (true =
ying, false = stopped) playing, false = stopped)
unsigned int myBuffers[BuffersCount]; ///< Sound buffers used to store unsigned int myBuffers[BuffersCount]; ///< Sound buffers used to st
temporary audio data ore temporary audio data
unsigned int myChannelsCount; ///< Number of channels (1 = mon unsigned int myChannelsCount; ///< Number of channels (1 =
o, 2 = stereo, ...) mono, 2 = stereo, ...)
unsigned int mySampleRate; ///< Frequency (samples / second unsigned int mySampleRate; ///< Frequency (samples / sec
) ond)
unsigned long myFormat; ///< Format of the internal soun unsigned long myFormat; ///< Format of the internal s
d buffers ound buffers
bool myLoop; ///< Loop flag (true to loop, fa bool myLoop; ///< Loop flag (true to loop,
lse to play once) false to play once)
unsigned int mySamplesProcessed; ///< Number of buffers processed unsigned int mySamplesProcessed; ///< Number of buffers proces
since beginning of the stream sed since beginning of the stream
bool myEndBuffers[BuffersCount]; ///< Each buffer is marked as
"end buffer" or not, for proper duration calculation
}; };
} // namespace sf } // namespace sf
#endif // SFML_SOUNDSTREAM_HPP #endif // SFML_SOUNDSTREAM_HPP
 End of changes. 3 change blocks. 
16 lines changed or deleted 18 lines changed or added


 Sprite.hpp   Sprite.hpp 
skipping to change at line 63 skipping to change at line 63
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Construct the sprite from a source image /// Construct the sprite from a source image
/// ///
/// \param Img : Image of the sprite /// \param Img : Image of the sprite
/// \param Position : Position of the sprite (0, 0 by default) /// \param Position : Position of the sprite (0, 0 by default)
/// \param Scale : Scale factor (1, 1 by default) /// \param Scale : Scale factor (1, 1 by default)
/// \param Rotation : Orientation, in degrees (0 by default) /// \param Rotation : Orientation, in degrees (0 by default)
/// \param Col : Color of the sprite (white by default) /// \param Col : Color of the sprite (white by default)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sprite(const Image& Img, const Vector2f& Position = Vector2f(0, 0), con st Vector2f& Scale = Vector2f(1, 1), float Rotation = 0.f, const Color& Col = Color(255, 255, 255, 255)); explicit Sprite(const Image& Img, const Vector2f& Position = Vector2f(0 , 0), const Vector2f& Scale = Vector2f(1, 1), float Rotation = 0.f, const C olor& Col = Color(255, 255, 255, 255));
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Change the image of the sprite /// Change the image of the sprite
/// ///
/// \param Img : New image /// \param Img : New image
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetImage(const Image& Img); void SetImage(const Image& Img);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/