diff --git a/include/SFML/System/InputStream.hpp b/include/SFML/System/InputStream.hpp index 10fe59cf0..facebc2e2 100644 --- a/include/SFML/System/InputStream.hpp +++ b/include/SFML/System/InputStream.hpp @@ -69,12 +69,12 @@ public : virtual Int64 Seek(Int64 position) = 0; //////////////////////////////////////////////////////////// - /// \brief Return the current reading position in the stream + /// \brief Get the current reading position in the stream /// /// \return The current position, or -1 on error. /// //////////////////////////////////////////////////////////// - virtual Int64 GetPosition() = 0; + virtual Int64 Tell() = 0; //////////////////////////////////////////////////////////// /// \brief Return the size of the stream @@ -121,7 +121,7 @@ public : /// /// Int64 Seek(Int64 position); /// -/// Int64 GetPosition(); +/// Int64 Tell(); /// /// Int64 GetSize(); /// diff --git a/src/SFML/Audio/SoundFile.cpp b/src/SFML/Audio/SoundFile.cpp index 6917045af..a61780725 100644 --- a/src/SFML/Audio/SoundFile.cpp +++ b/src/SFML/Audio/SoundFile.cpp @@ -380,7 +380,7 @@ sf_count_t SoundFile::Stream::Seek(sf_count_t offset, int whence, void* userData switch (whence) { case SEEK_SET : return stream->Seek(offset); - case SEEK_CUR : return stream->Seek(stream->GetPosition() + offset); + case SEEK_CUR : return stream->Seek(stream->Tell() + offset); case SEEK_END : return stream->Seek(stream->GetSize() - offset); default : return stream->Seek(0); } @@ -391,7 +391,7 @@ sf_count_t SoundFile::Stream::Seek(sf_count_t offset, int whence, void* userData sf_count_t SoundFile::Stream::Tell(void* userData) { sf::InputStream* stream = static_cast(userData); - return stream->GetPosition(); + return stream->Tell(); } } // namespace priv diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp index f7f4775ce..f7c425789 100644 --- a/src/SFML/Graphics/ImageLoader.cpp +++ b/src/SFML/Graphics/ImageLoader.cpp @@ -61,12 +61,12 @@ namespace void Skip(void* user, unsigned int size) { sf::InputStream* stream = static_cast(user); - stream->Seek(stream->GetPosition() + size); + stream->Seek(stream->Tell() + size); } int Eof(void* user) { sf::InputStream* stream = static_cast(user); - return stream->GetPosition() >= stream->GetSize(); + return stream->Tell() >= stream->GetSize(); } }