Added a new InputStream interface, and LoadFromStream functions to resource classes

include/SFML/Audio/Music.hpp

@@ -41,6 +41,8 @@ namespace priv
     class SoundFile;
 }
 
+class InputStream;
+
 ////////////////////////////////////////////////////////////
 /// \brief Streamed music played from an audio file
 ///
@@ -74,7 +76,7 @@ public :
     ///
     /// \return True if loading succeeded, false if it failed
     ///
-    /// \see OpenFromMemory
+    /// \see OpenFromMemory, OpenFromStream
     ///
     ////////////////////////////////////////////////////////////
     bool OpenFromFile(const std::string& filename);
@@ -93,11 +95,29 @@ public :
     ///
     /// \return True if loading succeeded, false if it failed
     ///
-    /// \see OpenFromFile
+    /// \see OpenFromFile, OpenFromStream
     ///
     ////////////////////////////////////////////////////////////
     bool OpenFromMemory(const void* data, std::size_t sizeInBytes);
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Open a music from an audio file in a custom stream
+    ///
+    /// This function doesn't start playing the music (call Play()
+    /// to do so).
+    /// Here is a complete list of all the supported audio formats:
+    /// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+    /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
+    ///
+    /// \param stream Source stream to read from
+    ///
+    /// \return True if loading succeeded, false if it failed
+    ///
+    /// \see OpenFromFile, OpenFromMemory
+    ///
+    ////////////////////////////////////////////////////////////
+    bool OpenFromStream(InputStream& stream);
+
     ////////////////////////////////////////////////////////////
     /// \brief Get the total duration of the music
     ///
@@ -131,6 +151,12 @@ protected :
 
 private :
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Initialize the internal state after loading a new music
+    ///
+    ////////////////////////////////////////////////////////////
+    void Initialize();
+
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////

include/SFML/Audio/SoundBuffer.hpp

@@ -37,7 +37,13 @@
 
 namespace sf
 {
+namespace priv
+{
+    class SoundFile;
+}
+
 class Sound;
+class InputStream;
 
 ////////////////////////////////////////////////////////////
 /// \brief Storage for audio samples defining a sound
@@ -78,7 +84,7 @@ public :
     ///
     /// \return True if loading succeeded, false if it failed
     ///
-    /// \see LoadFromMemory, LoadFromSamples, SaveToFile
+    /// \see LoadFromMemory, LoadFromStream, LoadFromSamples, SaveToFile
     ///
     ////////////////////////////////////////////////////////////
     bool LoadFromFile(const std::string& filename);
@@ -95,11 +101,27 @@ public :
     ///
     /// \return True if loading succeeded, false if it failed
     ///
-    /// \see LoadFromFile, LoadFromSamples, SaveToFile
+    /// \see LoadFromFile, LoadFromStream, LoadFromSamples
     ///
     ////////////////////////////////////////////////////////////
     bool LoadFromMemory(const void* data, std::size_t sizeInBytes);
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Load the sound buffer from a custom stream
+    ///
+    /// Here is a complete list of all the supported audio formats:
+    /// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+    /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
+    ///
+    /// \param stream Source stream to read from
+    ///
+    /// \return True if loading succeeded, false if it failed
+    ///
+    /// \see LoadFromFile, LoadFromMemory, LoadFromSamples
+    ///
+    ////////////////////////////////////////////////////////////
+    bool LoadFromStream(InputStream& stream);
+
     ////////////////////////////////////////////////////////////
     /// \brief Load the sound buffer from an array of audio samples
     ///
@@ -212,6 +234,16 @@ private :
 
     friend class Sound;
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Initialize the internal state after loading a new sound
+    ///
+    /// \param file Sound file providing access to the new loaded sound
+    ///
+    /// \return True on succesful initialization, false on failure
+    ///
+    ////////////////////////////////////////////////////////////
+    bool Initialize(priv::SoundFile& file);
+
     ////////////////////////////////////////////////////////////
     /// \brief Update the internal buffer with the cached audio samples
     ///
@@ -273,9 +305,9 @@ private :
 /// a sf::Image.
 ///
 /// A sound buffer can be loaded from a file (see LoadFromFile()
-/// for the complete list of supported formats), from memory
-/// or directly from an array of samples. It can also be saved
-/// back to a file.
+/// for the complete list of supported formats), from memory, from
+/// a custom stream (see sf::InputStream) or directly from an array
+/// of samples. It can also be saved back to a file.
 ///
 /// Sound buffers alone are not very useful: they hold the audio data
 /// but cannot be played. To do so, you need to use the sf::Sound class,