Fix GPU resource safety in constructors/destructors (#386)

include/AudioDevice.hpp

@@ -24,6 +24,9 @@ class AudioDevice {
         }
     }
 
+    AudioDevice(const AudioDevice&) = delete;
+    AudioDevice& operator=(const AudioDevice&) = delete;
+
     /**
      * Close the audio device and context.
      */

include/AudioStream.hpp

@@ -1,211 +1,51 @@
 #ifndef RAYLIB_CPP_INCLUDE_AUDIOSTREAM_HPP_
 #define RAYLIB_CPP_INCLUDE_AUDIOSTREAM_HPP_
 
-#include "./RaylibException.hpp"
-#include "./raylib-cpp-utils.hpp"
-#include "./raylib.hpp"
+#include "./AudioStreamUnmanaged.hpp"
 
 namespace raylib {
 /**
- * AudioStream management functions
+ * AudioStream management functions.
+ *
+ * The audio stream will be unloaded on object destruction. Use raylib::AudioStreamUnmanaged if you're looking to not unload.
+ *
+ * @see raylib::AudioStreamUnmanaged
  */
-class AudioStream : public ::AudioStream {
+class AudioStream : public AudioStreamUnmanaged {
 public:
-    AudioStream(const ::AudioStream& music)
-        : ::AudioStream(music) {
-        // Nothing.
-    }
-
-    AudioStream(
-        rAudioBuffer* buffer = nullptr,
-        rAudioProcessor* processor = nullptr,
-        unsigned int sampleRate = 0,
-        unsigned int sampleSize = 0,
-        unsigned int channels = 0)
-        : ::AudioStream{buffer, processor, sampleRate, sampleSize, channels} {
-        // Nothing.
-    }
-
-    /**
-     * Init audio stream (to stream raw audio pcm data)
-     *
-     * @throws raylib::RaylibException Throws if the AudioStream failed to load.
-     */
-    AudioStream(unsigned int sampleRate, unsigned int sampleSize, unsigned int channels = 2) {
-        Load(sampleRate, sampleSize, channels);
-    }
+    using AudioStreamUnmanaged::AudioStreamUnmanaged;
 
     AudioStream(const AudioStream&) = delete;
+    AudioStream& operator=(const AudioStream&) = delete;
 
     AudioStream(AudioStream&& other) noexcept {
         set(other);
-
         other.buffer = nullptr;
         other.processor = nullptr;
         other.sampleRate = 0;
         other.sampleSize = 0;
         other.channels = 0;
     }
 
-    ~AudioStream() { Unload(); }
-
-    GETTER(rAudioBuffer*, Buffer, buffer)
-    GETTER(rAudioProcessor*, Processor, processor)
-    GETTER(unsigned int, SampleRate, sampleRate)
-    GETTER(unsigned int, SampleSize, sampleSize)
-    GETTER(unsigned int, Channels, channels)
-
-    AudioStream& operator=(const ::AudioStream& stream) {
-        set(stream);
-        return *this;
-    }
-
-    AudioStream& operator=(const AudioStream&) = delete;
-
     AudioStream& operator=(AudioStream&& other) noexcept {
         if (this == &other) {
             return *this;
         }
-
         Unload();
         set(other);
-
         other.buffer = nullptr;
         other.processor = nullptr;
         other.sampleRate = 0;
         other.sampleSize = 0;
         other.channels = 0;
-
-        return *this;
-    }
-
-    /**
-     * Update audio stream buffers with data
-     */
-    AudioStream& Update(const void* data, int samplesCount) {
-        ::UpdateAudioStream(*this, data, samplesCount);
-        return *this;
-    }
-
-    /**
-     * Unload audio stream and free memory
-     */
-    void Unload() {
-        if (IsValid()) {
-            ::UnloadAudioStream(*this);
-        }
-    }
-
-    /**
-     * Check if any audio stream buffers requires refill
-     */
-    [[nodiscard]] bool IsProcessed() const { return ::IsAudioStreamProcessed(*this); }
-
-    /**
-     * Play audio stream
-     */
-    AudioStream& Play() {
-        ::PlayAudioStream(*this);
-        return *this;
-    }
-
-    /**
-     * Pause audio stream
-     */
-    AudioStream& Pause() {
-        ::PauseAudioStream(*this);
-        return *this;
-    }
-
-    /**
-     * Resume audio stream
-     */
-    AudioStream& Resume() {
-        ::ResumeAudioStream(*this);
-        return *this;
-    }
-
-    /**
-     * Check if audio stream is playing
-     */
-    [[nodiscard]] bool IsPlaying() const { return ::IsAudioStreamPlaying(*this); }
-
-    /**
-     * Stop audio stream
-     */
-    AudioStream& Stop() {
-        ::StopAudioStream(*this);
-        return *this;
-    }
-
-    /**
-     * Set volume for audio stream (1.0 is max level)
-     */
-    AudioStream& SetVolume(float volume = 1.0f) {
-        ::SetAudioStreamVolume(*this, volume);
         return *this;
     }
 
-    /**
-     * Set pitch for audio stream (1.0 is base level)
-     */
-    AudioStream& SetPitch(float pitch) {
-        ::SetAudioStreamPitch(*this, pitch);
-        return *this;
-    }
-
-    /**
-     * Set pan for audio stream (0.5 is centered)
-     */
-    AudioStream& SetPan(float pan = 0.5f) {
-        ::SetAudioStreamPan(*this, pan);
-        return *this;
-    }
-
-    /**
-     * Default size for new audio streams
-     */
-    static void SetBufferSizeDefault(int size) { ::SetAudioStreamBufferSizeDefault(size); }
-
-    /**
-     * Audio thread callback to request new data
-     */
-    void SetCallback(::AudioCallback callback) { ::SetAudioStreamCallback(*this, callback); }
-
-    /**
-     * Attach audio stream processor to stream
-     */
-    void AttachProcessor(::AudioCallback processor) { ::AttachAudioStreamProcessor(*this, processor); }
-
-    /**
-     * Detach audio stream processor from stream
-     */
-    void DetachProcessor(::AudioCallback processor) { ::DetachAudioStreamProcessor(*this, processor); }
-
-    /**
-     * Retrieve whether or not the audio stream is ready.
-     */
-    [[nodiscard]] bool IsValid() const { return ::IsAudioStreamValid(*this); }
+    ~AudioStream() { Unload(); }
 
-    /**
-     * Load audio stream (to stream raw audio pcm data)
-     *
-     * @throws raylib::RaylibException Throws if the AudioStream failed to load.
-     */
-    void Load(unsigned int SampleRate, unsigned int SampleSize, unsigned int Channels = 2) {
+    void Load(unsigned int sampleRate, unsigned int sampleSize, unsigned int channels = 2) {
         Unload();
-        set(::LoadAudioStream(SampleRate, SampleSize, Channels));
-        if (!IsValid()) {
-            throw RaylibException("Failed to load audio stream");
-        }
-    }
-protected:
-    void set(const ::AudioStream& stream) {
-        buffer = stream.buffer;
-        processor = stream.processor;
-        sampleRate = stream.sampleRate;
-        sampleSize = stream.sampleSize;
-        channels = stream.channels;
+        AudioStreamUnmanaged::Load(sampleRate, sampleSize, channels);
     }
 };
 } // namespace raylib