mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-24 20:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update self-referential owner ptr when moving SoundStream

Browse Source
This commit is contained in:
vittorioromeo 2024-06-09 04:37:42 +02:00 committed by Vittorio Romeo
parent a303cee386
commit eabea655c5
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/SFML/Audio/SoundStream.cpp
View File

@ -211,7 +211,7 @@ struct SoundStream::Impl : priv::MiniaudioUtils::SoundBase
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static constexpr ma_data_source_vtable vtable{read, seek, getFormat, getCursor, getLength, setLooping, /* flags */ 0}; static constexpr ma_data_source_vtable vtable{read, seek, getFormat, getCursor, getLength, setLooping, /* flags */ 0};
SoundStream* const owner; //!< Owning SoundStream object SoundStream* owner; //!< Owning SoundStream object
std::vector<std::int16_t> sampleBuffer; //!< Our temporary sample buffer std::vector<std::int16_t> sampleBuffer; //!< Our temporary sample buffer
std::size_t sampleBufferCursor{}; //!< The current read position in the temporary sample buffer std::size_t sampleBufferCursor{}; //!< The current read position in the temporary sample buffer
std::uint64_t samplesProcessed{}; //!< Number of samples processed since beginning of the stream std::uint64_t samplesProcessed{}; //!< Number of samples processed since beginning of the stream
@ -234,11 +234,26 @@ SoundStream::~SoundStream() = default;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SoundStream::SoundStream(SoundStream&&) noexcept = default; SoundStream::SoundStream(SoundStream&& rhs) noexcept : m_impl(std::move(rhs.m_impl))
{
// Update self-referential owner pointer.
m_impl->owner = this;
}
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SoundStream& SoundStream::operator=(SoundStream&&) noexcept = default; SoundStream& SoundStream::operator=(SoundStream&& rhs) noexcept
{
if (this != &rhs)
{
m_impl = std::move(rhs.m_impl);
// Update self-referential owner pointer.
m_impl->owner = this;
}
return *this;
}
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////