SoundInstance const noexcept

Author: NicusorN5

3DRadSpace/Engine3DRadSpace/Audio/AudioBuffer.cpp

@@ -222,7 +222,7 @@ std::expected<AudioBuffer, AudioBuffer::OGGLoadError> AudioBuffer::FromOGG(const
 	{
 		long read = ov_read(
 			&vf,
-			buffer + offset, 
+			buffer, 
 			4096,
 			std::endian::native == std::endian::big, // 1 if big-endian, 0 if little-endian
 			sizeof(short),
@@ -231,7 +231,7 @@ std::expected<AudioBuffer, AudioBuffer::OGGLoadError> AudioBuffer::FromOGG(const
 		);
 		if(!read) break;
 
-		if(bytesRead < 0)
+		if(read < 0)
 		{
 			//Faulty OGG file.
 			delete[] buffer;

3DRadSpace/Engine3DRadSpace/Audio/AudioEngine.hpp

@@ -16,8 +16,6 @@ namespace Engine3DRadSpace::Audio
 
 		bool _hasEAX2support = false;
 
-		std::vector<SoundInstance*> _instances;
-
 		void _initializeContext();
 	public:
 		AudioEngine();
@@ -35,8 +33,6 @@ namespace Engine3DRadSpace::Audio
 
 		void SwitchAudioDevice(const std::string& deviceName);
 
-		bool HasEAX2Support() const noexcept;
-
 		~AudioEngine();
 
 		void Update() const noexcept;

3DRadSpace/Engine3DRadSpace/Audio/Sound.cpp

@@ -21,18 +21,18 @@ AudioBuffer Sound::_attemptLoading(const std::filesystem::path& path)
 
 Sound::Sound(Internal::AssetUUIDReader dummy) :
 	_audio(nullptr),
-	_sound(nullptr,0,0,0,0,0),
 	_bufferID(0)
 {
 }
 
 Sound::Sound(AudioEngine *audio, const std::filesystem::path& path) :
-	_audio(audio),
-	_sound(std::move(_attemptLoading(path)))
+	_audio(audio)
 {
+	AudioBuffer sound(std::move(_attemptLoading(path)));
+
 	//Generate OpenAL sound buffer
 	alGenBuffers(1, &_bufferID); //Create one buffer
-	alBufferData(_bufferID, _sound._format, _sound._buffer.get(), _sound._size, _sound._sampleRate); //Set buffer.
+	alBufferData(_bufferID, sound._format, sound._buffer.get(), sound._size, sound._sampleRate); //Set buffer.
 	if(audio->CheckErrors().has_value()) throw Exception("Failed to copy OpenAL buffer!");
 }
 
@@ -44,8 +44,8 @@ Reflection::UUID Sound::GetUUID() const noexcept
 
 const char* Sound::FileExtension() const noexcept
 {
-	return "All supported audio formats(*.wav;*.ogg)\0*.wav;*.ogg\0"
-			"Waveform Audio File Format(*.wav)\0 *.wav\0"
+	return "All supported audio formats(*.wav;*.wave;*.ogg)\0*.wav;*.wave;*.ogg\0"
+			"Waveform Audio File Format(*.wav;*.wave)\0*.wav;*.wave\0"
 			"Ogg Vorbis Compressed Audio Format(*.ogg)\0*.ogg\0"
 			"All Files(*.*)\0*.*\0\0";
 }

3DRadSpace/Engine3DRadSpace/Audio/Sound.hpp

@@ -13,7 +13,6 @@ namespace Engine3DRadSpace::Audio
 	{
 	protected:
 		AudioEngine* _audio;
-		AudioBuffer _sound;
 		unsigned int _bufferID;
 
 		AudioBuffer _attemptLoading(const std::filesystem::path& path);

3DRadSpace/Engine3DRadSpace/Audio/SoundInstance.cpp

@@ -33,7 +33,7 @@ SoundInstance::SoundInstance(Sound* sound):
 	if(_audio->CheckErrors().has_value()) throw Logging::Exception("Failed to assign buffer to source!");
 }
 
-const AudioSource& SoundInstance::GetSource()
+const AudioSource& SoundInstance::GetSource() noexcept
 {
 	alGetSourcef(_sourceID, AL_PITCH, &_source.Pitch);
 	alGetSourcef(_sourceID, AL_GAIN, &_source.Gain);
@@ -121,10 +121,10 @@ void SoundInstance::SetSource(const AudioSource& source)
 	auto looping = _source.Looping ? AL_TRUE : AL_FALSE;
 	alSourcei(_sourceID, AL_LOOPING, looping);
 
-	if(_audio->CheckErrors().has_value()) throw int(5);
+	if(_audio->CheckErrors().has_value()) throw Logging::Exception("Error setting source properties");
 }
 
-SoundState SoundInstance::GetState()
+SoundState SoundInstance::GetState() const noexcept
 {
 	int sourceState;
 	alGetSourcei(_sourceID, AL_SOURCE_STATE, &sourceState);
@@ -146,26 +146,21 @@ SoundState SoundInstance::GetState()
 	}
 }
 
-void SoundInstance::Play()
+void SoundInstance::Play(bool dontOverlap) const noexcept
 {
-	//if(GetState() == SoundState::Playing) return; //do not overlap the same sound instance
-	//alGetError();
+	if(GetState() == SoundState::Playing && dontOverlap) return;
 
 	alSourcePlay(_sourceID);
-
-	if(_audio->CheckErrors().has_value()) throw int(5);
 }
 
-void Engine3DRadSpace::Audio::SoundInstance::Stop()
+void Engine3DRadSpace::Audio::SoundInstance::Stop() const noexcept
 {
 	alSourceStop(_sourceID);
-	if(_audio->CheckErrors().has_value()) throw float(5);
 }
 
-void Engine3DRadSpace::Audio::SoundInstance::Pause()
+void Engine3DRadSpace::Audio::SoundInstance::Pause() const noexcept
 {
 	alSourcePause(_sourceID);
-	if(_audio->CheckErrors().has_value()) throw float(6);
 }
 
 SoundInstance::~SoundInstance()

3DRadSpace/Engine3DRadSpace/Audio/SoundInstance.hpp

@@ -15,9 +15,9 @@ namespace Engine3DRadSpace::Audio
 		SoundInstance(Sound* sound, const AudioSource& source);
 		SoundInstance(Sound* sound);
 
-		const AudioSource &GetSource();
+		const AudioSource& GetSource() noexcept;
 		void SetSource(const AudioSource& source);
-		SoundState GetState();
+		SoundState GetState() const noexcept;
 
 		void SetPitch(float pitch);
 		void SetGain(float gain);
@@ -50,9 +50,9 @@ namespace Engine3DRadSpace::Audio
 		bool IsLooping();
 		void SetLooping(bool looping);
 
-		void Play();
-		void Stop();
-		void Pause();
+		void Play(bool dontOverlap = true) const noexcept;
+		void Stop() const noexcept;
+		void Pause() const noexcept;
 
 		~SoundInstance();
 	};