SDL3: Port audio code

Author: AJenbo

Source/engine/sound.cpp

@@ -13,8 +13,11 @@
 #include <optional>
 #include <string>
 
-#include <Aulib/Stream.h>
+#ifdef USE_SDL3
+#include <SDL3/SDL_timer.h>
+#else
 #include <SDL.h>
+#endif
 #include <expected.hpp>
 
 #include "engine/assets.hpp"

Source/utils/push_aulib_decoder.cpp

@@ -44,7 +44,7 @@ void PushAulibDecoder::DiscardPendingSamples() noexcept
 	queue_ = std::queue<AudioQueueItem>();
 }
 
-bool PushAulibDecoder::open([[maybe_unused]] SDL_RWops *rwops)
+bool PushAulibDecoder::open([[maybe_unused]] SDL_IOStream *rwops)
 {
 	assert(rwops == nullptr);
 	return true;

Source/utils/push_aulib_decoder.h

@@ -9,8 +9,14 @@
 #include <variant>
 
 #include <Aulib/Decoder.h>
+
+#ifdef USE_SDL3
+#include <SDL3/SDL_mutex.h>
+#else
 #include <SDL_mutex.h>
+#endif
 
+#include "utils/sdl_compat.h"
 #include "utils/sdl_mutex.h"
 
 namespace devilution {
@@ -36,7 +42,7 @@ class PushAulibDecoder final : public ::Aulib::Decoder {
 
 	void DiscardPendingSamples() noexcept;
 
-	bool open(SDL_RWops *rwops) override;
+	bool open(SDL_IOStream *rwops) override;
 
 	[[nodiscard]] int getChannels() const override
 	{

Source/utils/soundsample.cpp

@@ -9,12 +9,17 @@
 #include <Aulib/DecoderDrwav.h>
 #include <Aulib/Stream.h>
 
+#ifdef USE_SDL3
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_iostream.h>
+#else
 #include <SDL.h>
 #ifdef USE_SDL1
 #include "utils/sdl2_to_1_2_backports.h"
 #else
 #include "utils/sdl2_backports.h"
 #endif
+#endif
 
 #include "engine/assets.hpp"
 #include "options.h"
@@ -67,7 +72,7 @@ std::unique_ptr<Aulib::Decoder> CreateDecoder(bool isMp3)
 	return std::make_unique<Aulib::DecoderDrwav>();
 }
 
-std::unique_ptr<Aulib::Stream> CreateStream(SDL_RWops *handle, bool isMp3)
+std::unique_ptr<Aulib::Stream> CreateStream(SDL_IOStream *handle, bool isMp3)
 {
 	auto decoder = CreateDecoder(isMp3);
 	if (!decoder->open(handle)) // open for `getRate`
@@ -139,7 +144,7 @@ bool SoundSample::Play(int numIterations)
 
 int SoundSample::SetChunkStream(std::string filePath, bool isMp3, bool logErrors)
 {
-	SDL_RWops *handle = OpenAssetAsSdlRwOps(filePath.c_str(), /*threadsafe=*/true);
+	SDL_IOStream *handle = OpenAssetAsSdlRwOps(filePath.c_str(), /*threadsafe=*/true);
 	if (handle == nullptr) {
 		if (logErrors)
 			LogError(LogCategory::Audio, "OpenAsset failed (from SoundSample::SetChunkStream) for {}: {}", filePath, SDL_GetError());
@@ -162,7 +167,7 @@ int SoundSample::SetChunk(ArraySharedPtr<std::uint8_t> fileData, std::size_t dwB
 	isMp3_ = isMp3;
 	file_data_ = std::move(fileData);
 	file_data_size_ = dwBytes;
-	SDL_RWops *buf = SDL_RWFromConstMem(file_data_.get(), static_cast<int>(dwBytes));
+	SDL_IOStream *buf = SDL_IOFromConstMem(file_data_.get(), static_cast<int>(dwBytes));
 	if (buf == nullptr) {
 		return -1;
 	}