From 6c5c6b6739728052ded6942ef7b83e748fda2f87 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 31 Aug 2025 14:45:14 +0100 Subject: [PATCH] Revert "Log Stream rwops errors and prevent opening Stream if null" This reverts commit b2df2dfeddc692caa01fd1e1769f59b285912b87. Custom decoders do not always use `rwops`, so this check was incorrect. Fixes #44 --- src/Stream.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/Stream.cpp b/src/Stream.cpp index 66c5f872..3a1f3eef 100644 --- a/src/Stream.cpp +++ b/src/Stream.cpp @@ -18,19 +18,11 @@ Aulib::Stream::Stream(const std::string& filename, std::unique_ptr decoder, std::unique_ptr resampler) : Stream(SDL_RWFromFile(filename.c_str(), "rb"), std::move(decoder), std::move(resampler), true) -{ - if (not d->fRWops) { - aulib::log::warnLn("Stream failed to create rwops: {}", SDL_GetError()); - } -} +{} Aulib::Stream::Stream(const std::string& filename, std::unique_ptr decoder) : Stream(SDL_RWFromFile(filename.c_str(), "rb"), std::move(decoder), true) -{ - if (not d->fRWops) { - aulib::log::warnLn("Stream failed to create rwops: {}", SDL_GetError()); - } -} +{} Aulib::Stream::Stream(SDL_RWops* rwops, std::unique_ptr decoder, std::unique_ptr resampler, bool closeRw) @@ -56,10 +48,6 @@ auto Aulib::Stream::open() -> bool if (d->fIsOpen) { return true; } - if (not d->fRWops) { - SDL_SetError("Cannot open stream: null rwops."); - return false; - } if (not d->fDecoder->open(d->fRWops)) { return false; }