gearmulator

commit 17178764cab76a9e8b519b3fccd3ff8fb3374c8b
parent c5e486a2b71501674f4f0b043169d0ee3ae792f8
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sat, 27 Apr 2024 21:21:23 +0200

be more restrictive regarding version number when using simple tryReadChunk function

Diffstat:
M
source/synthLib/binarystream.cpp
 | 
6
+++---
M
source/synthLib/binarystream.h
 | 
6
+++---

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/synthLib/binarystream.cpp b/source/synthLib/binarystream.cpp
@@ -9,16 +9,16 @@ namespace synthLib
 		return std::move(chunk.data);
 	}
 
-	BinaryStream BinaryStream::tryReadChunkInternal(const char* _4Cc, const uint32_t _versionMax)
+	BinaryStream BinaryStream::tryReadChunkInternal(const char* _4Cc, const uint32_t _version)
 	{
 		Chunk chunk;
 		chunk.read(*this);
-		if(chunk.version > _versionMax)
+		if(chunk.version != _version)
 			return {};
 		if(0 != strcmp(chunk.fourCC, _4Cc))
 			return {};
 		return std::move(chunk.data);
 	}
 
-	template BinaryStream BinaryStream::tryReadChunk(char const(& _4Cc)[5], uint32_t _versionMax);
+	template BinaryStream BinaryStream::tryReadChunk(char const(& _4Cc)[5], uint32_t _version);
 }
diff --git a/source/synthLib/binarystream.h b/source/synthLib/binarystream.h
@@ -309,13 +309,13 @@ namespace synthLib
 
 		BinaryStream readChunk();
 		template<size_t N, std::enable_if_t<N == 5, void*> = nullptr>
-		BinaryStream tryReadChunk(char const(&_4Cc)[N], uint32_t _versionMax = 1)
+		BinaryStream tryReadChunk(char const(&_4Cc)[N], const uint32_t _version = 1)
 		{
-			return tryReadChunkInternal(_4Cc, _versionMax);
+			return tryReadChunkInternal(_4Cc, _version);
 		}
 
 	private:
-		BinaryStream tryReadChunkInternal(const char* _4Cc, uint32_t _versionMax = 1);
+		BinaryStream tryReadChunkInternal(const char* _4Cc, uint32_t _version = 1);
 
 
 		// ___________________________________