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

Private virtual functions are now protected, so that sub-classes can call them if necessary (and they appear in the API doc :)

Browse source
This commit is contained in:
Laurent Gomila 2012-04-04 22:33:53 +02:00
parent 1a8488bd7b
commit 8c776f33c1
10 changed files with 67 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/SFML/Audio/SoundBufferRecorder.hpp
View file

@ -58,7 +58,7 @@ public :
////////////////////////////////////////////////////////////
const SoundBuffer& getBuffer() const;
private :
protected:
////////////////////////////////////////////////////////////
/// \brief Start capturing audio data
@ -85,6 +85,8 @@ private :
////////////////////////////////////////////////////////////
virtual void onStop();
private :
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////

4
include/SFML/Audio/SoundRecorder.hpp
View file

@ -109,8 +109,6 @@ protected :
////////////////////////////////////////////////////////////
SoundRecorder();
private :
////////////////////////////////////////////////////////////
/// \brief Start capturing audio data
///
@ -151,6 +149,8 @@ private :
////////////////////////////////////////////////////////////
virtual void onStop();
private :
////////////////////////////////////////////////////////////
/// \brief Function called as the entry point of the thread
///

22
include/SFML/Audio/SoundStream.hpp
View file

@ -201,17 +201,6 @@ protected :
////////////////////////////////////////////////////////////
void initialize(unsigned int channelCount, unsigned int sampleRate);
private :
////////////////////////////////////////////////////////////
/// \brief Function called as the entry point of the thread
///
/// This function starts the streaming loop, and returns
/// only when the sound is stopped.
///
////////////////////////////////////////////////////////////
void streamData();
////////////////////////////////////////////////////////////
/// \brief Request a new chunk of audio samples from the stream source
///
@ -239,6 +228,17 @@ private :
////////////////////////////////////////////////////////////
virtual void onSeek(Time timeOffset) = 0;
private :
////////////////////////////////////////////////////////////
/// \brief Function called as the entry point of the thread
///
/// This function starts the streaming loop, and returns
/// only when the sound is stopped.
///
////////////////////////////////////////////////////////////
void streamData();
////////////////////////////////////////////////////////////
/// \brief Fill a new buffer with audio samples, and append
/// it to the playing queue

2
include/SFML/Graphics/Drawable.hpp
View file

@ -51,7 +51,7 @@ public :
////////////////////////////////////////////////////////////
virtual ~Drawable() {}
private :
protected :
friend class RenderTarget;

4
include/SFML/Graphics/RenderWindow.hpp
View file

@ -127,7 +127,7 @@ public :
////////////////////////////////////////////////////////////
Image capture() const;
private :
protected:
////////////////////////////////////////////////////////////
/// \brief Function called after the window has been created
@ -148,6 +148,8 @@ private :
////////////////////////////////////////////////////////////
virtual void onResize();
private :
////////////////////////////////////////////////////////////
/// \brief Activate the target for rendering
///

42
include/SFML/Network/Packet.hpp
View file

@ -208,30 +208,11 @@ public:
Packet& operator <<(const std::wstring& data);
Packet& operator <<(const String& data);
private :
protected:
friend class TcpSocket;
friend class UdpSocket;
////////////////////////////////////////////////////////////
/// Disallow comparisons between packets
///
////////////////////////////////////////////////////////////
bool operator ==(const Packet& right) const;
bool operator !=(const Packet& right) const;
////////////////////////////////////////////////////////////
/// \brief Check if the packet can extract a given number of bytes
///
/// This function updates accordingly the state of the packet.
///
/// \param size Size to check
///
/// \return True if \a size bytes can be read from the packet
///
////////////////////////////////////////////////////////////
bool checkSize(std::size_t size);
////////////////////////////////////////////////////////////
/// \brief Called before the packet is sent over the network
///
@ -271,6 +252,27 @@ private :
////////////////////////////////////////////////////////////
virtual void onReceive(const void* data, std::size_t size);
private :
////////////////////////////////////////////////////////////
/// Disallow comparisons between packets
///
////////////////////////////////////////////////////////////
bool operator ==(const Packet& right) const;
bool operator !=(const Packet& right) const;
////////////////////////////////////////////////////////////
/// \brief Check if the packet can extract a given number of bytes
///
/// This function updates accordingly the state of the packet.
///
/// \param size Size to check
///
/// \return True if \a size bytes can be read from the packet
///
////////////////////////////////////////////////////////////
bool checkSize(std::size_t size);
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////

4
include/SFML/Window/Window.hpp
View file

@ -423,7 +423,7 @@ public :
////////////////////////////////////////////////////////////
WindowHandle getSystemHandle() const;
private :
protected :
////////////////////////////////////////////////////////////
/// \brief Function called after the window has been created
@ -444,6 +444,8 @@ private :
////////////////////////////////////////////////////////////
virtual void onResize();
private:
////////////////////////////////////////////////////////////
/// \brief Processes an event before it is sent to the user
///