Traktor: Exposed Reader class to script. Inlined Any constructor.

apistol78 · Jan 23, 2024 · 45908d0 · 45908d0
1 parent 5b47459
commit 45908d0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/code/Core/Class/Any.cpp b/code/Core/Class/Any.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -60,11 +60,6 @@ char* refStringDec(char* s)
 
 	}
 
-Any::Any()
-:	m_type(Type::Void)
-{
-}
-
 Any::Any(const Any& src)
 :	m_type(src.m_type)
 {
@@ -79,13 +74,6 @@ Any::Any(const Any& src)
 		m_data = src.m_data;
 }
 
-Any::Any(Any&& src) noexcept
-:	m_type(src.m_type)
-,	m_data(src.m_data)
-{
-	src.m_type = Type::Void;
-}
-
 Any::~Any()
 {
 	T_EXCEPTION_GUARD_BEGIN

diff --git a/code/Core/Class/Any.h b/code/Core/Class/Any.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -48,11 +48,19 @@ class T_DLLCLASS Any
 		Object
 	};
 
-	Any();
+	Any()
+	:	m_type(Type::Void)
+	{
+	}
 
 	Any(const Any& src);
 
-	Any(Any&& src) noexcept;
+	Any(Any&& src) noexcept
+	:	m_type(src.m_type)
+	,	m_data(src.m_data)
+	{
+		src.m_type = Type::Void;
+	}
 
 	virtual ~Any();
 

diff --git a/code/Core/Class/CoreClassFactory1.cpp b/code/Core/Class/CoreClassFactory1.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,6 +19,7 @@
 #include "Core/Io/DynamicMemoryStream.h"
 #include "Core/Io/FileSystem.h"
 #include "Core/Io/MemoryStream.h"
+#include "Core/Io/Reader.h"
 #include "Core/Io/StreamCopy.h"
 #include "Core/Io/StringReader.h"
 #include "Core/Io/Utf8Encoding.h"
@@ -46,6 +47,12 @@ namespace traktor
 	namespace
 	{
 
+float Reader_readFloat(Reader* self)
+{
+	float v; *self >> v;
+	return v;
+}
+
 Ref< Path > Path_concat(Path* self, Path* rh)
 {
 	return new Path(*self + *rh);
@@ -358,6 +365,7 @@ void CoreClassFactory1::createClasses(IRuntimeClassRegistrar* registrar) const
 	classFile->addConstant("FmRead", Any::fromInt32(File::FmRead));
 	classFile->addConstant("FmWrite", Any::fromInt32(File::FmWrite));
 	classFile->addConstant("FmAppend", Any::fromInt32(File::FmAppend));
+	classFile->addConstant("FmMapped", Any::fromInt32(File::FmMapped));
 	classFile->addConstructor();
 	classFile->addConstructor< const Path&, uint64_t, uint32_t, const DateTime&, const DateTime&, const DateTime& >();
 	classFile->addConstructor< const Path&, uint64_t, uint32_t >();
@@ -454,6 +462,11 @@ void CoreClassFactory1::createClasses(IRuntimeClassRegistrar* registrar) const
 	classBitWriter->addMethod("tell", &BitWriter::tell);
 	registrar->registerClass(classBitWriter);
 
+	auto classReader = new AutoRuntimeClass< Reader >();
+	classReader->addConstructor< IStream* >();
+	classReader->addMethod("readFloat", &Reader_readFloat);
+	registrar->registerClass(classReader);
+
 	auto classFileSystem = new AutoRuntimeClass< FileSystem >();
 	classFileSystem->addProperty("volumeCount", &FileSystem::getVolumeCount);
 	classFileSystem->addProperty("currentVolume", &FileSystem::setCurrentVolume, &FileSystem::getCurrentVolume);