From a84f53121c264b8ffc92bb59119f2b83389ae39e Mon Sep 17 00:00:00 2001
From: lnd3 <linus.cumselius@gmail.com>
Date: Sun, 1 Sep 2024 05:27:07 +0200
Subject: [PATCH] Some cmake config changes.

---
 CMakeLists.txt                                   |  2 +-
 packages/audio/CMakeLists.txt                    | 11 +++++++++++
 packages/audio/include/audio/Audio.h             |  9 +++++++++
 packages/audio/source/common/Audio.cpp           | 16 ++++++++++++++++
 packages/audio/tests/common/AudioTest.cpp        |  7 +++++++
 packages/audio/tests/common/MiniAudioTest.cpp    |  9 +++++++++
 packages/nodegraph/CMakeLists.txt                |  5 +++++
 .../include/nodegraph/NodeGraphOperations.h      |  6 ------
 .../source/common/NodeGraphOperations.cpp        |  3 ++-
 9 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 packages/audio/CMakeLists.txt
 create mode 100644 packages/audio/include/audio/Audio.h
 create mode 100644 packages/audio/source/common/Audio.cpp
 create mode 100644 packages/audio/tests/common/AudioTest.cpp
 create mode 100644 packages/audio/tests/common/MiniAudioTest.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ece516d8..f312e713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ else()
 		meta
 		memory
 		hid
+		audio
 		nodegraph
 
 		concurrency
@@ -31,7 +32,6 @@ else()
 		network
 		storage
 		tools
-		audio
 
 		physics
 		ecs
diff --git a/packages/audio/CMakeLists.txt b/packages/audio/CMakeLists.txt
new file mode 100644
index 00000000..ba1a552f
--- /dev/null
+++ b/packages/audio/CMakeLists.txt
@@ -0,0 +1,11 @@
+project (audio)
+
+set(deps
+	various
+
+	logging
+	testing
+	memory
+)
+
+bs_generate_package(audio "tier1" "${deps}" "")
diff --git a/packages/audio/include/audio/Audio.h b/packages/audio/include/audio/Audio.h
new file mode 100644
index 00000000..e6710b39
--- /dev/null
+++ b/packages/audio/include/audio/Audio.h
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace l::audio {
+
+    float GetFrequencyFromNote(float note);
+
+
+
+}
diff --git a/packages/audio/source/common/Audio.cpp b/packages/audio/source/common/Audio.cpp
new file mode 100644
index 00000000..ec4d2077
--- /dev/null
+++ b/packages/audio/source/common/Audio.cpp
@@ -0,0 +1,16 @@
+#include "audio/Audio.h"
+
+#define MA_NO_DECODING
+#define MA_NO_ENCODING
+#define MINIAUDIO_IMPLEMENTATION
+
+#include "various/miniaudio.h"
+
+
+namespace l::audio {
+    float GetFrequencyFromNote(float note) {
+        return 440.0f * powf(2.0f, (note - 49.0f) / 12.0f);
+    }
+
+
+}
diff --git a/packages/audio/tests/common/AudioTest.cpp b/packages/audio/tests/common/AudioTest.cpp
new file mode 100644
index 00000000..6d728e9e
--- /dev/null
+++ b/packages/audio/tests/common/AudioTest.cpp
@@ -0,0 +1,7 @@
+#include "testing/Test.h"
+
+int main(int, char* argw[]) {
+	TEST_RUN(argw[0]);
+
+	return 0;
+}
diff --git a/packages/audio/tests/common/MiniAudioTest.cpp b/packages/audio/tests/common/MiniAudioTest.cpp
new file mode 100644
index 00000000..d11b82d3
--- /dev/null
+++ b/packages/audio/tests/common/MiniAudioTest.cpp
@@ -0,0 +1,9 @@
+#include "testing/Test.h"
+
+#include "audio/Audio.h"
+
+TEST(MiniAudio, Setup) {
+
+
+	return 0;
+}
diff --git a/packages/nodegraph/CMakeLists.txt b/packages/nodegraph/CMakeLists.txt
index 9d1ec5f7..9a4179b8 100644
--- a/packages/nodegraph/CMakeLists.txt
+++ b/packages/nodegraph/CMakeLists.txt
@@ -1,9 +1,14 @@
 project (nodegraph)
 
 set(deps
+	various
+
 	logging
+
 	testing
+	memory
 	hid
+	audio
 )
 
 bs_generate_package(nodegraph "tier1" "${deps}" "")
diff --git a/packages/nodegraph/include/nodegraph/NodeGraphOperations.h b/packages/nodegraph/include/nodegraph/NodeGraphOperations.h
index a74ebf70..79c256f1 100644
--- a/packages/nodegraph/include/nodegraph/NodeGraphOperations.h
+++ b/packages/nodegraph/include/nodegraph/NodeGraphOperations.h
@@ -77,12 +77,6 @@ namespace l::nodegraph {
         float mPrevTime = 0.0f;
     };
 
-    namespace {
-        float GetFrequencyFromNote(float note) {
-            return 440.0f * powf(2.0f, (note - 49.0f) / 12.0f);
-        }
-    }
-
     class GraphSourceKeyboard : public NodeGraphOp, public l::hid::INoteProcessor {
     public:
         GraphSourceKeyboard(NodeGraphBase* node, int32_t polyphony, l::hid::KeyState* keyState) :
diff --git a/packages/nodegraph/source/common/NodeGraphOperations.cpp b/packages/nodegraph/source/common/NodeGraphOperations.cpp
index 24510bb0..1c454405 100644
--- a/packages/nodegraph/source/common/NodeGraphOperations.cpp
+++ b/packages/nodegraph/source/common/NodeGraphOperations.cpp
@@ -1,6 +1,7 @@
 #include "nodegraph/NodeGraphOperations.h"
 
 #include "logging/Log.h"
+#include "audio/Audio.h"
 
 #include <math.h>
 
@@ -129,7 +130,7 @@ namespace l::nodegraph {
     }
 
     void GraphSourceKeyboard::NoteOn(int32_t note) {
-        float frequency = GetFrequencyFromNote(static_cast<float>(note));
+        float frequency = l::audio::GetFrequencyFromNote(static_cast<float>(note));
         int8_t channel = GetNextNoteChannel(note);
         mNode->SetInput(static_cast<int8_t>(channel), frequency);
         mNode->ProcessSubGraph();