make typealiases global in types.hh (and remove all the superflous ones)

src/instr_bd2.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/instr_fm.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/instr_grainlet.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/instr_hihat.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/instr_kick.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/instr_noise.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/instr_zosc.hh

@@ -5,9 +5,6 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace Instrument {
 

src/main_perkons.cc

@@ -15,9 +15,6 @@
 #include "instr_hihat.hh"
 #include "instr_zosc.hh"
 
-namespace ld = daisy;
-namespace dsp = daisysp;
-
 namespace Heck {
     namespace State {
         bool record_mode{ false };
@@ -75,35 +72,35 @@ namespace Heck {
         hw.PrintLine("Setting Samplerate: %i", Constants::SAMPLERATE);
         switch (Constants::SAMPLERATE) {
             case 8000:
-                hw.SetAudioSampleRate(daisy::SaiHandle::Config::SampleRate::SAI_8KHZ);
+                hw.SetAudioSampleRate(ld::SaiHandle::Config::SampleRate::SAI_8KHZ);
                 break;
             case 16000:
-                hw.SetAudioSampleRate(daisy::SaiHandle::Config::SampleRate::SAI_16KHZ);
+                hw.SetAudioSampleRate(ld::SaiHandle::Config::SampleRate::SAI_16KHZ);
                 break;
             case 32000:
-                hw.SetAudioSampleRate(daisy::SaiHandle::Config::SampleRate::SAI_32KHZ);
+                hw.SetAudioSampleRate(ld::SaiHandle::Config::SampleRate::SAI_32KHZ);
                 break;
             case 48000:
-                hw.SetAudioSampleRate(daisy::SaiHandle::Config::SampleRate::SAI_48KHZ);
+                hw.SetAudioSampleRate(ld::SaiHandle::Config::SampleRate::SAI_48KHZ);
                 break;
             case 96000:
-                hw.SetAudioSampleRate(daisy::SaiHandle::Config::SampleRate::SAI_48KHZ);
+                hw.SetAudioSampleRate(ld::SaiHandle::Config::SampleRate::SAI_48KHZ);
                 break;
             default:
                 hw.PrintLine("Samplerate not supported, fallback to 48000");
-                hw.SetAudioSampleRate(daisy::SaiHandle::Config::SampleRate::SAI_48KHZ);
+                hw.SetAudioSampleRate(ld::SaiHandle::Config::SampleRate::SAI_48KHZ);
                 break;
         }
 
         hw.PrintLine("Initializing MIDI");
         ld::MidiUartHandler::Config midi_config{};
         midi.Init(midi_config);
-        midi.realtime_callback = &midi_realtime_handler;
+//        midi.realtime_callback = &midi_realtime_handler;
 
         init_tracks();
 
         hw.PrintLine("Starting MIDI Receive");
-        midi.StartReceive();
+        midi.StartReceiveRt(&midi_realtime_handler);
         midi.Listen();
 
         hw.PrintLine("Starting Audio");
@@ -135,22 +132,22 @@ namespace Heck {
     {
         event_log.PushBack(msg);
         switch (msg.srt_type) {
-            case daisy::TimingClock:
+            case ld::TimingClock:
                 clock.tick_advance();
                 break;
-            case daisy::Start: {
+            case ld::Start: {
                 sequencer.reset();
                 clock.reset();
                 clock.enable(true);
             } break;
-            case daisy::Stop: {
+            case ld::Stop: {
                 clock.enable(false);
                 clock.reset();
                 sequencer.reset();
             } break;
-            case daisy::Reset:
+            case ld::Reset:
                 break;
-            case daisy::Continue:
+            case ld::Continue:
                 break;
         }
     }
@@ -338,7 +335,7 @@ namespace Heck {
                                 char rttype_str[32];
                                 GetMidiRTTypeAsString(msg, rttype_str);
                                 sprintf(outstr, "RT: type: %s\n", rttype_str);
-                                if (msg.srt_type != daisy::TimingClock) {
+                                if (msg.srt_type != ld::TimingClock) {
                                     hw.PrintLine("%s", outstr);
                                 }
                             }

src/types.hh

@@ -2,6 +2,8 @@
 #define HECK_DAISY_TYPES_HH
 
 #include <cstdint>
+#include "daisy_seed.h"
+#include "daisysp.h"
 
 namespace Heck {
 

src/utils.cc

@@ -1,40 +1,38 @@
 #include "utils.hh"
 
-using namespace daisy;
-
 namespace Heck {
 
-    void GetMidiTypeAsString(MidiEvent& msg, char* str)
+    void GetMidiTypeAsString(ld::MidiEvent& msg, char* str)
     {
         switch (msg.type) {
-            case NoteOff:
+            case ld::NoteOff:
                 strcpy(str, "NoteOff");
                 break;
-            case NoteOn:
+            case ld::NoteOn:
                 strcpy(str, "NoteOn");
                 break;
-            case PolyphonicKeyPressure:
+            case ld::PolyphonicKeyPressure:
                 strcpy(str, "PolyKeyPres.");
                 break;
-            case ControlChange:
+            case ld::ControlChange:
                 strcpy(str, "CC");
                 break;
-            case ProgramChange:
+            case ld::ProgramChange:
                 strcpy(str, "Prog. Change");
                 break;
-            case ChannelPressure:
+            case ld::ChannelPressure:
                 strcpy(str, "Chn. Pressure");
                 break;
-            case PitchBend:
+            case ld::PitchBend:
                 strcpy(str, "PitchBend");
                 break;
-            case SystemCommon:
+            case ld::SystemCommon:
                 strcpy(str, "Sys. Common");
                 break;
-            case SystemRealTime:
+            case ld::SystemRealTime:
                 strcpy(str, "Sys. Realtime");
                 break;
-            case ChannelMode:
+            case ld::ChannelMode:
                 strcpy(str, "Chn. Mode");
                 break;
             default:
@@ -43,34 +41,34 @@ namespace Heck {
         }
     }
 
-    void GetMidiRTTypeAsString(MidiEvent& msg, char* str)
+    void GetMidiRTTypeAsString(ld::MidiEvent& msg, char* str)
     {
         switch (msg.srt_type) {
-            case TimingClock:
+            case ld::TimingClock:
                 strcpy(str, "TimingClock");
                 break;
-            case SRTUndefined0:
+            case ld::SRTUndefined0:
                 strcpy(str, "SRTUndefined0");
                 break;
-            case Start:
+            case ld::Start:
                 strcpy(str, "Start");
                 break;
-            case Continue:
+            case ld::Continue:
                 strcpy(str, "Continue");
                 break;
-            case Stop:
+            case ld::Stop:
                 strcpy(str, "Stop");
                 break;
-            case SRTUndefined1:
+            case ld::SRTUndefined1:
                 strcpy(str, "SRTUndefined1");
                 break;
-            case ActiveSensing:
+            case ld::ActiveSensing:
                 strcpy(str, "ActiveSensing");
                 break;
-            case Reset:
+            case ld::Reset:
                 strcpy(str, "Reset");
                 break;
-            case SystemRealTimeLast:
+            case ld::SystemRealTimeLast:
                 strcpy(str, "SystemRealTimeLast");
                 break;
             default:

src/utils.hh

@@ -5,8 +5,8 @@
 #include "globals.hh"
 
 namespace Heck {
-    void GetMidiTypeAsString(daisy::MidiEvent& msg, char* str);
+    void GetMidiTypeAsString(ld::MidiEvent& msg, char* str);
-    void GetMidiRTTypeAsString(daisy::MidiEvent& msg, char* str);
+    void GetMidiRTTypeAsString(ld::MidiEvent& msg, char* str);
 
     float scalen_min_max(float val, float min, float max);
     float scalen_center_range(float val, float center, float range);