From 4bcb63d77693bba64dd96593e39e923d5250dd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 24 May 2021 19:12:00 +0200 Subject: [PATCH] Audio: Commit missing files --- include/Nazara/Audio/Audio.hpp | 2 ++ include/Nazara/Audio/SoundBuffer.hpp | 4 +--- src/Nazara/Audio/Audio.cpp | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Audio/Audio.hpp b/include/Nazara/Audio/Audio.hpp index 7711974f0..a25418cf4 100644 --- a/include/Nazara/Audio/Audio.hpp +++ b/include/Nazara/Audio/Audio.hpp @@ -39,7 +39,9 @@ namespace Nz Vector3f GetListenerPosition() const; Quaternionf GetListenerRotation() const; Vector3f GetListenerVelocity() const; + SoundBufferLoader& GetSoundBufferLoader(); const SoundBufferLoader& GetSoundBufferLoader() const; + SoundStreamLoader& GetSoundStreamLoader(); const SoundStreamLoader& GetSoundStreamLoader() const; float GetSpeedOfSound() const; diff --git a/include/Nazara/Audio/SoundBuffer.hpp b/include/Nazara/Audio/SoundBuffer.hpp index e4ebfd21c..fdbd3bfac 100644 --- a/include/Nazara/Audio/SoundBuffer.hpp +++ b/include/Nazara/Audio/SoundBuffer.hpp @@ -10,9 +10,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -37,7 +35,7 @@ namespace Nz struct SoundBufferImpl; - class NAZARA_AUDIO_API SoundBuffer : public RefCounted, public Resource + class NAZARA_AUDIO_API SoundBuffer : public Resource { friend Sound; diff --git a/src/Nazara/Audio/Audio.cpp b/src/Nazara/Audio/Audio.cpp index ef11f71d6..863930497 100644 --- a/src/Nazara/Audio/Audio.cpp +++ b/src/Nazara/Audio/Audio.cpp @@ -147,6 +147,15 @@ namespace Nz return velocity; } + /*! + * \brief Gets the default SoundBuffer loader + * \return A reference to the default SoundBuffer loader + */ + SoundBufferLoader& Audio::GetSoundBufferLoader() + { + return m_soundBufferLoader; + } + /*! * \brief Gets the default SoundBuffer loader * \return A constant reference to the default SoundBuffer loader @@ -156,6 +165,15 @@ namespace Nz return m_soundBufferLoader; } + /*! + * \brief Gets the default SoundStream loader + * \return A reference to the default SoundStream loader + */ + SoundStreamLoader& Audio::GetSoundStreamLoader() + { + return m_soundStreamLoader; + } + /*! * \brief Gets the default SoundStream loader * \return A constant reference to the default SoundStream loader