From 044143e44f24b12f2e465743a5eff8d424c77af7 Mon Sep 17 00:00:00 2001 From: heck Date: Thu, 26 Sep 2024 04:37:47 +0200 Subject: [PATCH] the globals file is the projects global file and not abstractable --- src/instr_interface.hh | 2 +- src/main_osp.cc | 2 +- src/{globals.hh => main_osp.hh} | 0 src/track.hh | 3 +-- src/utils.hh | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) rename src/{globals.hh => main_osp.hh} (100%) diff --git a/src/instr_interface.hh b/src/instr_interface.hh index 07e4f61..3bdd33c 100644 --- a/src/instr_interface.hh +++ b/src/instr_interface.hh @@ -1,7 +1,7 @@ #ifndef HECK_OSP_INSTR_ABSTRACT #define HECK_OSP_INSTR_ABSTRACT -#include "globals.hh" +#include "main_osp.hh" namespace Heck { namespace Instrument { diff --git a/src/main_osp.cc b/src/main_osp.cc index 99baaf0..18fceb3 100644 --- a/src/main_osp.cc +++ b/src/main_osp.cc @@ -1,7 +1,7 @@ #include #include -#include "globals.hh" +#include "main_osp.hh" #include "track.hh" #include "utils.hh" #include "midiclock.hh" diff --git a/src/globals.hh b/src/main_osp.hh similarity index 100% rename from src/globals.hh rename to src/main_osp.hh diff --git a/src/track.hh b/src/track.hh index dedf108..8c56177 100644 --- a/src/track.hh +++ b/src/track.hh @@ -4,8 +4,7 @@ #include "daisysp.h" #include "instr_interface.hh" #include "utils.hh" -#include "globals.hh" -namespace dsp = daisysp; +#include "main_osp.hh" namespace Heck { struct Track { diff --git a/src/utils.hh b/src/utils.hh index 232e20e..ad6c560 100644 --- a/src/utils.hh +++ b/src/utils.hh @@ -2,7 +2,7 @@ #define HECK_OSP_UTILS_HH #include "daisy_seed.h" -#include "globals.hh" +#include "main_osp.hh" namespace Heck { void GetMidiTypeAsString(ld::MidiEvent& msg, char* str);