Merge branch 'master' of https://github.com/Drewol/unnamed-sdvx-clone …

…into slam-shake-tweak

Audio/CMakeLists.txt

@@ -29,14 +29,21 @@ source_group("" FILES ${PCH_FILES})
 enable_precompiled_headers("${AUDIO_SRC}" "${PCH_SRC}")
 
 add_library(Audio ${AUDIO_SRC} ${PCH_FILES})
-target_compile_features(Audio PUBLIC cxx_std_14)
+target_compile_features(Audio PUBLIC cxx_std_17)
 target_include_directories(Audio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(Audio PRIVATE
     ${SRCROOT}
     ${INCROOT}
     ${PCHROOT}
 )
 
+if(UNIX AND NOT APPLE)
+    target_compile_options(Audio PUBLIC -Wall -Wextra -Werror -Wno-unused-variable -Wno-unused-parameter -Wno-unused-function -Wno-unused-value) 
+    if(CMAKE_BUILD_TYPE STREQUAL "Release")
+        target_compile_options(Audio PUBLIC -Wno-maybe-uninitialized) 
+    endif(CMAKE_BUILD_TYPE STREQUAL "Release")
+endif(UNIX AND NOT APPLE)
+
 # Dependencies
 ## Local Dependencies
 target_link_libraries(Audio Shared)

Audio/include/Audio/DSP.hpp

@@ -20,6 +20,7 @@ class PanDSP : public DSP
 class BQFDSP : public DSP
 {
 public:
+	BQFDSP();
 	float b0 = 1.0f;
 	float b1 = 0.0f;
 	float b2 = 0.0f;

Audio/src/AudioStream.cpp

@@ -42,6 +42,6 @@ Ref<AudioStream> AudioStream::Create(Audio* audio, const String& path, bool prel
 {
 	Ref<AudioStream> impl = FindImplementation(audio, path, preload);
 	if(impl)
-		audio->GetImpl()->Register(impl.GetData());
+		audio->GetImpl()->Register(impl.get());
 	return impl;
 }

Audio/src/AudioStreamBase.cpp

@@ -190,7 +190,7 @@ void AudioStreamBase::Process(float* out, uint32 numSamples)
 
 	if(m_samplePos > 0)
 	{
-		if(m_samplePos >= m_samplesTotal)
+		if((uint64)m_samplePos >= m_samplesTotal)
 		{
 			if(!m_ended)
 			{

Audio/src/AudioStreamMa.cpp

@@ -11,6 +11,7 @@
 #define MINIAUDIO_IMPLEMENTATION
 #include "miniaudio.h"
 
+
 AudioStreamMa::~AudioStreamMa()
 {
 	Deregister();
@@ -93,7 +94,7 @@ int32 AudioStreamMa::DecodeData_Internal()
 		int actualRead = 0;
 		for (size_t i = 0; i < samplesPerRead; i++)
 		{
-			if (m_playbackPointer >= m_samplesTotal)
+			if (m_playbackPointer >= (int64)m_samplesTotal)
 			{
 				m_currentBufferSize = samplesPerRead;
 				m_remainingBufferData = samplesPerRead;
@@ -114,7 +115,7 @@ int32 AudioStreamMa::DecodeData_Internal()
 		float decodeBuffer[256];
 
 		int totalRead = ma_decoder_read_pcm_frames(&m_decoder, decodeBuffer, samplesPerRead);
-		for (size_t i = 0; i < totalRead; i++)
+		for (int i = 0; i < totalRead; i++)
 		{
 			m_readBuffer[0][i] = decodeBuffer[i * 2];
 			m_readBuffer[1][i] = decodeBuffer[i * 2 + 1];
@@ -141,7 +142,6 @@ Ref<AudioStream> AudioStreamMa::Create(class Audio* audio, const String& path, b
 	{
 		delete impl;
 		impl = nullptr;
-		return Ref<AudioStream>();
 	}
-	return Ref<AudioStream>(impl);
+	return Utility::CastRef<AudioStreamMa, AudioStream>(Ref<AudioStreamMa>(impl));
 }

Audio/src/AudioStreamMa.hpp

@@ -10,11 +10,9 @@ class AudioStreamMa : public AudioStreamBase
 	int64 m_playbackPointer = 0;
 	uint64 m_dataPosition = 0;
 	const int sample_rate = 48000;
-	ma_decoder m_decoder;
+	ma_decoder m_decoder = {  };
 	int m_byteRate;
 protected:
-	AudioStreamMa() = default;
-	~AudioStreamMa();
 	bool Init(Audio* audio, const String& path, bool preload) override;
 	int32 GetStreamPosition_Internal() override;
 	int32 GetStreamRate_Internal() override;
@@ -23,5 +21,7 @@ class AudioStreamMa : public AudioStreamBase
 	float* GetPCM_Internal() override;
 	uint32 GetSampleRate_Internal() const override;
 public:
+	AudioStreamMa() = default;
+	~AudioStreamMa();
 	static Ref<AudioStream> Create(class Audio* audio, const String& path, bool preload);
 };

Audio/src/AudioStreamMp3.cpp

@@ -139,7 +139,7 @@ bool AudioStreamMp3::Init(Audio* audio, const String& path, bool preload)
 		int totalSamples = 0;
 		while (r > 0)
 		{
-			for (size_t i = 0; i < r; i++)
+			for (int32 i = 0; i < r; i++)
 			{
 				m_pcm.Add(m_readBuffer[0][i]);
 				m_pcm.Add(m_readBuffer[1][i]);	
@@ -218,7 +218,7 @@ int32 AudioStreamMp3::DecodeData_Internal()
 				m_playPos++;
 				continue;
 			}
-			else if (m_playPos >= m_samplesTotal)
+			else if ((uint64)m_playPos >= m_samplesTotal)
 			{
 				m_currentBufferSize = samplesPerRead;
 				m_remainingBufferData = samplesPerRead;

Audio/src/AudioStreamMp3.hpp

@@ -7,7 +7,7 @@ extern "C"
 
 class AudioStreamMp3 : public AudioStreamBase
 {
-	mp3_decoder_t* m_decoder;
+	mp3_decoder_t* m_decoder = nullptr;
 	size_t m_mp3dataOffset = 0;
 	size_t m_mp3dataLength = 0;
 	int32 m_mp3samplePosition = 0;
@@ -23,8 +23,7 @@ class AudioStreamMp3 : public AudioStreamBase
 	int m_unsynchsafe(int in);
 	int m_toLittleEndian(int num);
 protected:
-	AudioStreamMp3() = default;
-	~AudioStreamMp3();
+
 	bool Init(Audio* audio, const String& path, bool preload) override;
 	void SetPosition_Internal(int32 pos) override;
 	int32 GetStreamPosition_Internal() override;
@@ -33,5 +32,7 @@ class AudioStreamMp3 : public AudioStreamBase
 	float* GetPCM_Internal() override;
 	int32 DecodeData_Internal() override;
 public:
+	AudioStreamMp3() = default;
+	~AudioStreamMp3();
 	static Ref<AudioStream> Create(Audio* audio, const String& path, bool preload);
 };

Audio/src/AudioStreamOgg.cpp

@@ -59,15 +59,15 @@ bool AudioStreamOgg::Init(Audio* audio, const String& path, bool preload)
 			{
 				if (m_info.channels == 2)
 				{
-					for (size_t i = 0; i < r; i++)
+					for (int i = 0; i < r; i++)
 					{
 						m_pcm.Add(readBuffer[0][i]);
 						m_pcm.Add(readBuffer[1][i]);
 					}
 				}
 				else if (m_info.channels == 1)
 				{
-					for (size_t i = 0; i < r; i++)
+					for (int i = 0; i < r; i++)
 					{
 						m_pcm.Add(readBuffer[0][i]);
 						m_pcm.Add(readBuffer[0][i]);
@@ -139,7 +139,7 @@ int32 AudioStreamOgg::DecodeData_Internal()
 				m_playPos++;
 				continue;
 			}
-			else if (m_playPos >= m_samplesTotal)
+			else if ((uint64)m_playPos >= m_samplesTotal)
 			{
 				m_currentBufferSize = m_bufferSize;
 				m_remainingBufferData = m_bufferSize;

Audio/src/AudioStreamOgg.hpp

@@ -6,13 +6,12 @@
 class AudioStreamOgg : public AudioStreamBase
 {
 protected:
-	OggVorbis_File m_ovf = { 0 };
+	OggVorbis_File m_ovf;
 	vorbis_info m_info;
 	Vector<float> m_pcm;
 	int64 m_playPos;
 
-	AudioStreamOgg() = default;
-	~AudioStreamOgg();
+
 	bool Init(Audio* audio, const String& path, bool preload) override;
 	void SetPosition_Internal(int32 pos) override;
 	int32 GetStreamPosition_Internal() override;
@@ -25,5 +24,7 @@ class AudioStreamOgg : public AudioStreamBase
 	static int m_Seek(AudioStreamOgg* self, int64 offset, int whence);
 	static long m_Tell(AudioStreamOgg* self);
 public:
+	AudioStreamOgg() = default;
+	~AudioStreamOgg();
 	static Ref<AudioStream> Create(class Audio* audio, const String& path, bool preload);
 };

Audio/src/AudioStreamWav.cpp

@@ -159,7 +159,7 @@ bool AudioStreamWav::Init(Audio* audio, const String& path, bool preload)
 
 
 				//Decode to float
-				int pos = 0;
+				uint64 pos = 0;
 				m_pcm.resize(2 * m_samplesTotal * sizeof(float));
 				if (m_format.nFormat == 1)
 				{
@@ -191,10 +191,10 @@ bool AudioStreamWav::Init(Audio* audio, const String& path, bool preload)
 
 					while (pos < m_samplesTotal)
 					{
-						int newDecoded = m_decode_ms_adpcm(m_Internaldata, &decodedBuffer, pos);
+						uint32 newDecoded = m_decode_ms_adpcm(m_Internaldata, &decodedBuffer, pos);
 						pos += m_format.nBlockAlign;
 						int16* src = ((int16*)decodedBuffer.data());
-						for (size_t i = 0; i < newDecoded; i++)
+						for (uint32 i = 0; i < newDecoded; i++)
 						{
 							m_pcm[(2 * decoded) + (i * 2)] = (float)src[i * 2] / (float)0x7FFF;
 							m_pcm[(2 * decoded) + (i * 2) + 1] = (float)src[i * 2 + 1] / (float)0x7FFF;
@@ -335,7 +335,7 @@ int32 AudioStreamWav::DecodeData_Internal()
 			{
 				for (uint32 i = 0; i < samplesPerRead; i++)
 				{
-					if (m_playbackPointer >= m_samplesTotal)
+					if (m_playbackPointer >= (int64)m_samplesTotal)
 					{
 						m_currentBufferSize = samplesPerRead;
 						m_remainingBufferData = samplesPerRead;
@@ -352,7 +352,7 @@ int32 AudioStreamWav::DecodeData_Internal()
 				// Mix mono sample
 				for (uint32 i = 0; i < samplesPerRead; i++)
 				{
-					if (m_playbackPointer >= m_samplesTotal)
+					if (m_playbackPointer >= (int64)m_samplesTotal)
 					{
 						m_currentBufferSize = samplesPerRead;
 						m_remainingBufferData = samplesPerRead;
@@ -409,7 +409,7 @@ int32 AudioStreamWav::DecodeData_Internal()
 				m_playbackPointer++;
 				continue;
 			}
-			else if (m_playbackPointer >= m_samplesTotal)
+			else if (m_playbackPointer >= (int64)m_samplesTotal)
 			{
 				m_currentBufferSize = samplesPerRead;
 				m_remainingBufferData = samplesPerRead;

Audio/src/AudioStreamWav.hpp

@@ -30,15 +30,14 @@ class AudioStreamWav : public AudioStreamBase
 		uint16 nBitsPerSample;
 	};
 	Buffer m_Internaldata;
-	WavFormat m_format = { 0 };
+	WavFormat m_format;
 	Vector<float> m_pcm;
 	int64 m_playbackPointer = 0;
 	uint64 m_dataPosition = 0;
 	uint32 m_decode_ms_adpcm(const Buffer& encoded, Buffer* decoded, uint64 pos);
 
 protected:
-	AudioStreamWav() = default;
-	~AudioStreamWav();
+
 	bool Init(Audio* audio, const String& path, bool preload) override;
 	int32 GetStreamPosition_Internal() override;
 	int32 GetStreamRate_Internal() override;
@@ -47,5 +46,7 @@ class AudioStreamWav : public AudioStreamBase
 	float* GetPCM_Internal() override;
 	uint32 GetSampleRate_Internal() const override;
 public:
+	AudioStreamWav() = default;
+	~AudioStreamWav();
 	static Ref<AudioStream> Create(class Audio* audio, const String& path, bool preload);
 };