Fixed some bugs.

lnd3 · Sep 2, 2024 · 3f8fd53 · 3f8fd53
1 parent 55aa948
commit 3f8fd53
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/packages/audio/source/common/PortAudio.cpp b/packages/audio/source/common/PortAudio.cpp
@@ -133,7 +133,7 @@ namespace l::audio {
             return false;
         }
 
-        auto bufferSize = GetPartTotalSize();
+        auto bufferSize = static_cast<size_t>(GetPartTotalSize());
         if (mWriteBuffer.size() != bufferSize) {
             mWriteBuffer.resize(bufferSize);
         }

diff --git a/packages/audio/tests/common/PortAudioTest.cpp b/packages/audio/tests/common/PortAudioTest.cpp
@@ -14,7 +14,7 @@ TEST(PortAudio, Setup) {
 
     auto stream = manager.GetStream("speaker");
 
-    if (!stream->OpenStream(2048, 20.0f)) {
+    if (!stream->OpenStream(2048, 20.0f, l::audio::BufferingMode::TRIPLE_BUFFERING)) {
         return 0;
     }
     if (!stream->StartStream()) {

diff --git a/packages/nodegraph/include/nodegraph/NodeGraph.h b/packages/nodegraph/include/nodegraph/NodeGraph.h
@@ -190,7 +190,6 @@ namespace l::nodegraph {
             for (int8_t i = mInputCount; i < mInputCount + mConstantCount; i++) {
                 SetInput(i, 0.0f);
             }
-            ProcessSubGraph();
         }
 
         virtual bool IsDataVisible(int8_t num) override {
@@ -207,8 +206,14 @@ namespace l::nodegraph {
         }
 
         virtual void ProcessOperation() override {
+            if (mProcessUpdateHasRun) {
+                return;
+            }
+
             NodeGraphBase::ProcessOperation();
             mOperation.ProcessSubGraph(mInputs, mOutputs);
+
+            mProcessUpdateHasRun = true;
         }
 
         virtual void Tick(float time, float elapsed) override {

diff --git a/packages/nodegraph/include/nodegraph/NodeGraphOperations.h b/packages/nodegraph/include/nodegraph/NodeGraphOperations.h
@@ -96,7 +96,6 @@ namespace l::nodegraph {
 
     protected:
         float mPhase = 0.0f;
-        float mPrevTime = 0.0f;
     };
 
     class GraphSourceKeyboard : public NodeGraphOp, public l::hid::INoteProcessor {

diff --git a/packages/nodegraph/source/common/NodeGraphOperations.cpp b/packages/nodegraph/source/common/NodeGraphOperations.cpp
@@ -71,24 +71,22 @@ namespace l::nodegraph {
     }
 
     void GraphSourceSine::ProcessSubGraph(std::vector<NodeGraphInput>& inputs, std::vector<NodeGraphOutput>& outputs) {
-        float time = inputs.at(0).Get();
+        //float time = inputs.at(0).Get();
         float freq = inputs.at(1).Get();
         float fMod = 1.0f + inputs.at(2).Get();
         float pMod = inputs.at(3).Get();
         float reset = inputs.at(4).Get();
 
-        if (reset > 0.5f) {
+        if (freq == 0.0f) {
             Reset();
+            outputs.at(0).mOutput = 0.0f;
+            return;
         }
-
-        float deltaTime = time - mPrevTime;
-        if (mPrevTime == 0.0f) {
-            mPrevTime = time;
-            deltaTime = time - mPrevTime;
+        if (reset > 0.5f) {
+            Reset();
         }
 
-        mPrevTime = time;
-
+        float deltaTime = 1.0f / 44100.0f;
         float phaseDelta = deltaTime * freq;
 
         mPhase += phaseDelta * fMod;
@@ -104,7 +102,6 @@ namespace l::nodegraph {
 
     void GraphSourceSine::Reset() {
         mPhase = 0.0f;
-        mPrevTime = 0.0f;
     }
 
     std::string_view GraphSourceSine::GetInputName(int8_t inputChannel) {
@@ -133,7 +130,6 @@ namespace l::nodegraph {
         for (int8_t i = 0; i < GetNumInputs(); i++) {
             mNode->SetInput(i, 0.0f);
         }
-        mNode->ProcessSubGraph();
     }
 
     std::string_view GraphSourceKeyboard::GetOutputName(int8_t outputChannel) {
@@ -152,7 +148,6 @@ namespace l::nodegraph {
         float frequency = l::audio::GetFrequencyFromNote(static_cast<float>(note));
         int8_t channel = GetNextNoteChannel(note);
         mNode->SetInput(static_cast<int8_t>(channel), frequency);
-        mNode->ProcessSubGraph();
     }
     void GraphSourceKeyboard::NoteOff() {
         Reset();
@@ -162,7 +157,6 @@ namespace l::nodegraph {
         int8_t channel = ResetNoteChannel(note);
         if (channel >= 0) {
             mNode->SetInput(channel, 0.0f);
-            mNode->ProcessSubGraph();
         }
     }
 

diff --git a/packages/nodegraph/source/common/NodeGraphSchema.cpp b/packages/nodegraph/source/common/NodeGraphSchema.cpp
@@ -34,7 +34,7 @@ namespace l::nodegraph {
             node = mMainNodeGraph.NewNode<l::nodegraph::GraphSourceConstants>(false, 3);
             break;
         case 4:
-            node = mMainNodeGraph.NewNode<l::nodegraph::GraphSourceKeyboard, l::hid::KeyState>(false, 4, mKeyState);
+            node = mMainNodeGraph.NewNode<l::nodegraph::GraphSourceKeyboard, l::hid::KeyState>(false, 1, mKeyState);
             break;
         case 5:
             node = mMainNodeGraph.NewNode<l::nodegraph::GraphSourceTime>(false);
@@ -70,7 +70,7 @@ namespace l::nodegraph {
             node = mMainNodeGraph.NewNode<l::nodegraph::GraphFilterLowpass>(false);
             break;
         case 200:
-            node = mMainNodeGraph.NewNode<l::nodegraph::GraphOutputDebug>(true, 4);
+            node = mMainNodeGraph.NewNode<l::nodegraph::GraphOutputDebug>(true, 1);
             break;
         case 201:
             node = mMainNodeGraph.NewNode<l::nodegraph::GraphOutputSpeaker>(true, mAudioOutput);