From 16de858404a3193a6d76eff09e7074ecd3c741b2 Mon Sep 17 00:00:00 2001
From: heck <heck@heck.live>
Date: Thu, 7 Nov 2024 00:56:45 +0100
Subject: [PATCH] libDaisy use static methods statically always

---
 src/instr_zosc.cc |  4 ++--
 src/main_osp.cc   | 34 +++++++++++++++++-----------------
 src/track.hh      |  6 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/instr_zosc.cc b/src/instr_zosc.cc
index 0f895fd..6ea397b 100644
--- a/src/instr_zosc.cc
+++ b/src/instr_zosc.cc
@@ -42,13 +42,13 @@ namespace Heck::OSP {
         {
             mode1 = pos;
             zosc.SetMode(((float)pos) / 3.);
-            seed.PrintLine("");
+            ld::DaisySeed::PrintLine("");
         }
 
         void ZOsc::switch_mode(unsigned int pos)
         {
             mode2 = pos;
-            seed.PrintLine("ZOSC MODE2: %i", mode2);
+            ld::DaisySeed::PrintLine("ZOSC MODE2: %i", mode2);
         }
 
         float ZOsc::nextsample()
diff --git a/src/main_osp.cc b/src/main_osp.cc
index 971cb90..a87adb2 100644
--- a/src/main_osp.cc
+++ b/src/main_osp.cc
@@ -64,28 +64,28 @@ namespace Heck::OSP {
     {
         seed.Configure();
         seed.Init(Constants::CPU_BOOST480MHZ);
-        seed.StartLog(Constants::Developer::LOG_BLOCKS_BOOT);
+        ld::DaisySeed::StartLog(Constants::Developer::LOG_BLOCKS_BOOT);
 
-        but_rec.Init(seed.GetPin(Constants::Hardware::PIN_BUTTON_RECORD), 0);
-        but_clear.Init(seed.GetPin(Constants::Hardware::PIN_BUTTON_CLEAR), 0);
+        but_rec.Init(ld::DaisySeed::GetPin(Constants::Hardware::PIN_BUTTON_RECORD), 0);
+        but_clear.Init(ld::DaisySeed::GetPin(Constants::Hardware::PIN_BUTTON_CLEAR), 0);
 
-        seed.PrintLine("Setting Blocksize: %i", Constants::AUDIO_BUFFERSIZE);
+        ld::DaisySeed::PrintLine("Setting Blocksize: %i", Constants::AUDIO_BUFFERSIZE);
         seed.SetAudioBlockSize(Constants::AUDIO_BUFFERSIZE);
 
-        seed.PrintLine("Setting Samplerate: %i", Constants::AUDIO_SAMPLERATE);
+        ld::DaisySeed::PrintLine("Setting Samplerate: %i", Constants::AUDIO_SAMPLERATE);
         seed.SetAudioSampleRate(Constants::AUDIO_SAMPLERATE);
 
-        seed.PrintLine("Initializing MIDI");
+        ld::DaisySeed::PrintLine("Initializing MIDI");
         ld::MidiUartHandler::Config midi_config{};
         midi.Init(midi_config);
 
         init_tracks();
 
-        seed.PrintLine("Starting MIDI Receive");
+        ld::DaisySeed::PrintLine("Starting MIDI Receive");
         midi.StartReceiveRt(&midi_realtime_handler);
         midi.Listen();
 
-        seed.PrintLine("Starting Audio");
+        ld::DaisySeed::PrintLine("Starting Audio");
         seed.StartAudio(audio_callback);
     }
 
@@ -176,7 +176,7 @@ namespace Heck::OSP {
                 ld::ControlChangeEvent cc = msg.AsControlChange();
                 if (State::clear_mode && !from_seq) {
                     ld::ControlChangeEvent cc = msg.AsControlChange();
-                    seed.PrintLine("Clear: ch: %i, cc: %i", cc.channel, cc.control_number);
+                    ld::DaisySeed::PrintLine("Clear: ch: %i, cc: %i", cc.channel, cc.control_number);
                     sequencer.clear_track_cc(cc.channel, cc.control_number);
                 } else {
                     if (!from_seq) {
@@ -286,14 +286,14 @@ namespace Heck::OSP {
         bool but_rec_current = cache.read();
         if (!but_rec_current) {
             if (State::clear_mode) {
-                seed.PrintLine("CLEAR SEQUENCE");
+                ld::DaisySeed::PrintLine("CLEAR SEQUENCE");
                 sequencer.clear_sequence();
             } else {
-                seed.PrintLine("BUTTON RECORD ON");
+                ld::DaisySeed::PrintLine("BUTTON RECORD ON");
                 State::record_mode = true;
             }
         } else {
-            seed.PrintLine("BUTTON RECORD OFF");
+            ld::DaisySeed::PrintLine("BUTTON RECORD OFF");
             State::record_mode = false;
         }
         sequencer.recording = but_rec_current;
@@ -322,10 +322,10 @@ namespace Heck::OSP {
     {
         bool but_clear_current = cache.read();
         if (but_clear_current) {
-            seed.PrintLine("BUTTON CLEAR ON");
+            ld::DaisySeed::PrintLine("BUTTON CLEAR ON");
             State::clear_mode = true;
         } else {
-            seed.PrintLine("BUTTON CLEAR OFF");
+            ld::DaisySeed::PrintLine("BUTTON CLEAR OFF");
             State::clear_mode = false;
         }
     }
@@ -346,7 +346,7 @@ namespace Heck::OSP {
 
     void mainloop()
     {
-        seed.PrintLine("Entering MainLoop");
+        ld::DaisySeed::PrintLine("Entering MainLoop");
         u32 uptime_ms{};
 
         int clock_time_new{};
@@ -373,7 +373,7 @@ namespace Heck::OSP {
             if (clock_bar_new != clock_bar_current) {
                 clock_bar_current = clock_bar_new;
                 if constexpr (Constants::Developer::LOG_CLOCK_BAR) {
-                    seed.PrintLine("Bar: %i", clock_bar_current);
+                    ld::DaisySeed::PrintLine("Bar: %i", clock_bar_current);
                 }
             }
 
@@ -381,7 +381,7 @@ namespace Heck::OSP {
             if (clock_16n_new != clock_16n_current) {
                 clock_16n_current = clock_16n_new;
                 if constexpr (Constants::Developer::LOG_CLOCK_16N) {
-                    seed.PrintLine("16n: %i", clock_16n_current);
+                    ld::DaisySeed::PrintLine("16n: %i", clock_16n_current);
                 }
                 sequencer.next_step();
             }
diff --git a/src/track.hh b/src/track.hh
index b942fbc..3618aaf 100644
--- a/src/track.hh
+++ b/src/track.hh
@@ -81,17 +81,17 @@ namespace Heck::OSP {
 
             // MID
             if (ctl_filtermode_ < 0.33) {
-                seed.PrintLine("Track: Filter BP");
+                ld::DaisySeed::PrintLine("Track: Filter BP");
                 ladder_.SetFilterMode(daisysp::LadderFilter::FilterMode::BP24);
             }
             // HIGH
             if (ctl_filtermode_ >= 0.33 && ctl_filtermode_ < 0.66) {
-                seed.PrintLine("Track: Filter HP");
+                ld::DaisySeed::PrintLine("Track: Filter HP");
                 ladder_.SetFilterMode(daisysp::LadderFilter::FilterMode::HP24);
             }
             // LOW
             if (ctl_filtermode_ >= 0.66) {
-                seed.PrintLine("Track: Filter LP");
+                ld::DaisySeed::PrintLine("Track: Filter LP");
                 ladder_.SetFilterMode(daisysp::LadderFilter::FilterMode::LP24);
             }
         }