From b5969bfd7a9c2d825607f72b16254f31ccebb4e9 Mon Sep 17 00:00:00 2001
From: James Ball <james@ball.sh>
Date: Mon, 11 Mar 2024 21:48:30 +0000
Subject: [PATCH] Fix bug that leads to innaccurate frequencies

---
 Resources/svg/osci.svg      | 48 ++++++++++++++++++++++++++++++++++++-
 Source/audio/ShapeVoice.cpp |  6 +----
 osci-render.jucer           |  2 +-
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/Resources/svg/osci.svg b/Resources/svg/osci.svg
index 44f321d..e56ff90 100644
--- a/Resources/svg/osci.svg
+++ b/Resources/svg/osci.svg
@@ -1 +1,47 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="702" height="702" viewBox="0 0 702 702" version="1.1"><path d="" stroke="none" fill="#08fc04" fill-rule="evenodd"/><path d="M 35.667 35.667 L 35 36.333 35 290.434 L 35 544.534 97.735 607.269 L 160.470 670.004 413.485 669.752 L 666.500 669.500 666.752 413.485 L 667.004 157.469 605.769 96.235 L 544.535 35 290.434 35 L 36.333 35 35.667 35.667 M 134.514 110.997 L 178.500 154.994 348.250 154.997 L 518 155 518 111 L 518 67 304.264 67 L 90.529 67 134.514 110.997 M 550 119.805 L 550 155 585.194 155 L 620.388 155 603.128 137.657 L 585.868 120.315 567.934 102.462 L 550 84.610 550 119.805 M 67 304.264 L 67 518 111 518 L 155 518 154.997 348.250 L 154.994 178.500 110.997 134.514 L 67 90.529 67 304.264 M 187 352.500 L 187 518 352.500 518 L 518 518 518 352.500 L 518 187 352.500 187 L 187 187 187 352.500 M 550.003 358.250 L 550.006 529.500 594.003 573.486 L 638 617.471 638 402.236 L 638 187 594 187 L 550 187 550.003 358.250 M 102.462 567.934 L 120.315 585.868 137.657 603.128 L 155 620.388 155 585.194 L 155 550 119.805 550 L 84.610 550 102.462 567.934 M 187 594 L 187 638 400.736 638 L 614.471 638 570.486 594.003 L 526.500 550.006 356.750 550.003 L 187 550 187 594" stroke="none" fill="#04fc04" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="702"
+   height="702"
+   viewBox="0 0 702 702"
+   version="1.1"
+   id="svg23"
+   sodipodi:docname="osci.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     id="namedview25"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.1412421"
+     inkscape:cx="422.34683"
+     inkscape:cy="353.56213"
+     inkscape:window-width="2560"
+     inkscape:window-height="1351"
+     inkscape:window-x="1431"
+     inkscape:window-y="407"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg23" />
+  <path
+     d=""
+     stroke="none"
+     fill="#08fc04"
+     fill-rule="evenodd"
+     id="path19" />
+  <path
+     d="M 96.585044,96.874822 96.046899,97.412161 V 302.42462 507.43627 L 146.66243,558.05179 197.27796,608.66732 401.41421,608.46401 605.55047,608.26069 605.75378,401.70399 605.9571,195.14648 556.55179,145.74198 507.1473,96.336676 H 302.13484 97.122383 L 96.585044,96.874822 M 176.33627,157.65218 211.82483,193.14962 348.78165,193.15204 485.73846,193.15446 V 157.6546 122.15475 H 313.29309 140.84852 L 176.33627,157.65218 M 511.55654,164.75861 V 193.15446 H 539.95158 568.34662 L 554.421,179.16187 540.49537,165.17008 526.02596,150.76602 511.55654,136.36276 V 164.75861 M 121.86497,313.58287 V 486.02824 H 157.36483 192.86468 L 192.86226,349.07142 192.85984,212.11461 157.36241,176.62605 121.86497,141.1383 V 313.58287 M 218.68275,352.50039 V 486.02824 H 352.21061 485.73846 V 352.50039 218.97253 H 352.21061 218.68275 V 352.50039 M 511.55896,357.13957 511.56138,495.30661 547.05881,530.79517 582.55624,566.28292 V 392.62813 218.97253 H 547.05639 511.55654 L 511.55896,357.13957 M 150.47624,526.31573 164.88031,540.78515 178.87209,554.71077 192.86468,568.6364 V 540.24136 511.84632 H 164.46883 136.07298 L 150.47624,526.31573 M 218.68275,547.34617 V 582.84602 H 391.12813 563.5727 L 528.08495,547.34859 492.59639,511.85116 355.63957,511.84874 218.68275,511.84632 V 547.34617"
+     stroke="none"
+     fill="#04fc04"
+     fill-rule="evenodd"
+     id="path21"
+     style="stroke-width:0.806815" />
+</svg>
diff --git a/Source/audio/ShapeVoice.cpp b/Source/audio/ShapeVoice.cpp
index 4184447..5e75e3d 100644
--- a/Source/audio/ShapeVoice.cpp
+++ b/Source/audio/ShapeVoice.cpp
@@ -164,12 +164,8 @@ void ShapeVoice::renderNextBlock(juce::AudioSampleBuffer& outputBuffer, int star
         if (!renderingSample && frameDrawn >= drawnFrameLength) {
             if (sound.load() != nullptr && currentlyPlaying) {
                 frameLength = sound.load()->updateFrame(frame);
-                frameDrawn = 0.0;
-                shapeDrawn = 0.0;
-                currentShape = 0;
             }
-            frameDrawn = 0.0;
-            shapeDrawn = 0.0;
+            frameDrawn -= drawnFrameLength;
             currentShape = 0;
 
             // TODO: updateFrame already iterates over all the shapes,
diff --git a/osci-render.jucer b/osci-render.jucer
index d665a17..fd7d074 100644
--- a/osci-render.jucer
+++ b/osci-render.jucer
@@ -2,7 +2,7 @@
 
 <JUCERPROJECT id="HH2E72" name="osci-render" projectType="audioplug" useAppConfig="0"
               addUsingNamespaceToJuceHeader="0" displaySplashScreen="0" jucerFormatVersion="1"
-              pluginCharacteristicsValue="pluginProducesMidiOut,pluginWantsMidiIn"
+              pluginCharacteristicsValue="pluginIsSynth,pluginProducesMidiOut,pluginWantsMidiIn"
               pluginManufacturer="jameshball" aaxIdentifier="sh.ball.oscirender"
               cppLanguageStandard="20" projectLineFeed="&#10;" headerPath="./include"
               version="2.1.3" companyName="James H Ball" companyWebsite="https://osci-render.com"