rework audio data

Author: Sploder12

src/include/sndx/audio/al.hpp

@@ -2,7 +2,6 @@
 
 #include "./al/al.hpp"
 #include "./al/abo.hpp"
-#include "./al/audio_data.hpp"
 #include "./al/source.hpp"
 #include "./al/context.hpp"
 #include "./al/device.hpp"

src/include/sndx/audio/al/abo.hpp

@@ -2,7 +2,7 @@
 
 #include "./al.hpp"
 
-#include "./audio_data.hpp"
+#include "../audio_data.hpp"
 
 #include "../../mixin/handle.hpp"
 
@@ -55,11 +55,27 @@ namespace sndx::audio {
 			destroy();
 		}
 
-		ABO& setData(const ALaudioData& data) {
-			if (auto size = ALsizei(data.getByteSize()); size > 0) {
-				gen();
-				alBufferData(m_id, ALenum(data.getFormat()), data.data(), size, ALsizei(data.getFrequency()));
+		template <class SampleT>
+		ABO& setData(const AudioData<SampleT>& data) {
+			if (auto size = ALsizei(data.byteSize()); size <= 0) {
+				return *this;
 			}
+			gen();
+
+			
+			if constexpr (std::is_same_v<SampleT, uint8_t> || std::is_same_v<SampleT, int16_t>) {
+				ALenum format = determineALformat(sizeof(SampleT), data.channels());
+				alBufferData(m_id, format, data.data(), size, ALsizei(data.frequency()));
+			}
+			else {
+				if (data.channels() > 2)
+					throw std::runtime_error("OpenAL does not support > 2 channels");
+
+				ALenum format = data.channels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
+				auto converted = convert<uint16_t>(data);
+				alBufferData(m_id, format, converted.data(), size, ALsizei(converted.frequency()));
+			}
+
 			return *this;
 		}
 

src/include/sndx/audio/al/al.hpp

@@ -108,47 +108,6 @@ namespace sndx::audio {
 	constexpr unsigned char getBytesPerSample(ALformat format) noexcept {
 		return static_cast<unsigned char>(getByteDepth(format) * getChannels(format));
 	}
-
-	[[nodiscard]]
-	constexpr long double getMaxValue(ALformat format) {
-		if (is8Bit(format)) return (long double)std::numeric_limits<uint8_t>::max();
-
-		return (long double)std::numeric_limits<int16_t>::max();
-	}
-
-	[[nodiscard]]
-	constexpr long double getMinValue(ALformat format) {
-		if (is8Bit(format)) return (long double)std::numeric_limits<uint8_t>::lowest();
-
-		return (long double)std::numeric_limits<int16_t>::lowest();
-	}
-
-	[[nodiscard]]
-	constexpr long double getCenterValue(ALformat format) {
-		if (is8Bit(format)) return 128.0l;
-
-		return 0.0l;
-	}
-
-	[[nodiscard]]
-	constexpr ALformat toMono(ALformat format) {
-		return determineALformat(getBitDepth(format), 1);
-	}
-
-	[[nodiscard]]
-	constexpr ALformat toStereo(ALformat format) {
-		return determineALformat(getBitDepth(format), 2);
-	}
-
-	[[nodiscard]]
-	constexpr ALformat to8Bit(ALformat format) {
-		return determineALformat(8, getChannels(format));
-	}
-
-	[[nodiscard]]
-	constexpr ALformat to16Bit(ALformat format) {
-		return determineALformat(16, getChannels(format));
-	}
 }
 
 #ifdef UNDEF_WIN32_LEAN_AND_MEAN