mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 05:26:13 +01:00
Added InputStream
This commit is contained in:
1 parent
56df80a7d3
commit
6e251c5415
15 files changed
+323
-33
No files matched your search
@@ -36,7 +36,6 @@
|
||||
sfMusic* sfMusic_CreateFromFile(const char* filename)
|
||||
{
|
||||
sfMusic* music = new sfMusic;
|
||||
|
||||
if (!music->This.OpenFromFile(filename))
|
||||
{
|
||||
delete music;
|
||||
@@ -53,7 +52,6 @@ sfMusic* sfMusic_CreateFromFile(const char* filename)
|
||||
sfMusic* sfMusic_CreateFromMemory(const void* data, size_t sizeInBytes)
|
||||
{
|
||||
sfMusic* music = new sfMusic;
|
||||
|
||||
if (!music->This.OpenFromMemory(data, sizeInBytes))
|
||||
{
|
||||
delete music;
|
||||
@@ -64,6 +62,25 @@ sfMusic* sfMusic_CreateFromMemory(const void* data, size_t sizeInBytes)
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Create a new music and load it from a custom stream
|
||||
////////////////////////////////////////////////////////////
|
||||
sfMusic* sfMusic_CreateFromStream(sfInputStream* stream)
|
||||
{
|
||||
CSFML_CHECK_RETURN(stream, NULL);
|
||||
|
||||
sfMusic* music = new sfMusic;
|
||||
music->Stream = CallbackStream(stream);
|
||||
if (!music->This.OpenFromStream(music->Stream))
|
||||
{
|
||||
delete music;
|
||||
music = NULL;
|
||||
}
|
||||
|
||||
return music;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing music
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in new issue
Block a user